--- gdm2/ChangeLog.org	2006-12-04 19:25:26.000000000 +0000
+++ gdm2/ChangeLog	2006-12-04 19:48:08.000000000 +0000
@@ -0,0 +1,19 @@
+2006-12-04  Lukasz Zalewski  <lukas@dcs.qmul.ac.uk>
+	
+        Fixes bug/feature request #334186.
+	Fixes bug #343206
+	Fixes bug #347101
+	* gui/gdmsession. [ch] (_gdm_session_list_init): replaces functionality
+	  of gdm_session_list_init
+	* gui/gdmsession. [ch] (gdm_session_list_init): becomes a wrapper for
+	  _gdm_session_list_init, such that the old functionality within the code
+	  is still preserved but session data can be available through
+	  _gdm_session_list_init
+	* gui/gdmuser. [ch] (gdm_user_uid): returns uid of a user, or -1 if user
+	  does not exist
+	* gui/gdmsetup.glade: new widgets added
+	* gui/gdmsetup.c: Numerous functions added/modifed to make way for new
+	  functionality
+	* gui/gdmsetup.c (combobox_changed): Additional fix for bug #358114
+	* gui/Makefile.am: added libgdmwm.a to gdmsetup_LADD
+	
--- gdm2/gui/gdmsession.h.org	2006-12-04 18:43:16.000000000 +0000
+++ gdm2/gui/gdmsession.h	2006-12-04 18:44:13.000000000 +0000
@@ -34,6 +34,10 @@
 } GdmSession;
 
 void		gdm_session_list_init		(void);
+void		_gdm_session_list_init		(GHashTable **sessnames,
+						 GList **sessions,
+						 gchar **default_session, 
+						 const gchar **current_session);
 gint		gdm_session_sort_func		(const char *a, const char *b);
 const char *	gdm_session_name 		(const char *name);
 void		gdm_session_list_from_hash_table_func (const char *key,
--- gdm2/gui/gdmsetup.glade.org	2006-12-04 18:41:34.000000000 +0000
+++ gdm2/gui/gdmsetup.glade	2006-12-04 18:51:59.000000000 +0000
@@ -66,123 +66,82 @@
       </child>
 
       <child>
-	<widget class="GtkNotebook" id="setup_notebook">
-	  <property name="border_width">5</property>
+	<widget class="GtkEventBox" id="eventbox1">
 	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="show_tabs">True</property>
-	  <property name="show_border">True</property>
-	  <property name="tab_pos">GTK_POS_TOP</property>
-	  <property name="scrollable">False</property>
-	  <property name="enable_popup">False</property>
+	  <property name="visible_window">True</property>
+	  <property name="above_child">False</property>
 
 	  <child>
-	    <widget class="GtkVBox" id="local_tab_vbox">
-	      <property name="border_width">12</property>
+	    <widget class="GtkNotebook" id="setup_notebook">
+	      <property name="border_width">5</property>
 	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">18</property>
+	      <property name="can_focus">True</property>
+	      <property name="show_tabs">True</property>
+	      <property name="show_border">True</property>
+	      <property name="tab_pos">GTK_POS_TOP</property>
+	      <property name="scrollable">False</property>
+	      <property name="enable_popup">False</property>
 
 	      <child>
-		<widget class="GtkVBox" id="local_style_vbox">
+		<widget class="GtkVBox" id="general_tab_vbox">
+		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="local_style_hbox">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">12</property>
-
-		      <child>
-			<widget class="GtkLabel" id="local_stylelabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Style:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">local_greeter</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkComboBox" id="local_greeter">
-			  <property name="visible">True</property>
-			  <property name="items" translatable="yes">Plain
-Plain with face browser
-Themed</property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+		  <property name="spacing">18</property>
 
 		  <child>
-		    <widget class="GtkVBox" id="local_properties_vbox">
+		    <widget class="GtkHBox" id="hbox201">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkVBox" id="local_plain_properties_vbox">
+			<widget class="GtkTable" id="table24">
+			  <property name="visible">True</property>
+			  <property name="n_rows">2</property>
+			  <property name="n_columns">1</property>
 			  <property name="homogeneous">False</property>
-			  <property name="spacing">18</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
 
 			  <child>
-			    <widget class="GtkVBox" id="local_plain_background_vbox">
+			    <widget class="GtkCheckButton" id="vis_feedback_passwd_checkbox">
 			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Show visual feedback in the password entry</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
 
-			      <child>
-				<widget class="GtkFixed" id="local_plain_fixed">
-				  <property name="height_request">6</property>
-				  <property name="visible">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+			  <child>
+			    <widget class="GtkHBox" id="hbox203">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
 
 			      <child>
-				<widget class="GtkLabel" id="local_background_label">
+				<widget class="GtkLabel" id="label297">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Background</property>
+				  <property name="label" translatable="yes">    </property>
 				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</property>
+				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
 				  <property name="wrap">False</property>
 				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
+				  <property name="xalign">0.5</property>
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
@@ -199,212 +158,250 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkHBox" id="local_background_hbox">
+				<widget class="GtkCheckButton" id="use_circles_passwd_checkbox">
 				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="local_background_indent_label">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">    </property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Use circles instead of asterisks in the password entry</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 
-				  <child>
-				    <widget class="GtkTable" id="local_background_table">
-				      <property name="visible">True</property>
-				      <property name="n_rows">3</property>
-				      <property name="n_columns">2</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">6</property>
-				      <property name="column_spacing">12</property>
+		  <child>
+		    <widget class="GtkTable" id="table25">
+		      <property name="visible">True</property>
+		      <property name="n_rows">1</property>
+		      <property name="n_columns">1</property>
+		      <property name="homogeneous">False</property>
+		      <property name="row_spacing">0</property>
+		      <property name="column_spacing">0</property>
 
-				      <child>
-					<widget class="GtkCheckButton" id="local_background_image_checkbutton">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">_Image:</property>
-					  <property name="use_underline">True</property>
-					  <property name="relief">GTK_RELIEF_NORMAL</property>
-					  <property name="focus_on_click">True</property>
-					  <property name="active">False</property>
-					  <property name="inconsistent">False</property>
-					  <property name="draw_indicator">True</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
+		      <child>
+			<widget class="GtkTable" id="table30">
+			  <property name="visible">True</property>
+			  <property name="n_rows">3</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
 
-				      <child>
-					<widget class="GtkFileChooserButton" id="local_background_image_chooserbutton">
-					  <property name="visible">True</property>
-					  <property name="sensitive">False</property>
-					  <property name="title" translatable="yes">Select Background Image</property>
-					  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-					  <property name="local_only">True</property>
-					  <property name="show_hidden">False</property>
-					  <property name="do_overwrite_confirmation">False</property>
-					  <property name="width_chars">-1</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
+			  <child>
+			    <widget class="GtkComboBox" id="default_session_combobox">
+			      <property name="visible">True</property>
+			      <property name="items" translatable="yes"></property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
 
-				      <child>
-					<widget class="GtkHBox" id="local_background_scale_hbox">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">0</property>
+			  <child>
+			    <widget class="GtkLabel" id="label348">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Use 24 Hour Clock</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">gg_mode_combobox</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
 
-					  <child>
-					    <widget class="GtkLabel" id="local_background_scale_indent_label">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">    </property>
-					      <property name="use_underline">False</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					      <property name="width_chars">-1</property>
-					      <property name="single_line_mode">False</property>
-					      <property name="angle">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
+			  <child>
+			    <widget class="GtkFileChooserButton" id="gtkrc_chooserbutton">
+			      <property name="visible">True</property>
+			      <property name="sensitive">False</property>
+			      <property name="title" translatable="yes">Select Background Image</property>
+			      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+			      <property name="local_only">True</property>
+			      <property name="show_hidden">False</property>
+			      <property name="do_overwrite_confirmation">False</property>
+			      <property name="width_chars">-1</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
 
-					  <child>
-					    <widget class="GtkCheckButton" id="sg_scale_background">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Sc_ale to fit screen</property>
-					      <property name="use_underline">True</property>
-					      <property name="relief">GTK_RELIEF_NORMAL</property>
-					      <property name="focus_on_click">True</property>
-					      <property name="active">False</property>
-					      <property name="inconsistent">False</property>
-					      <property name="draw_indicator">True</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					</packing>
-				      </child>
+			  <child>
+			    <widget class="GtkComboBox" id="use_24hr_clock_combobox">
+			      <property name="visible">True</property>
+			      <property name="items" translatable="yes">auto
+yes
+no</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
 
-				      <child>
-					<widget class="GtkColorButton" id="local_background_colorbutton">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="use_alpha">False</property>
-					  <property name="title" translatable="yes">Pick Background Color</property>
-					  <property name="focus_on_click">True</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
+			  <child>
+			    <widget class="GtkCheckButton" id="default_session_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Default session</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
 
-				      <child>
-					<widget class="GtkHBox" id="hbox199">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">0</property>
+			  <child>
+			    <widget class="GtkCheckButton" id="gtkrc_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">GtkRC path</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="left_attach">0</property>
+			  <property name="right_attach">1</property>
+			  <property name="top_attach">0</property>
+			  <property name="bottom_attach">1</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 
-					  <child>
-					    <widget class="GtkCheckButton" id="local_background_color_checkbutton">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Co_lor:</property>
-					      <property name="use_underline">True</property>
-					      <property name="relief">GTK_RELIEF_NORMAL</property>
-					      <property name="focus_on_click">True</property>
-					      <property name="active">False</property>
-					      <property name="inconsistent">False</property>
-					      <property name="draw_indicator">True</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					      <property name="pack_type">GTK_PACK_END</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
+		  <child>
+		    <widget class="GtkFixed" id="fixed5">
+		      <property name="height_request">6</property>
+		      <property name="visible">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox129">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox9896">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="commands_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Reboot,  Halt, Suspend and Custom commands</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">True</property>
+			      <property name="justify">GTK_JUSTIFY_FILL</property>
+			      <property name="wrap">True</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -412,23 +409,36 @@
 			      <property name="fill">False</property>
 			    </packing>
 			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox9897">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkVBox" id="local_plain_logo_vbox">
+			    <widget class="GtkHBox" id="hbox9898">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
+			      <property name="spacing">0</property>
 
 			      <child>
-				<widget class="GtkLabel" id="local_logo_label">
+				<widget class="GtkLabel" id="custom_cmd_note_label">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Logo</property>
+				  <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt; You can add different commands separated by a semicolon either by typing them into relevant filelds, or by using Add button.  GDM will use the first one it can find. To disable leave the path field blank. To save changes press Apply Command Changes button.</property>
 				  <property name="use_underline">False</property>
 				  <property name="use_markup">True</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
+				  <property name="justify">GTK_JUSTIFY_FILL</property>
+				  <property name="wrap">True</property>
 				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
+				  <property name="xalign">0.5</property>
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
@@ -443,92 +453,253 @@
 				  <property name="fill">False</property>
 				</packing>
 			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
 
-			      <child>
-				<widget class="GtkHBox" id="hbox102">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
+		  <child>
+		    <widget class="GtkHBox" id="hbox228">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
 
-				  <child>
-				    <widget class="GtkLabel" id="label169">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">    </property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
+		      <child>
+			<widget class="GtkTable" id="table38">
+			  <property name="visible">True</property>
+			  <property name="n_rows">1</property>
+			  <property name="n_columns">2</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label404">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Command type:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">gg_mode_combobox</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkComboBox" id="cmd_type_combobox">
+			      <property name="visible">True</property>
+			      <property name="items" translatable="yes"></property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkVBox" id="commands_vbox">
+		      <property name="width_request">316</property>
+		      <property name="height_request">236</property>
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<widget class="GtkVBox" id="hrs_command_vbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkTable" id="table43">
+			      <property name="visible">True</property>
+			      <property name="n_rows">1</property>
+			      <property name="n_columns">3</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label439">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Path:     </property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">gg_mode_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="hrs_command_add">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkHBox" id="hbox104">
+				    <widget class="GtkAlignment" id="alignment49">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">12</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkCheckButton" id="local_logo_image_checkbutton">
+					<widget class="GtkHBox" id="hbox9894">
 					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">I_mage:</property>
-					  <property name="use_underline">True</property>
-					  <property name="relief">GTK_RELIEF_NORMAL</property>
-					  <property name="focus_on_click">True</property>
-					  <property name="active">False</property>
-					  <property name="inconsistent">False</property>
-					  <property name="draw_indicator">True</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
 
-				      <child>
-					<widget class="GtkFileChooserButton" id="local_logo_image_chooserbutton">
-					  <property name="visible">True</property>
-					  <property name="sensitive">False</property>
-					  <property name="title" translatable="yes">Select Logo Image</property>
-					  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-					  <property name="local_only">True</property>
-					  <property name="show_hidden">False</property>
-					  <property name="do_overwrite_confirmation">False</property>
-					  <property name="width_chars">-1</property>
+					  <child>
+					    <widget class="GtkImage" id="image48">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-add</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label440">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">_Add...</property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
 					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
 				      </child>
 				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
 				  </child>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="hrs_cmd_path_entry">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 			    </widget>
@@ -547,20 +718,24 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="local_themed_properties_vbox">
+			<widget class="GtkVBox" id="custom_command_vbox">
+			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox128">
+			    <widget class="GtkTable" id="table44">
 			      <property name="visible">True</property>
+			      <property name="n_rows">5</property>
+			      <property name="n_columns">3</property>
 			      <property name="homogeneous">False</property>
-			      <property name="spacing">12</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
 
 			      <child>
-				<widget class="GtkLabel" id="local_theme_label">
+				<widget class="GtkLabel" id="label441">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Theme:</property>
+				  <property name="label" translatable="yes">Path:</property>
 				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -577,299 +752,49 @@
 				  <property name="angle">0</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkComboBox" id="gg_mode_combobox">
+				<widget class="GtkButton" id="custom_command_add">
 				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">Selected only
-Random from selected
-</property>
-				  <property name="add_tearoffs">False</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox92">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">12</property>
-
-			      <child>
-				<widget class="GtkScrolledWindow" id="local_theme_scrolled_window">
-				  <property name="width_request">350</property>
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-				  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-				  <property name="shadow_type">GTK_SHADOW_IN</property>
-				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-				  <child>
-				    <widget class="GtkTreeView" id="gg_theme_list">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="headers_visible">False</property>
-				      <property name="rules_hint">False</property>
-				      <property name="reorderable">False</property>
-				      <property name="enable_search">True</property>
-				      <property name="fixed_height_mode">False</property>
-				      <property name="hover_selection">False</property>
-				      <property name="hover_expand">False</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox56">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkButton" id="gg_install_new_theme">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment5">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">0</property>
-					  <property name="yscale">0</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">0</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox107">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">2</property>
-
-					      <child>
-						<widget class="GtkImage" id="image1">
-						  <property name="visible">True</property>
-						  <property name="stock">gtk-add</property>
-						  <property name="icon_size">4</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="label173">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">_Add...</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-						  <property name="width_chars">-1</property>
-						  <property name="single_line_mode">False</property>
-						  <property name="angle">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="gg_delete_theme">
-				      <property name="visible">True</property>
-				      <property name="sensitive">False</property>
-				      <property name="can_focus">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment6">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">0</property>
-					  <property name="yscale">0</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">0</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox108">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">2</property>
-
-					      <child>
-						<widget class="GtkImage" id="image2">
-						  <property name="visible">True</property>
-						  <property name="stock">gtk-remove</property>
-						  <property name="icon_size">4</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="LocalThemeRemoveButtonLabel">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">_Remove...</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-						  <property name="width_chars">-1</property>
-						  <property name="single_line_mode">False</property>
-						  <property name="angle">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
 
 				  <child>
-				    <widget class="GtkVBox" id="vbox87">
+				    <widget class="GtkAlignment" id="alignment50">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">12</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
 
 				      <child>
-					<widget class="GtkVBox" id="vbox89">
+					<widget class="GtkHBox" id="hbox9895">
 					  <property name="visible">True</property>
 					  <property name="homogeneous">False</property>
-					  <property name="spacing">3</property>
+					  <property name="spacing">2</property>
 
 					  <child>
-					    <widget class="GtkLabel" id="gg_copyright_label">
+					    <widget class="GtkImage" id="image49">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Copyright:</property>
-					      <property name="use_underline">False</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0</property>
+					      <property name="stock">gtk-add</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
 					      <property name="yalign">0.5</property>
 					      <property name="xpad">0</property>
 					      <property name="ypad">0</property>
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					      <property name="width_chars">-1</property>
-					      <property name="single_line_mode">False</property>
-					      <property name="angle">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkScrolledWindow" id="scrolledwindow11">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-					      <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-					      <property name="shadow_type">GTK_SHADOW_NONE</property>
-					      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-					      <child>
-						<widget class="GtkTextView" id="gg_copyright_text_view">
-						  <property name="visible">True</property>
-						  <property name="editable">False</property>
-						  <property name="overwrite">False</property>
-						  <property name="accepts_tab">True</property>
-						  <property name="justification">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap_mode">GTK_WRAP_WORD</property>
-						  <property name="cursor_visible">False</property>
-						  <property name="pixels_above_lines">0</property>
-						  <property name="pixels_below_lines">0</property>
-						  <property name="pixels_inside_wrap">0</property>
-						  <property name="left_margin">0</property>
-						  <property name="right_margin">0</property>
-						  <property name="indent">0</property>
-						  <property name="text" translatable="yes"></property>
-						</widget>
-					      </child>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
@@ -877,31 +802,17 @@
 					      <property name="fill">False</property>
 					    </packing>
 					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					  <property name="pack_type">GTK_PACK_END</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkVBox" id="vbox88">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">3</property>
 
 					  <child>
-					    <widget class="GtkLabel" id="gg_author_label">
+					    <widget class="GtkLabel" id="label442">
 					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Author:</property>
-					      <property name="use_underline">False</property>
+					      <property name="label" translatable="yes">_Add...</property>
+					      <property name="use_underline">True</property>
 					      <property name="use_markup">False</property>
 					      <property name="justify">GTK_JUSTIFY_LEFT</property>
 					      <property name="wrap">False</property>
 					      <property name="selectable">False</property>
-					      <property name="xalign">0</property>
+					      <property name="xalign">0.5</property>
 					      <property name="yalign">0.5</property>
 					      <property name="xpad">0</property>
 					      <property name="ypad">0</property>
@@ -916,396 +827,284 @@
 					      <property name="fill">False</property>
 					    </packing>
 					  </child>
-
-					  <child>
-					    <widget class="GtkScrolledWindow" id="scrolledwindow12">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-					      <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-					      <property name="shadow_type">GTK_SHADOW_NONE</property>
-					      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-					      <child>
-						<widget class="GtkTextView" id="gg_author_text_view">
-						  <property name="visible">True</property>
-						  <property name="editable">False</property>
-						  <property name="overwrite">False</property>
-						  <property name="accepts_tab">True</property>
-						  <property name="justification">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap_mode">GTK_WRAP_WORD</property>
-						  <property name="cursor_visible">False</property>
-						  <property name="pixels_above_lines">0</property>
-						  <property name="pixels_below_lines">0</property>
-						  <property name="pixels_inside_wrap">0</property>
-						  <property name="left_margin">0</property>
-						  <property name="right_margin">0</property>
-						  <property name="indent">0</property>
-						  <property name="text" translatable="yes"></property>
-						</widget>
-					      </child>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
 					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					  <property name="pack_type">GTK_PACK_END</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<placeholder/>
 				      </child>
 				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
 				  </child>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
+				  <property name="left_attach">2</property>
+				  <property name="right_attach">3</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox90">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox129">
+				<widget class="GtkEntry" id="custom_cmd_path_entry">
 				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkTable" id="table14">
-				      <property name="visible">True</property>
-				      <property name="n_rows">1</property>
-				      <property name="n_columns">2</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">6</property>
-				      <property name="column_spacing">12</property>
-
-				      <child>
-					<widget class="GtkLabel" id="label207">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">_Background color:</property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="mnemonic_widget">local_background_theme_colorbutton</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkColorButton" id="local_background_theme_colorbutton">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="use_alpha">False</property>
-					  <property name="title" translatable="yes">Pick Background Color</property>
-					  <property name="focus_on_click">True</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options">expand</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options">fill</property>
 				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="local_welcome_message_vbox1">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">18</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="LocalPlainMenuBarVBox">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="local_menubar_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Menu Bar</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox103">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label170">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox73">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkCheckButton" id="sysmenu">
+				<widget class="GtkLabel" id="label443">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Sho_w Actions menu</property>
+				  <property name="label" translatable="yes">Label:</property>
 				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">gg_mode_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox105">
+				<widget class="GtkLabel" id="label444">
 				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
+				  <property name="label" translatable="yes">LRlabel:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">gg_mode_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-				  <child>
-				    <widget class="GtkLabel" id="label171">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">    </property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
+			      <child>
+				<widget class="GtkLabel" id="label445">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Text:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">gg_mode_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">3</property>
+				  <property name="bottom_attach">4</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-				  <child>
-				    <widget class="GtkCheckButton" id="config_available">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Include Con_figure menu item</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <property name="active">False</property>
-				      <property name="inconsistent">False</property>
-				      <property name="draw_indicator">True</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
+			      <child>
+				<widget class="GtkLabel" id="label446">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Tooltip:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">gg_mode_combobox</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">4</property>
+				  <property name="bottom_attach">5</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox106">
+				<widget class="GtkEntry" id="custom_cmd_label_entry">
 				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-				  <child>
-				    <widget class="GtkLabel" id="label172">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">    </property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
+			      <child>
+				<widget class="GtkEntry" id="custom_cmd_lrlabel_entry">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-				  <child>
-				    <widget class="GtkCheckButton" id="chooser_button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Includ_e Hostname Chooser (XDMCP) menu item</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <property name="active">False</property>
-				      <property name="inconsistent">False</property>
-				      <property name="draw_indicator">True</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
+			      <child>
+				<widget class="GtkEntry" id="custom_cmd_text_entry">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">3</property>
+				  <property name="bottom_attach">4</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkEntry" id="custom_cmd_tooltip_entry">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">4</property>
+				  <property name="bottom_attach">5</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="custom_cmd_persistent_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Persistent</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="custom_cmd_norestart_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">No restart required</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
 			</widget>
@@ -1318,162 +1117,70 @@
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkVBox" id="vbox128">
+		    <widget class="GtkHBox" id="hbox9892">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="local_welcome_message_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Welcome Message</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="local_welcome_message_hbox">
+			<widget class="GtkButton" id="command_apply_button">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
+			  <property name="sensitive">False</property>
+			  <property name="can_focus">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="local_welcome_message_indent">
+			    <widget class="GtkAlignment" id="alignment48">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="local_welcome_message_vbox2">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="sg_defaultwelcome">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Default: &quot;Welcome&quot;</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+			      <property name="xscale">0</property>
+			      <property name="yscale">0</property>
+			      <property name="top_padding">0</property>
+			      <property name="bottom_padding">0</property>
+			      <property name="left_padding">0</property>
+			      <property name="right_padding">0</property>
 
 			      <child>
-				<widget class="GtkTable" id="local_welcome_message_table">
+				<widget class="GtkHBox" id="hbox9893">
 				  <property name="visible">True</property>
-				  <property name="n_rows">2</property>
-				  <property name="n_columns">2</property>
 				  <property name="homogeneous">False</property>
-				  <property name="row_spacing">0</property>
-				  <property name="column_spacing">12</property>
-
-				  <child>
-				    <widget class="GtkRadioButton" id="sg_customwelcome">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">C_ustom:</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <property name="active">False</property>
-				      <property name="inconsistent">False</property>
-				      <property name="draw_indicator">True</property>
-				      <property name="group">sg_defaultwelcome</property>
-				    </widget>
-				    <packing>
-				      <property name="left_attach">0</property>
-				      <property name="right_attach">1</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
-				    </packing>
-				  </child>
+				  <property name="spacing">2</property>
 
 				  <child>
-				    <widget class="GtkEntry" id="welcome">
+				    <widget class="GtkImage" id="image47">
 				      <property name="visible">True</property>
-				      <property name="sensitive">False</property>
-				      <property name="can_focus">True</property>
-				      <property name="editable">True</property>
-				      <property name="visibility">True</property>
-				      <property name="max_length">0</property>
-				      <property name="text" translatable="yes"></property>
-				      <property name="has_frame">True</property>
-				      <property name="invisible_char">*</property>
-				      <property name="activates_default">False</property>
+				      <property name="stock">gtk-apply</property>
+				      <property name="icon_size">4</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
 				    </widget>
 				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">0</property>
-				      <property name="bottom_attach">1</property>
-				      <property name="y_options"></property>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
 				    </packing>
 				  </child>
 
 				  <child>
-				    <widget class="GtkLabel" id="label_welcome_note">
+				    <widget class="GtkLabel" id="label438">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">%n will be replaced by hostname</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">True</property>
+				      <property name="label" translatable="yes">A_pply Command Changes</property>
+				      <property name="use_underline">True</property>
+				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
 				      <property name="wrap">False</property>
 				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
+				      <property name="xalign">0.5</property>
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
@@ -1483,116 +1190,125 @@
 				      <property name="angle">0</property>
 				    </widget>
 				    <packing>
-				      <property name="left_attach">1</property>
-				      <property name="right_attach">2</property>
-				      <property name="top_attach">1</property>
-				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options"></property>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
 				    </packing>
 				  </child>
 				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
 			      </child>
 			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
 			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			  <property name="pack_type">GTK_PACK_END</property>
 			</packing>
 		      </child>
+
+		      <child>
+			<placeholder/>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		      <property name="pack_type">GTK_PACK_END</property>
 		    </packing>
 		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="local_tab_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Local</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
 
-	  <child>
-	    <widget class="GtkVBox" id="remote_tab_vbox">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">18</property>
+	      <child>
+		<widget class="GtkLabel" id="general_tab_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">General</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0</property>
+		  <property name="yalign">0</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">tab</property>
+		</packing>
+	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox78">
+		<widget class="GtkVBox" id="local_tab_vbox">
+		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">18</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox116">
+		    <widget class="GtkVBox" id="local_style_vbox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">12</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="remote_stylelabel">
+			<widget class="GtkHBox" id="local_style_hbox">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Style:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">remote_greeter</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">12</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="local_stylelabel">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Style:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">local_greeter</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkComboBox" id="local_greeter">
+			      <property name="visible">True</property>
+			      <property name="items" translatable="yes">Plain
+Plain with face browser
+Themed</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -1602,97 +1318,2182 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkComboBox" id="remote_greeter">
+			<widget class="GtkVBox" id="local_properties_vbox">
 			  <property name="visible">True</property>
-			  <property name="items" translatable="yes">Remote login disabled
-Same as Local</property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
 
-		  <child>
-		    <widget class="GtkVBox" id="vbox79">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+			  <child>
+			    <widget class="GtkVBox" id="local_plain_properties_vbox">
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">18</property>
+
+			      <child>
+				<widget class="GtkVBox" id="local_plain_background_vbox">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkFixed" id="local_plain_fixed">
+				      <property name="height_request">6</property>
+				      <property name="visible">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="local_background_label">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Background</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">True</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="local_background_hbox">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">0</property>
+
+				      <child>
+					<widget class="GtkLabel" id="local_background_indent_label">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">    </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkTable" id="local_background_table">
+					  <property name="visible">True</property>
+					  <property name="n_rows">3</property>
+					  <property name="n_columns">2</property>
+					  <property name="homogeneous">False</property>
+					  <property name="row_spacing">6</property>
+					  <property name="column_spacing">12</property>
+
+					  <child>
+					    <widget class="GtkCheckButton" id="local_background_image_checkbutton">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="label" translatable="yes">_Image:</property>
+					      <property name="use_underline">True</property>
+					      <property name="relief">GTK_RELIEF_NORMAL</property>
+					      <property name="focus_on_click">True</property>
+					      <property name="active">False</property>
+					      <property name="inconsistent">False</property>
+					      <property name="draw_indicator">True</property>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">0</property>
+					      <property name="right_attach">1</property>
+					      <property name="top_attach">0</property>
+					      <property name="bottom_attach">1</property>
+					      <property name="x_options">fill</property>
+					      <property name="y_options"></property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkFileChooserButton" id="local_background_image_chooserbutton">
+					      <property name="visible">True</property>
+					      <property name="sensitive">False</property>
+					      <property name="title" translatable="yes">Select Background Image</property>
+					      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+					      <property name="local_only">True</property>
+					      <property name="show_hidden">False</property>
+					      <property name="do_overwrite_confirmation">False</property>
+					      <property name="width_chars">-1</property>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">1</property>
+					      <property name="right_attach">2</property>
+					      <property name="top_attach">0</property>
+					      <property name="bottom_attach">1</property>
+					      <property name="y_options">fill</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkHBox" id="local_background_scale_hbox">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">0</property>
+
+					      <child>
+						<widget class="GtkLabel" id="local_background_scale_indent_label">
+						  <property name="visible">True</property>
+						  <property name="label" translatable="yes">    </property>
+						  <property name="use_underline">False</property>
+						  <property name="use_markup">False</property>
+						  <property name="justify">GTK_JUSTIFY_LEFT</property>
+						  <property name="wrap">False</property>
+						  <property name="selectable">False</property>
+						  <property name="xalign">0.5</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xpad">0</property>
+						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+
+					      <child>
+						<widget class="GtkCheckButton" id="sg_scale_background">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="label" translatable="yes">Sc_ale to fit screen</property>
+						  <property name="use_underline">True</property>
+						  <property name="relief">GTK_RELIEF_NORMAL</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">0</property>
+					      <property name="right_attach">2</property>
+					      <property name="top_attach">1</property>
+					      <property name="bottom_attach">2</property>
+					      <property name="x_options">fill</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkColorButton" id="local_background_colorbutton">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="use_alpha">False</property>
+					      <property name="title" translatable="yes">Pick Background Color</property>
+					      <property name="focus_on_click">True</property>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">1</property>
+					      <property name="right_attach">2</property>
+					      <property name="top_attach">2</property>
+					      <property name="bottom_attach">3</property>
+					      <property name="y_options"></property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkHBox" id="hbox199">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">0</property>
+
+					      <child>
+						<widget class="GtkCheckButton" id="local_background_color_checkbutton">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="label" translatable="yes">Co_lor:</property>
+						  <property name="use_underline">True</property>
+						  <property name="relief">GTK_RELIEF_NORMAL</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">True</property>
+						  <property name="fill">True</property>
+						  <property name="pack_type">GTK_PACK_END</property>
+						</packing>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">0</property>
+					      <property name="right_attach">1</property>
+					      <property name="top_attach">2</property>
+					      <property name="bottom_attach">3</property>
+					      <property name="x_options">fill</property>
+					      <property name="y_options">fill</property>
+					    </packing>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="local_behaviour_label">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Behaviour</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">True</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox209">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label304">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes"> </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkCheckButton" id="local_quiver_checkbox">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">Quiver when incorrect username/password entered</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox219">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label317">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes"> </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkCheckButton" id="local_lock_pos_checkbox">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">Lock position</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox220">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label318">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes"> </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkCheckButton" id="local_set_pos_checkbox">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">Set position</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox221">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label323">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes"> </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label324">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">  </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label325">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Position X:</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="mnemonic_widget">local_background_theme_colorbutton</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkSpinButton" id="local_posx_spinbutton">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">False</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">1 0 100 1 10 10</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label326">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Position Y:</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="mnemonic_widget">local_background_theme_colorbutton</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkSpinButton" id="local_posy_spinbutton">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">False</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">1 0 100 1 10 10</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkVBox" id="local_plain_logo_vbox">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkLabel" id="local_logo_label">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Logo</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">True</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox102">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">0</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label169">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">    </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox104">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">12</property>
+
+					  <child>
+					    <widget class="GtkCheckButton" id="local_logo_image_checkbutton">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="label" translatable="yes">I_mage:</property>
+					      <property name="use_underline">True</property>
+					      <property name="relief">GTK_RELIEF_NORMAL</property>
+					      <property name="focus_on_click">True</property>
+					      <property name="active">False</property>
+					      <property name="inconsistent">False</property>
+					      <property name="draw_indicator">True</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkFileChooserButton" id="local_logo_image_chooserbutton">
+					      <property name="visible">True</property>
+					      <property name="sensitive">False</property>
+					      <property name="title" translatable="yes">Select Logo Image</property>
+					      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+					      <property name="local_only">True</property>
+					      <property name="show_hidden">False</property>
+					      <property name="do_overwrite_confirmation">False</property>
+					      <property name="width_chars">-1</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">True</property>
+					      <property name="fill">True</property>
+					    </packing>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkVBox" id="local_themed_properties_vbox">
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">6</property>
+
+			      <child>
+				<widget class="GtkHBox" id="hbox128">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">12</property>
+
+				  <child>
+				    <widget class="GtkLabel" id="local_theme_label">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">_Theme:</property>
+				      <property name="use_underline">True</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="mnemonic_widget">gg_mode_combobox</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkComboBox" id="gg_mode_combobox">
+				      <property name="visible">True</property>
+				      <property name="items" translatable="yes">Selected only
+Random from selected
+</property>
+				      <property name="add_tearoffs">False</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHBox" id="hbox92">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">12</property>
+
+				  <child>
+				    <widget class="GtkScrolledWindow" id="local_theme_scrolled_window">
+				      <property name="width_request">350</property>
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+				      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+				      <property name="shadow_type">GTK_SHADOW_IN</property>
+				      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+				      <child>
+					<widget class="GtkTreeView" id="gg_theme_list">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="headers_visible">False</property>
+					  <property name="rules_hint">False</property>
+					  <property name="reorderable">False</property>
+					  <property name="enable_search">True</property>
+					  <property name="fixed_height_mode">False</property>
+					  <property name="hover_selection">False</property>
+					  <property name="hover_expand">False</property>
+					</widget>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkVBox" id="vbox56">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">6</property>
+
+				      <child>
+					<widget class="GtkButton" id="gg_install_new_theme">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+
+					  <child>
+					    <widget class="GtkAlignment" id="alignment5">
+					      <property name="visible">True</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xscale">0</property>
+					      <property name="yscale">0</property>
+					      <property name="top_padding">0</property>
+					      <property name="bottom_padding">0</property>
+					      <property name="left_padding">0</property>
+					      <property name="right_padding">0</property>
+
+					      <child>
+						<widget class="GtkHBox" id="hbox107">
+						  <property name="visible">True</property>
+						  <property name="homogeneous">False</property>
+						  <property name="spacing">2</property>
+
+						  <child>
+						    <widget class="GtkImage" id="image1">
+						      <property name="visible">True</property>
+						      <property name="stock">gtk-add</property>
+						      <property name="icon_size">4</property>
+						      <property name="xalign">0.5</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						    </widget>
+						    <packing>
+						      <property name="padding">0</property>
+						      <property name="expand">False</property>
+						      <property name="fill">False</property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkLabel" id="label173">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">_Add...</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0.5</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="padding">0</property>
+						      <property name="expand">False</property>
+						      <property name="fill">False</property>
+						    </packing>
+						  </child>
+						</widget>
+					      </child>
+					    </widget>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkButton" id="gg_delete_theme">
+					  <property name="visible">True</property>
+					  <property name="sensitive">False</property>
+					  <property name="can_focus">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+
+					  <child>
+					    <widget class="GtkAlignment" id="alignment6">
+					      <property name="visible">True</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xscale">0</property>
+					      <property name="yscale">0</property>
+					      <property name="top_padding">0</property>
+					      <property name="bottom_padding">0</property>
+					      <property name="left_padding">0</property>
+					      <property name="right_padding">0</property>
+
+					      <child>
+						<widget class="GtkHBox" id="hbox108">
+						  <property name="visible">True</property>
+						  <property name="homogeneous">False</property>
+						  <property name="spacing">2</property>
+
+						  <child>
+						    <widget class="GtkImage" id="image2">
+						      <property name="visible">True</property>
+						      <property name="stock">gtk-remove</property>
+						      <property name="icon_size">4</property>
+						      <property name="xalign">0.5</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						    </widget>
+						    <packing>
+						      <property name="padding">0</property>
+						      <property name="expand">False</property>
+						      <property name="fill">False</property>
+						    </packing>
+						  </child>
+
+						  <child>
+						    <widget class="GtkLabel" id="LocalThemeRemoveButtonLabel">
+						      <property name="visible">True</property>
+						      <property name="label" translatable="yes">_Remove...</property>
+						      <property name="use_underline">True</property>
+						      <property name="use_markup">False</property>
+						      <property name="justify">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap">False</property>
+						      <property name="selectable">False</property>
+						      <property name="xalign">0.5</property>
+						      <property name="yalign">0.5</property>
+						      <property name="xpad">0</property>
+						      <property name="ypad">0</property>
+						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						      <property name="width_chars">-1</property>
+						      <property name="single_line_mode">False</property>
+						      <property name="angle">0</property>
+						    </widget>
+						    <packing>
+						      <property name="padding">0</property>
+						      <property name="expand">False</property>
+						      <property name="fill">False</property>
+						    </packing>
+						  </child>
+						</widget>
+					      </child>
+					    </widget>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkVBox" id="vbox87">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">12</property>
+
+					  <child>
+					    <widget class="GtkVBox" id="vbox89">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">3</property>
+
+					      <child>
+						<widget class="GtkLabel" id="gg_copyright_label">
+						  <property name="visible">True</property>
+						  <property name="label" translatable="yes">Copyright:</property>
+						  <property name="use_underline">False</property>
+						  <property name="use_markup">False</property>
+						  <property name="justify">GTK_JUSTIFY_LEFT</property>
+						  <property name="wrap">False</property>
+						  <property name="selectable">False</property>
+						  <property name="xalign">0</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xpad">0</property>
+						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+
+					      <child>
+						<widget class="GtkScrolledWindow" id="scrolledwindow11">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+						  <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+						  <property name="shadow_type">GTK_SHADOW_NONE</property>
+						  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+						  <child>
+						    <widget class="GtkTextView" id="gg_copyright_text_view">
+						      <property name="visible">True</property>
+						      <property name="editable">False</property>
+						      <property name="overwrite">False</property>
+						      <property name="accepts_tab">True</property>
+						      <property name="justification">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap_mode">GTK_WRAP_WORD</property>
+						      <property name="cursor_visible">False</property>
+						      <property name="pixels_above_lines">0</property>
+						      <property name="pixels_below_lines">0</property>
+						      <property name="pixels_inside_wrap">0</property>
+						      <property name="left_margin">0</property>
+						      <property name="right_margin">0</property>
+						      <property name="indent">0</property>
+						      <property name="text" translatable="yes"></property>
+						    </widget>
+						  </child>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					      <property name="pack_type">GTK_PACK_END</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkVBox" id="vbox88">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">3</property>
+
+					      <child>
+						<widget class="GtkLabel" id="gg_author_label">
+						  <property name="visible">True</property>
+						  <property name="label" translatable="yes">Author:</property>
+						  <property name="use_underline">False</property>
+						  <property name="use_markup">False</property>
+						  <property name="justify">GTK_JUSTIFY_LEFT</property>
+						  <property name="wrap">False</property>
+						  <property name="selectable">False</property>
+						  <property name="xalign">0</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xpad">0</property>
+						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+
+					      <child>
+						<widget class="GtkScrolledWindow" id="scrolledwindow12">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+						  <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+						  <property name="shadow_type">GTK_SHADOW_NONE</property>
+						  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+						  <child>
+						    <widget class="GtkTextView" id="gg_author_text_view">
+						      <property name="visible">True</property>
+						      <property name="editable">False</property>
+						      <property name="overwrite">False</property>
+						      <property name="accepts_tab">True</property>
+						      <property name="justification">GTK_JUSTIFY_LEFT</property>
+						      <property name="wrap_mode">GTK_WRAP_WORD</property>
+						      <property name="cursor_visible">False</property>
+						      <property name="pixels_above_lines">0</property>
+						      <property name="pixels_below_lines">0</property>
+						      <property name="pixels_inside_wrap">0</property>
+						      <property name="left_margin">0</property>
+						      <property name="right_margin">0</property>
+						      <property name="indent">0</property>
+						      <property name="text" translatable="yes"></property>
+						    </widget>
+						  </child>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					      <property name="pack_type">GTK_PACK_END</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <placeholder/>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkVBox" id="vbox90">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox129">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">0</property>
+
+				      <child>
+					<widget class="GtkTable" id="table14">
+					  <property name="visible">True</property>
+					  <property name="n_rows">1</property>
+					  <property name="n_columns">2</property>
+					  <property name="homogeneous">False</property>
+					  <property name="row_spacing">6</property>
+					  <property name="column_spacing">12</property>
+
+					  <child>
+					    <widget class="GtkLabel" id="label207">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">_Background color:</property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="mnemonic_widget">local_background_theme_colorbutton</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">0</property>
+					      <property name="right_attach">1</property>
+					      <property name="top_attach">0</property>
+					      <property name="bottom_attach">1</property>
+					      <property name="x_options">fill</property>
+					      <property name="y_options"></property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkColorButton" id="local_background_theme_colorbutton">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="use_alpha">False</property>
+					      <property name="title" translatable="yes">Pick Background Color</property>
+					      <property name="focus_on_click">True</property>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">1</property>
+					      <property name="right_attach">2</property>
+					      <property name="top_attach">0</property>
+					      <property name="bottom_attach">1</property>
+					      <property name="x_options">fill</property>
+					      <property name="y_options">expand</property>
+					    </packing>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkVBox" id="local_welcome_message_vbox1">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">18</property>
+
+		      <child>
+			<widget class="GtkVBox" id="LocalPlainMenuBarVBox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="local_menubar_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Menu Bar</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">True</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox103">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label170">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">    </property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkVBox" id="vbox73">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkCheckButton" id="sysmenu">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Sho_w Actions menu</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox105">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">0</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label171">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">    </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkCheckButton" id="config_available">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">Include Con_figure menu item</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox106">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">0</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label172">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">    </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkCheckButton" id="chooser_button">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">Includ_e Hostname Chooser (XDMCP) menu item</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox128">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="local_welcome_message_label">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Welcome Message</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">True</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHBox" id="local_welcome_message_hbox">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="local_welcome_message_indent">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">    </property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkVBox" id="local_welcome_message_vbox2">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkRadioButton" id="sg_defaultwelcome">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">_Default: &quot;Welcome&quot;</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkTable" id="local_welcome_message_table">
+				      <property name="visible">True</property>
+				      <property name="n_rows">2</property>
+				      <property name="n_columns">2</property>
+				      <property name="homogeneous">False</property>
+				      <property name="row_spacing">0</property>
+				      <property name="column_spacing">12</property>
+
+				      <child>
+					<widget class="GtkRadioButton" id="sg_customwelcome">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">C_ustom:</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					  <property name="group">sg_defaultwelcome</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">0</property>
+					  <property name="right_attach">1</property>
+					  <property name="top_attach">0</property>
+					  <property name="bottom_attach">1</property>
+					  <property name="x_options">fill</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkEntry" id="welcome">
+					  <property name="visible">True</property>
+					  <property name="sensitive">False</property>
+					  <property name="can_focus">True</property>
+					  <property name="editable">True</property>
+					  <property name="visibility">True</property>
+					  <property name="max_length">0</property>
+					  <property name="text" translatable="yes"></property>
+					  <property name="has_frame">True</property>
+					  <property name="invisible_char">*</property>
+					  <property name="activates_default">False</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">1</property>
+					  <property name="right_attach">2</property>
+					  <property name="top_attach">0</property>
+					  <property name="bottom_attach">1</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label_welcome_note">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">%n will be replaced by hostname</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">True</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">1</property>
+					  <property name="right_attach">2</property>
+					  <property name="top_attach">1</property>
+					  <property name="bottom_attach">2</property>
+					  <property name="x_options">fill</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">True</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="local_tab_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Local</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">tab</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkVBox" id="remote_tab_vbox">
+		  <property name="border_width">12</property>
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">18</property>
+
+		  <child>
+		    <widget class="GtkVBox" id="vbox78">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkVBox" id="remote_plain_properties_vbox">
+			<widget class="GtkHBox" id="hbox116">
+			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
-			  <property name="spacing">18</property>
+			  <property name="spacing">12</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="remote_stylelabel">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Style:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">remote_greeter</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkComboBox" id="remote_greeter">
+			      <property name="visible">True</property>
+			      <property name="items" translatable="yes">Remote login disabled
+Same as Local</property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="vbox79">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkVBox" id="remote_plain_properties_vbox">
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">18</property>
+
+			      <child>
+				<widget class="GtkVBox" id="vbox81">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkFixed" id="fixed2">
+				      <property name="height_request">6</property>
+				      <property name="visible">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="remote_plain_background_label">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">Background</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">True</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox117">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">0</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label186">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">    </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkVBox" id="vbox127">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">6</property>
+
+					  <child>
+					    <widget class="GtkHBox" id="remote_background_image_hhox">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">12</property>
+
+					      <child>
+						<widget class="GtkCheckButton" id="remote_background_image_checkbutton">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="label" translatable="yes">_Image:</property>
+						  <property name="use_underline">True</property>
+						  <property name="relief">GTK_RELIEF_NORMAL</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+
+					      <child>
+						<widget class="GtkFileChooserButton" id="remote_background_image_chooserbutton">
+						  <property name="visible">True</property>
+						  <property name="title" translatable="yes">Select Background Image</property>
+						  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+						  <property name="local_only">True</property>
+						  <property name="show_hidden">False</property>
+						  <property name="do_overwrite_confirmation">False</property>
+						  <property name="width_chars">-1</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">True</property>
+						  <property name="fill">True</property>
+						</packing>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">True</property>
+					      <property name="fill">True</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkHBox" id="sg_scale_background_remote_hbox">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">0</property>
+
+					      <child>
+						<widget class="GtkLabel" id="label187">
+						  <property name="visible">True</property>
+						  <property name="label" translatable="yes">    </property>
+						  <property name="use_underline">False</property>
+						  <property name="use_markup">False</property>
+						  <property name="justify">GTK_JUSTIFY_LEFT</property>
+						  <property name="wrap">False</property>
+						  <property name="selectable">False</property>
+						  <property name="xalign">0.5</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xpad">0</property>
+						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
 
-			  <child>
-			    <widget class="GtkVBox" id="vbox81">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
+					      <child>
+						<widget class="GtkCheckButton" id="sg_scale_background_remote">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="label" translatable="yes">Sc_ale to fit screen</property>
+						  <property name="use_underline">True</property>
+						  <property name="relief">GTK_RELIEF_NORMAL</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">True</property>
+					      <property name="fill">True</property>
+					    </packing>
+					  </child>
 
-			      <child>
-				<widget class="GtkFixed" id="fixed2">
-				  <property name="height_request">6</property>
-				  <property name="visible">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+					  <child>
+					    <widget class="GtkHBox" id="hbox127">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">0</property>
 
-			      <child>
-				<widget class="GtkLabel" id="remote_plain_background_label">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Background</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+					      <child>
+						<widget class="GtkLabel" id="label198">
+						  <property name="visible">True</property>
+						  <property name="label" translatable="yes">    </property>
+						  <property name="use_underline">False</property>
+						  <property name="use_markup">False</property>
+						  <property name="justify">GTK_JUSTIFY_LEFT</property>
+						  <property name="wrap">False</property>
+						  <property name="selectable">False</property>
+						  <property name="xalign">0.5</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xpad">0</property>
+						  <property name="ypad">0</property>
+						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+						  <property name="width_chars">-1</property>
+						  <property name="single_line_mode">False</property>
+						  <property name="angle">0</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
 
-			      <child>
-				<widget class="GtkHBox" id="hbox117">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
+					      <child>
+						<widget class="GtkCheckButton" id="sg_remote_color_only">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="label" translatable="yes">Do not show image for _remote logins</property>
+						  <property name="use_underline">True</property>
+						  <property name="relief">GTK_RELIEF_NORMAL</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">True</property>
+					      <property name="fill">True</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkHBox" id="remote_background_color_hbox">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">12</property>
+
+					      <child>
+						<widget class="GtkCheckButton" id="remote_background_color_checkbutton">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="label" translatable="yes">Co_lor:</property>
+						  <property name="use_underline">True</property>
+						  <property name="relief">GTK_RELIEF_NORMAL</property>
+						  <property name="focus_on_click">True</property>
+						  <property name="active">False</property>
+						  <property name="inconsistent">False</property>
+						  <property name="draw_indicator">True</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						</packing>
+					      </child>
+
+					      <child>
+						<widget class="GtkColorButton" id="remote_background_colorbutton">
+						  <property name="visible">True</property>
+						  <property name="can_focus">True</property>
+						  <property name="use_alpha">False</property>
+						  <property name="title" translatable="yes">Pick Background Color</property>
+						  <property name="focus_on_click">True</property>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">True</property>
+						  <property name="fill">True</property>
+						</packing>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">True</property>
+					      <property name="fill">True</property>
+					    </packing>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
 
 				  <child>
-				    <widget class="GtkLabel" id="label186">
+				    <widget class="GtkLabel" id="remote_behaviour_label">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">    </property>
+				      <property name="label" translatable="yes">Behaviour</property>
 				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
+				      <property name="use_markup">True</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
 				      <property name="wrap">False</property>
 				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
+				      <property name="xalign">0</property>
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
@@ -1703,226 +3504,351 @@
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox222">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label328">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes"> </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkCheckButton" id="remote_quiver_checkbox">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">Quiver when incorrect username/password entered</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox223">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label329">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes"> </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkCheckButton" id="remote_lock_pos_checkbox">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">Lock position</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
 				    </packing>
 				  </child>
 
 				  <child>
-				    <widget class="GtkVBox" id="vbox127">
+				    <widget class="GtkHBox" id="hbox224">
 				      <property name="visible">True</property>
 				      <property name="homogeneous">False</property>
-				      <property name="spacing">6</property>
+				      <property name="spacing">12</property>
 
 				      <child>
-					<widget class="GtkHBox" id="remote_background_image_hhox">
+					<widget class="GtkLabel" id="label330">
 					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">12</property>
+					  <property name="label" translatable="yes"> </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
 
-					  <child>
-					    <widget class="GtkCheckButton" id="remote_background_image_checkbutton">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">_Image:</property>
-					      <property name="use_underline">True</property>
-					      <property name="relief">GTK_RELIEF_NORMAL</property>
-					      <property name="focus_on_click">True</property>
-					      <property name="active">False</property>
-					      <property name="inconsistent">False</property>
-					      <property name="draw_indicator">True</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
+				      <child>
+					<widget class="GtkCheckButton" id="remote_set_pos_checkbox">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="label" translatable="yes">Set position:</property>
+					  <property name="use_underline">True</property>
+					  <property name="relief">GTK_RELIEF_NORMAL</property>
+					  <property name="focus_on_click">True</property>
+					  <property name="active">False</property>
+					  <property name="inconsistent">False</property>
+					  <property name="draw_indicator">True</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
 
-					  <child>
-					    <widget class="GtkFileChooserButton" id="remote_background_image_chooserbutton">
-					      <property name="visible">True</property>
-					      <property name="title" translatable="yes">Select Background Image</property>
-					      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-					      <property name="local_only">True</property>
-					      <property name="show_hidden">False</property>
-					      <property name="do_overwrite_confirmation">False</property>
-					      <property name="width_chars">-1</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
-					  </child>
+				  <child>
+				    <widget class="GtkHBox" id="hbox225">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label331">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes"> </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
 					</packing>
 				      </child>
 
 				      <child>
-					<widget class="GtkHBox" id="sg_scale_background_remote_hbox">
+					<widget class="GtkLabel" id="label332">
 					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">0</property>
+					  <property name="label" translatable="yes">  </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
 
-					  <child>
-					    <widget class="GtkLabel" id="label187">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">    </property>
-					      <property name="use_underline">False</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					      <property name="width_chars">-1</property>
-					      <property name="single_line_mode">False</property>
-					      <property name="angle">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
+				      <child>
+					<widget class="GtkLabel" id="label333">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Position X:</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="mnemonic_widget">local_background_theme_colorbutton</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
 
-					  <child>
-					    <widget class="GtkCheckButton" id="sg_scale_background_remote">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Sc_ale to fit screen</property>
-					      <property name="use_underline">True</property>
-					      <property name="relief">GTK_RELIEF_NORMAL</property>
-					      <property name="focus_on_click">True</property>
-					      <property name="active">False</property>
-					      <property name="inconsistent">False</property>
-					      <property name="draw_indicator">True</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
+				      <child>
+					<widget class="GtkSpinButton" id="remote_posx_spinbutton">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">False</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">1 0 100 1 10 10</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
-					  <property name="expand">True</property>
+					  <property name="expand">False</property>
 					  <property name="fill">True</property>
 					</packing>
 				      </child>
 
 				      <child>
-					<widget class="GtkHBox" id="hbox127">
+					<widget class="GtkLabel" id="label334">
 					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">0</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="label198">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">    </property>
-					      <property name="use_underline">False</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					      <property name="width_chars">-1</property>
-					      <property name="single_line_mode">False</property>
-					      <property name="angle">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkCheckButton" id="sg_remote_color_only">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Do not show image for _remote logins</property>
-					      <property name="use_underline">True</property>
-					      <property name="relief">GTK_RELIEF_NORMAL</property>
-					      <property name="focus_on_click">True</property>
-					      <property name="active">False</property>
-					      <property name="inconsistent">False</property>
-					      <property name="draw_indicator">True</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
+					  <property name="label" translatable="yes">Position Y:</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="mnemonic_widget">local_background_theme_colorbutton</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
 					</packing>
 				      </child>
 
 				      <child>
-					<widget class="GtkHBox" id="remote_background_color_hbox">
+					<widget class="GtkSpinButton" id="remote_posy_spinbutton">
 					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">12</property>
-
-					  <child>
-					    <widget class="GtkCheckButton" id="remote_background_color_checkbutton">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Co_lor:</property>
-					      <property name="use_underline">True</property>
-					      <property name="relief">GTK_RELIEF_NORMAL</property>
-					      <property name="focus_on_click">True</property>
-					      <property name="active">False</property>
-					      <property name="inconsistent">False</property>
-					      <property name="draw_indicator">True</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkColorButton" id="remote_background_colorbutton">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="use_alpha">False</property>
-					      <property name="title" translatable="yes">Pick Background Color</property>
-					      <property name="focus_on_click">True</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
-					  </child>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">False</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">1 0 100 1 10 10</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
-					  <property name="expand">True</property>
+					  <property name="expand">False</property>
 					  <property name="fill">True</property>
 					</packing>
 				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
+
+				      <child>
+					<placeholder/>
+				      </child>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -1933,65 +3859,27 @@
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkVBox" id="remote_plain_logo_vbox">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkLabel" id="remote_logo_label">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Logo</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
 				  <property name="expand">False</property>
 				  <property name="fill">False</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox122">
+				<widget class="GtkVBox" id="remote_plain_logo_vbox">
 				  <property name="visible">True</property>
 				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
+				  <property name="spacing">6</property>
 
 				  <child>
-				    <widget class="GtkLabel" id="label193">
+				    <widget class="GtkLabel" id="remote_logo_label">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">    </property>
+				      <property name="label" translatable="yes">Logo</property>
 				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
+				      <property name="use_markup">True</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
 				      <property name="wrap">False</property>
 				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
+				      <property name="xalign">0</property>
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
@@ -2008,22 +3896,28 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkHBox" id="remote_plain_logo_hbox">
+				    <widget class="GtkHBox" id="hbox122">
 				      <property name="visible">True</property>
 				      <property name="homogeneous">False</property>
-				      <property name="spacing">12</property>
+				      <property name="spacing">0</property>
 
 				      <child>
-					<widget class="GtkCheckButton" id="remote_logo_image_checkbutton">
+					<widget class="GtkLabel" id="label193">
 					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">I_mage:</property>
-					  <property name="use_underline">True</property>
-					  <property name="relief">GTK_RELIEF_NORMAL</property>
-					  <property name="focus_on_click">True</property>
-					  <property name="active">False</property>
-					  <property name="inconsistent">False</property>
-					  <property name="draw_indicator">True</property>
+					  <property name="label" translatable="yes">    </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -2033,14 +3927,46 @@
 				      </child>
 
 				      <child>
-					<widget class="GtkFileChooserButton" id="remote_logo_image_chooserbutton">
+					<widget class="GtkHBox" id="remote_plain_logo_hbox">
 					  <property name="visible">True</property>
-					  <property name="title" translatable="yes">Select Logo Image</property>
-					  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-					  <property name="local_only">True</property>
-					  <property name="show_hidden">False</property>
-					  <property name="do_overwrite_confirmation">False</property>
-					  <property name="width_chars">-1</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">12</property>
+
+					  <child>
+					    <widget class="GtkCheckButton" id="remote_logo_image_checkbutton">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="label" translatable="yes">I_mage:</property>
+					      <property name="use_underline">True</property>
+					      <property name="relief">GTK_RELIEF_NORMAL</property>
+					      <property name="focus_on_click">True</property>
+					      <property name="active">False</property>
+					      <property name="inconsistent">False</property>
+					      <property name="draw_indicator">True</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkFileChooserButton" id="remote_logo_image_chooserbutton">
+					      <property name="visible">True</property>
+					      <property name="title" translatable="yes">Select Logo Image</property>
+					      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+					      <property name="local_only">True</property>
+					      <property name="show_hidden">False</property>
+					      <property name="do_overwrite_confirmation">False</property>
+					      <property name="width_chars">-1</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">True</property>
+					      <property name="fill">True</property>
+					    </packing>
+					  </child>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -2065,179 +3991,299 @@
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="remote_themed_properties_vbox">
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkVBox" id="vbox91">
-			      <property name="visible">True</property>
+			    <widget class="GtkVBox" id="remote_themed_properties_vbox">
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkHBox" id="remote_theme_mode_hbox">
+				<widget class="GtkVBox" id="vbox91">
 				  <property name="visible">True</property>
 				  <property name="homogeneous">False</property>
-				  <property name="spacing">12</property>
-
-				  <child>
-				    <widget class="GtkLabel" id="remote_theme_label">
-				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">_Theme:</property>
-				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">gg_mode_combobox_remote</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
+				  <property name="spacing">6</property>
 
 				  <child>
-				    <widget class="GtkComboBox" id="gg_mode_combobox_remote">
+				    <widget class="GtkHBox" id="remote_theme_mode_hbox">
 				      <property name="visible">True</property>
-				      <property name="items" translatable="yes">Selected only
-Random from selected
-</property>
-				      <property name="add_tearoffs">False</property>
-				      <property name="focus_on_click">True</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="remote_theme_select_hbox">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">12</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">12</property>
 
-				  <child>
-				    <widget class="GtkScrolledWindow" id="scrolledwindow13">
-				      <property name="width_request">350</property>
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-				      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-				      <property name="shadow_type">GTK_SHADOW_IN</property>
-				      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+				      <child>
+					<widget class="GtkLabel" id="remote_theme_label">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">_Theme:</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="mnemonic_widget">gg_mode_combobox_remote</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
 
 				      <child>
-					<widget class="GtkTreeView" id="gg_theme_list_remote">
+					<widget class="GtkComboBox" id="gg_mode_combobox_remote">
 					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="headers_visible">False</property>
-					  <property name="rules_hint">False</property>
-					  <property name="reorderable">False</property>
-					  <property name="enable_search">True</property>
-					  <property name="fixed_height_mode">False</property>
-					  <property name="hover_selection">False</property>
-					  <property name="hover_expand">False</property>
+					  <property name="items" translatable="yes">Selected only
+Random from selected
+</property>
+					  <property name="add_tearoffs">False</property>
+					  <property name="focus_on_click">True</property>
 					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
 				      </child>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
 				    </packing>
 				  </child>
 
 				  <child>
-				    <widget class="GtkVBox" id="vbox92">
+				    <widget class="GtkHBox" id="remote_theme_select_hbox">
 				      <property name="visible">True</property>
 				      <property name="homogeneous">False</property>
-				      <property name="spacing">6</property>
+				      <property name="spacing">12</property>
 
 				      <child>
-					<widget class="GtkButton" id="gg_install_new_theme_remote">
+					<widget class="GtkScrolledWindow" id="scrolledwindow13">
+					  <property name="width_request">350</property>
 					  <property name="visible">True</property>
 					  <property name="can_focus">True</property>
-					  <property name="relief">GTK_RELIEF_NORMAL</property>
-					  <property name="focus_on_click">True</property>
+					  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+					  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+					  <property name="shadow_type">GTK_SHADOW_IN</property>
+					  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 					  <child>
-					    <widget class="GtkAlignment" id="alignment9">
+					    <widget class="GtkTreeView" id="gg_theme_list_remote">
 					      <property name="visible">True</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xscale">0</property>
-					      <property name="yscale">0</property>
-					      <property name="top_padding">0</property>
-					      <property name="bottom_padding">0</property>
-					      <property name="left_padding">0</property>
-					      <property name="right_padding">0</property>
+					      <property name="can_focus">True</property>
+					      <property name="headers_visible">False</property>
+					      <property name="rules_hint">False</property>
+					      <property name="reorderable">False</property>
+					      <property name="enable_search">True</property>
+					      <property name="fixed_height_mode">False</property>
+					      <property name="hover_selection">False</property>
+					      <property name="hover_expand">False</property>
+					    </widget>
+					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">True</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkVBox" id="vbox92">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">6</property>
+
+					  <child>
+					    <widget class="GtkButton" id="gg_install_new_theme_remote">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="relief">GTK_RELIEF_NORMAL</property>
+					      <property name="focus_on_click">True</property>
 
 					      <child>
-						<widget class="GtkHBox" id="hbox132">
+						<widget class="GtkAlignment" id="alignment9">
 						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">2</property>
+						  <property name="xalign">0.5</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xscale">0</property>
+						  <property name="yscale">0</property>
+						  <property name="top_padding">0</property>
+						  <property name="bottom_padding">0</property>
+						  <property name="left_padding">0</property>
+						  <property name="right_padding">0</property>
 
 						  <child>
-						    <widget class="GtkImage" id="image5">
+						    <widget class="GtkHBox" id="hbox132">
 						      <property name="visible">True</property>
-						      <property name="stock">gtk-add</property>
-						      <property name="icon_size">4</property>
-						      <property name="xalign">0.5</property>
-						      <property name="yalign">0.5</property>
-						      <property name="xpad">0</property>
-						      <property name="ypad">0</property>
+						      <property name="homogeneous">False</property>
+						      <property name="spacing">2</property>
+
+						      <child>
+							<widget class="GtkImage" id="image5">
+							  <property name="visible">True</property>
+							  <property name="stock">gtk-add</property>
+							  <property name="icon_size">4</property>
+							  <property name="xalign">0.5</property>
+							  <property name="yalign">0.5</property>
+							  <property name="xpad">0</property>
+							  <property name="ypad">0</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
+
+						      <child>
+							<widget class="GtkLabel" id="label209">
+							  <property name="visible">True</property>
+							  <property name="label" translatable="yes">_Add...</property>
+							  <property name="use_underline">True</property>
+							  <property name="use_markup">False</property>
+							  <property name="justify">GTK_JUSTIFY_LEFT</property>
+							  <property name="wrap">False</property>
+							  <property name="selectable">False</property>
+							  <property name="xalign">0.5</property>
+							  <property name="yalign">0.5</property>
+							  <property name="xpad">0</property>
+							  <property name="ypad">0</property>
+							  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+							  <property name="width_chars">-1</property>
+							  <property name="single_line_mode">False</property>
+							  <property name="angle">0</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
+						    </widget>
+						  </child>
+						</widget>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkButton" id="gg_delete_theme_remote">
+					      <property name="visible">True</property>
+					      <property name="sensitive">False</property>
+					      <property name="can_focus">True</property>
+					      <property name="relief">GTK_RELIEF_NORMAL</property>
+					      <property name="focus_on_click">True</property>
+
+					      <child>
+						<widget class="GtkAlignment" id="alignment10">
+						  <property name="visible">True</property>
+						  <property name="xalign">0.5</property>
+						  <property name="yalign">0.5</property>
+						  <property name="xscale">0</property>
+						  <property name="yscale">0</property>
+						  <property name="top_padding">0</property>
+						  <property name="bottom_padding">0</property>
+						  <property name="left_padding">0</property>
+						  <property name="right_padding">0</property>
+
+						  <child>
+						    <widget class="GtkHBox" id="hbox133">
+						      <property name="visible">True</property>
+						      <property name="homogeneous">False</property>
+						      <property name="spacing">2</property>
+
+						      <child>
+							<widget class="GtkImage" id="remove_image">
+							  <property name="visible">True</property>
+							  <property name="stock">gtk-remove</property>
+							  <property name="icon_size">4</property>
+							  <property name="xalign">0.5</property>
+							  <property name="yalign">0.5</property>
+							  <property name="xpad">0</property>
+							  <property name="ypad">0</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
+
+						      <child>
+							<widget class="GtkLabel" id="label210">
+							  <property name="visible">True</property>
+							  <property name="label" translatable="yes">_Remove...</property>
+							  <property name="use_underline">True</property>
+							  <property name="use_markup">False</property>
+							  <property name="justify">GTK_JUSTIFY_LEFT</property>
+							  <property name="wrap">False</property>
+							  <property name="selectable">False</property>
+							  <property name="xalign">0.5</property>
+							  <property name="yalign">0.5</property>
+							  <property name="xpad">0</property>
+							  <property name="ypad">0</property>
+							  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+							  <property name="width_chars">-1</property>
+							  <property name="single_line_mode">False</property>
+							  <property name="angle">0</property>
+							</widget>
+							<packing>
+							  <property name="padding">0</property>
+							  <property name="expand">False</property>
+							  <property name="fill">False</property>
+							</packing>
+						      </child>
 						    </widget>
-						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						    </packing>
 						  </child>
+						</widget>
+					      </child>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkVBox" id="vbox93">
+					      <property name="visible">True</property>
+					      <property name="homogeneous">False</property>
+					      <property name="spacing">12</property>
+
+					      <child>
+						<widget class="GtkVBox" id="vbox94">
+						  <property name="visible">True</property>
+						  <property name="homogeneous">False</property>
+						  <property name="spacing">3</property>
 
 						  <child>
-						    <widget class="GtkLabel" id="label209">
+						    <widget class="GtkLabel" id="label211">
 						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">_Add...</property>
-						      <property name="use_underline">True</property>
+						      <property name="label" translatable="yes">Copyright:</property>
+						      <property name="use_underline">False</property>
 						      <property name="use_markup">False</property>
 						      <property name="justify">GTK_JUSTIFY_LEFT</property>
 						      <property name="wrap">False</property>
 						      <property name="selectable">False</property>
-						      <property name="xalign">0.5</property>
+						      <property name="xalign">0</property>
 						      <property name="yalign">0.5</property>
 						      <property name="xpad">0</property>
 						      <property name="ypad">0</property>
@@ -2252,53 +4298,34 @@
 						      <property name="fill">False</property>
 						    </packing>
 						  </child>
-						</widget>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkButton" id="gg_delete_theme_remote">
-					  <property name="visible">True</property>
-					  <property name="sensitive">False</property>
-					  <property name="can_focus">True</property>
-					  <property name="relief">GTK_RELIEF_NORMAL</property>
-					  <property name="focus_on_click">True</property>
-
-					  <child>
-					    <widget class="GtkAlignment" id="alignment10">
-					      <property name="visible">True</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xscale">0</property>
-					      <property name="yscale">0</property>
-					      <property name="top_padding">0</property>
-					      <property name="bottom_padding">0</property>
-					      <property name="left_padding">0</property>
-					      <property name="right_padding">0</property>
-
-					      <child>
-						<widget class="GtkHBox" id="hbox133">
-						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">2</property>
 
 						  <child>
-						    <widget class="GtkImage" id="remove_image">
+						    <widget class="GtkScrolledWindow" id="scrolledwindow14">
 						      <property name="visible">True</property>
-						      <property name="stock">gtk-remove</property>
-						      <property name="icon_size">4</property>
-						      <property name="xalign">0.5</property>
-						      <property name="yalign">0.5</property>
-						      <property name="xpad">0</property>
-						      <property name="ypad">0</property>
+						      <property name="can_focus">True</property>
+						      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+						      <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+						      <property name="shadow_type">GTK_SHADOW_NONE</property>
+						      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+						      <child>
+							<widget class="GtkTextView" id="gg_copyright_text_view_remote">
+							  <property name="visible">True</property>
+							  <property name="editable">False</property>
+							  <property name="overwrite">False</property>
+							  <property name="accepts_tab">True</property>
+							  <property name="justification">GTK_JUSTIFY_LEFT</property>
+							  <property name="wrap_mode">GTK_WRAP_WORD</property>
+							  <property name="cursor_visible">False</property>
+							  <property name="pixels_above_lines">0</property>
+							  <property name="pixels_below_lines">0</property>
+							  <property name="pixels_inside_wrap">0</property>
+							  <property name="left_margin">0</property>
+							  <property name="right_margin">0</property>
+							  <property name="indent">0</property>
+							  <property name="text" translatable="yes"></property>
+							</widget>
+						      </child>
 						    </widget>
 						    <packing>
 						      <property name="padding">0</property>
@@ -2306,17 +4333,31 @@
 						      <property name="fill">False</property>
 						    </packing>
 						  </child>
+						</widget>
+						<packing>
+						  <property name="padding">0</property>
+						  <property name="expand">False</property>
+						  <property name="fill">False</property>
+						  <property name="pack_type">GTK_PACK_END</property>
+						</packing>
+					      </child>
+
+					      <child>
+						<widget class="GtkVBox" id="vbox95">
+						  <property name="visible">True</property>
+						  <property name="homogeneous">False</property>
+						  <property name="spacing">3</property>
 
 						  <child>
-						    <widget class="GtkLabel" id="label210">
+						    <widget class="GtkLabel" id="label212">
 						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">_Remove...</property>
-						      <property name="use_underline">True</property>
+						      <property name="label" translatable="yes">Author:</property>
+						      <property name="use_underline">False</property>
 						      <property name="use_markup">False</property>
 						      <property name="justify">GTK_JUSTIFY_LEFT</property>
 						      <property name="wrap">False</property>
 						      <property name="selectable">False</property>
-						      <property name="xalign">0.5</property>
+						      <property name="xalign">0</property>
 						      <property name="yalign">0.5</property>
 						      <property name="xpad">0</property>
 						      <property name="ypad">0</property>
@@ -2331,109 +4372,101 @@
 						      <property name="fill">False</property>
 						    </packing>
 						  </child>
-						</widget>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkVBox" id="vbox93">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">12</property>
-
-					  <child>
-					    <widget class="GtkVBox" id="vbox94">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">3</property>
-
-					      <child>
-						<widget class="GtkLabel" id="label211">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Copyright:</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-						  <property name="width_chars">-1</property>
-						  <property name="single_line_mode">False</property>
-						  <property name="angle">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkScrolledWindow" id="scrolledwindow14">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-						  <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-						  <property name="shadow_type">GTK_SHADOW_NONE</property>
-						  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 						  <child>
-						    <widget class="GtkTextView" id="gg_copyright_text_view_remote">
+						    <widget class="GtkScrolledWindow" id="scrolledwindow15">
 						      <property name="visible">True</property>
-						      <property name="editable">False</property>
-						      <property name="overwrite">False</property>
-						      <property name="accepts_tab">True</property>
-						      <property name="justification">GTK_JUSTIFY_LEFT</property>
-						      <property name="wrap_mode">GTK_WRAP_WORD</property>
-						      <property name="cursor_visible">False</property>
-						      <property name="pixels_above_lines">0</property>
-						      <property name="pixels_below_lines">0</property>
-						      <property name="pixels_inside_wrap">0</property>
-						      <property name="left_margin">0</property>
-						      <property name="right_margin">0</property>
-						      <property name="indent">0</property>
-						      <property name="text" translatable="yes"></property>
+						      <property name="can_focus">True</property>
+						      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+						      <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+						      <property name="shadow_type">GTK_SHADOW_NONE</property>
+						      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+						      <child>
+							<widget class="GtkTextView" id="gg_author_text_view_remote">
+							  <property name="visible">True</property>
+							  <property name="editable">False</property>
+							  <property name="overwrite">False</property>
+							  <property name="accepts_tab">True</property>
+							  <property name="justification">GTK_JUSTIFY_LEFT</property>
+							  <property name="wrap_mode">GTK_WRAP_WORD</property>
+							  <property name="cursor_visible">False</property>
+							  <property name="pixels_above_lines">0</property>
+							  <property name="pixels_below_lines">0</property>
+							  <property name="pixels_inside_wrap">0</property>
+							  <property name="left_margin">0</property>
+							  <property name="right_margin">0</property>
+							  <property name="indent">0</property>
+							  <property name="text" translatable="yes"></property>
+							</widget>
+						      </child>
 						    </widget>
+						    <packing>
+						      <property name="padding">0</property>
+						      <property name="expand">False</property>
+						      <property name="fill">False</property>
+						    </packing>
 						  </child>
 						</widget>
 						<packing>
 						  <property name="padding">0</property>
 						  <property name="expand">False</property>
 						  <property name="fill">False</property>
+						  <property name="pack_type">GTK_PACK_END</property>
 						</packing>
 					      </child>
+
+					      <child>
+						<placeholder/>
+					      </child>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					      <property name="pack_type">GTK_PACK_END</property>
+					      <property name="expand">True</property>
+					      <property name="fill">True</property>
 					    </packing>
 					  </child>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkVBox" id="vbox96">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">6</property>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox134">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">0</property>
 
 					  <child>
-					    <widget class="GtkVBox" id="vbox95">
+					    <widget class="GtkTable" id="remote_theme_background_hbox">
 					      <property name="visible">True</property>
+					      <property name="n_rows">1</property>
+					      <property name="n_columns">2</property>
 					      <property name="homogeneous">False</property>
-					      <property name="spacing">3</property>
+					      <property name="row_spacing">6</property>
+					      <property name="column_spacing">12</property>
 
 					      <child>
-						<widget class="GtkLabel" id="label212">
+						<widget class="GtkLabel" id="label215">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Author:</property>
-						  <property name="use_underline">False</property>
+						  <property name="label" translatable="yes">_Background color:</property>
+						  <property name="use_underline">True</property>
 						  <property name="use_markup">False</property>
 						  <property name="justify">GTK_JUSTIFY_LEFT</property>
 						  <property name="wrap">False</property>
@@ -2442,64 +4475,46 @@
 						  <property name="yalign">0.5</property>
 						  <property name="xpad">0</property>
 						  <property name="ypad">0</property>
+						  <property name="mnemonic_widget">remote_background_theme_colorbutton</property>
 						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 						  <property name="width_chars">-1</property>
 						  <property name="single_line_mode">False</property>
 						  <property name="angle">0</property>
 						</widget>
 						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
+						  <property name="left_attach">0</property>
+						  <property name="right_attach">1</property>
+						  <property name="top_attach">0</property>
+						  <property name="bottom_attach">1</property>
+						  <property name="x_options">fill</property>
+						  <property name="y_options"></property>
 						</packing>
 					      </child>
 
 					      <child>
-						<widget class="GtkScrolledWindow" id="scrolledwindow15">
+						<widget class="GtkColorButton" id="remote_background_theme_colorbutton">
 						  <property name="visible">True</property>
 						  <property name="can_focus">True</property>
-						  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-						  <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
-						  <property name="shadow_type">GTK_SHADOW_NONE</property>
-						  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-						  <child>
-						    <widget class="GtkTextView" id="gg_author_text_view_remote">
-						      <property name="visible">True</property>
-						      <property name="editable">False</property>
-						      <property name="overwrite">False</property>
-						      <property name="accepts_tab">True</property>
-						      <property name="justification">GTK_JUSTIFY_LEFT</property>
-						      <property name="wrap_mode">GTK_WRAP_WORD</property>
-						      <property name="cursor_visible">False</property>
-						      <property name="pixels_above_lines">0</property>
-						      <property name="pixels_below_lines">0</property>
-						      <property name="pixels_inside_wrap">0</property>
-						      <property name="left_margin">0</property>
-						      <property name="right_margin">0</property>
-						      <property name="indent">0</property>
-						      <property name="text" translatable="yes"></property>
-						    </widget>
-						  </child>
+						  <property name="use_alpha">False</property>
+						  <property name="title" translatable="yes">Pick Background Color</property>
+						  <property name="focus_on_click">True</property>
 						</widget>
 						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
+						  <property name="left_attach">1</property>
+						  <property name="right_attach">2</property>
+						  <property name="top_attach">0</property>
+						  <property name="bottom_attach">1</property>
+						  <property name="x_options">fill</property>
+						  <property name="y_options">expand</property>
 						</packing>
 					      </child>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					      <property name="pack_type">GTK_PACK_END</property>
+					      <property name="expand">True</property>
+					      <property name="fill">True</property>
 					    </packing>
 					  </child>
-
-					  <child>
-					    <placeholder/>
-					  </child>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
@@ -2521,95 +4536,6 @@
 				  <property name="fill">True</property>
 				</packing>
 			      </child>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox96">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox134">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">0</property>
-
-				      <child>
-					<widget class="GtkTable" id="remote_theme_background_hbox">
-					  <property name="visible">True</property>
-					  <property name="n_rows">1</property>
-					  <property name="n_columns">2</property>
-					  <property name="homogeneous">False</property>
-					  <property name="row_spacing">6</property>
-					  <property name="column_spacing">12</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="label215">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">_Background color:</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="mnemonic_widget">remote_background_theme_colorbutton</property>
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					      <property name="width_chars">-1</property>
-					      <property name="single_line_mode">False</property>
-					      <property name="angle">0</property>
-					    </widget>
-					    <packing>
-					      <property name="left_attach">0</property>
-					      <property name="right_attach">1</property>
-					      <property name="top_attach">0</property>
-					      <property name="bottom_attach">1</property>
-					      <property name="x_options">fill</property>
-					      <property name="y_options"></property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkColorButton" id="remote_background_theme_colorbutton">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="use_alpha">False</property>
-					      <property name="title" translatable="yes">Pick Background Color</property>
-					      <property name="focus_on_click">True</property>
-					    </widget>
-					    <packing>
-					      <property name="left_attach">1</property>
-					      <property name="right_attach">2</property>
-					      <property name="top_attach">0</property>
-					      <property name="bottom_attach">1</property>
-					      <property name="x_options">fill</property>
-					      <property name="y_options">expand</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">True</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2631,60 +4557,22 @@
 		      <property name="fill">True</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="remote_welcome_message_vbox">
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="remote_welcome_message_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Welcome Message</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox98">
-		      <property name="visible">True</property>
+		    <widget class="GtkVBox" id="remote_welcome_message_vbox">
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label161">
+			<widget class="GtkLabel" id="remote_welcome_message_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
+			  <property name="label" translatable="yes">Welcome Message</property>
 			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
+			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
+			  <property name="xalign">0</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
@@ -2701,22 +4589,28 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox66">
+			<widget class="GtkHBox" id="hbox98">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkRadioButton" id="sg_defaultwelcomeremote">
+			    <widget class="GtkLabel" id="label161">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Default: &quot;Welcome to %n&quot;</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
+			      <property name="label" translatable="yes">    </property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2726,91 +4620,123 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkTable" id="table11">
+			    <widget class="GtkVBox" id="vbox66">
 			      <property name="visible">True</property>
-			      <property name="n_rows">2</property>
-			      <property name="n_columns">2</property>
 			      <property name="homogeneous">False</property>
-			      <property name="row_spacing">0</property>
-			      <property name="column_spacing">12</property>
+			      <property name="spacing">0</property>
 
 			      <child>
-				<widget class="GtkRadioButton" id="sg_customwelcomeremote">
+				<widget class="GtkRadioButton" id="sg_defaultwelcomeremote">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">C_ustom:</property>
+				  <property name="label" translatable="yes">_Default: &quot;Welcome to %n&quot;</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <property name="group">sg_defaultwelcomeremote</property>
 				</widget>
 				<packing>
-				  <property name="left_attach">0</property>
-				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkEntry" id="welcomeremote">
+				<widget class="GtkTable" id="table11">
 				  <property name="visible">True</property>
-				  <property name="sensitive">False</property>
-				  <property name="can_focus">True</property>
-				  <property name="editable">True</property>
-				  <property name="visibility">True</property>
-				  <property name="max_length">0</property>
-				  <property name="text" translatable="yes"></property>
-				  <property name="has_frame">True</property>
-				  <property name="invisible_char">*</property>
-				  <property name="activates_default">False</property>
-				</widget>
-				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
-				  <property name="y_options"></property>
-				</packing>
-			      </child>
+				  <property name="n_rows">2</property>
+				  <property name="n_columns">2</property>
+				  <property name="homogeneous">False</property>
+				  <property name="row_spacing">0</property>
+				  <property name="column_spacing">12</property>
+
+				  <child>
+				    <widget class="GtkRadioButton" id="sg_customwelcomeremote">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">C_ustom:</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				      <property name="group">sg_defaultwelcomeremote</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">0</property>
+				      <property name="right_attach">1</property>
+				      <property name="top_attach">0</property>
+				      <property name="bottom_attach">1</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
 
-			      <child>
-				<widget class="GtkLabel" id="label_welcomeremote_note">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">%n will be replaced by hostname</property>
-				  <property name="use_underline">False</property>
-				  <property name="use_markup">True</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
+				  <child>
+				    <widget class="GtkEntry" id="welcomeremote">
+				      <property name="visible">True</property>
+				      <property name="sensitive">False</property>
+				      <property name="can_focus">True</property>
+				      <property name="editable">True</property>
+				      <property name="visibility">True</property>
+				      <property name="max_length">0</property>
+				      <property name="text" translatable="yes"></property>
+				      <property name="has_frame">True</property>
+				      <property name="invisible_char">*</property>
+				      <property name="activates_default">False</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">0</property>
+				      <property name="bottom_attach">1</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="label_welcomeremote_note">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">%n will be replaced by hostname</property>
+				      <property name="use_underline">False</property>
+				      <property name="use_markup">True</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="left_attach">1</property>
+				      <property name="right_attach">2</property>
+				      <property name="top_attach">1</property>
+				      <property name="bottom_attach">2</property>
+				      <property name="x_options">fill</property>
+				      <property name="y_options"></property>
+				    </packing>
+				  </child>
 				</widget>
 				<packing>
-				  <property name="left_attach">1</property>
-				  <property name="right_attach">2</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options"></property>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
 				</packing>
 			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
@@ -2823,43 +4749,43 @@
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="remote_configure_xdmcp_vbox">
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="remove_configure_xdmcp_hbox">
-		      <property name="visible">True</property>
+		    <widget class="GtkVBox" id="remote_configure_xdmcp_vbox">
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkButton" id="xdmcp_configbutton">
+			<widget class="GtkHBox" id="remove_configure_xdmcp_hbox">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Configure _XDMCP...</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkButton" id="xdmcp_configbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Configure _XDMCP...</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			      <property name="pack_type">GTK_PACK_END</property>
+			    </packing>
+			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
-			  <property name="pack_type">GTK_PACK_END</property>
 			</packing>
 		      </child>
 		    </widget>
@@ -2871,185 +4797,52 @@
 		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="remote_tab_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Remote</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="accessibility_tab_vbox">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">18</property>
-
-	      <child>
-		<widget class="GtkCheckButton" id="acc_modules">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">_Enable accessible login</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="themes_vbox">
+		<widget class="GtkLabel" id="remote_tab_label">
 		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="themes_label">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Themes</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="themes_category_hbox">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="themes_indent_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="acc_theme">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Allow users to change fonts and colors of plain greeter</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+		  <property name="label" translatable="yes">Remote</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="type">tab</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="sounds_vbox">
+		<widget class="GtkVBox" id="accessibility_tab_vbox">
+		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">18</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="sounds_label">
+		    <widget class="GtkCheckButton" id="acc_modules">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Sounds</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Enable accessible login</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -3059,21 +4852,21 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="sounds_category_hbox">
+		    <widget class="GtkVBox" id="themes_vbox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="sounds_indent_label">
+			<widget class="GtkLabel" id="themes_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
+			  <property name="label" translatable="yes">Themes</property>
 			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
+			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
 			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
+			  <property name="xalign">0</property>
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
@@ -3090,41 +4883,41 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkTable" id="sounds_table">
+			<widget class="GtkHBox" id="themes_category_hbox">
 			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">2</property>
 			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">12</property>
+			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="acc_sound_ready">
+			    <widget class="GtkLabel" id="themes_indent_label">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Login screen ready:</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
+			      <property name="label" translatable="yes">    </property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="acc_sound_success">
+			    <widget class="GtkCheckButton" id="acc_theme">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Login _successful:</property>
+			      <property name="label" translatable="yes">_Allow users to change fonts and colors of plain greeter</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -3133,178 +4926,311 @@
 			      <property name="draw_indicator">True</property>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkVBox" id="sounds_vbox">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<widget class="GtkLabel" id="sounds_label">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Sounds</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">True</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkHBox" id="sounds_category_hbox">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="acc_sound_failure">
+			    <widget class="GtkLabel" id="sounds_indent_label">
 			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Login _failed:</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
+			      <property name="label" translatable="yes">    </property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox182">
+			    <widget class="GtkTable" id="sounds_table">
 			      <property name="visible">True</property>
+			      <property name="n_rows">3</property>
+			      <property name="n_columns">2</property>
 			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
 
 			      <child>
-				<widget class="GtkFileChooserButton" id="acc_sound_ready_button">
+				<widget class="GtkCheckButton" id="acc_sound_ready">
 				  <property name="visible">True</property>
-				  <property name="title" translatable="yes">Select Sound File</property>
-				  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-				  <property name="local_only">True</property>
-				  <property name="show_hidden">False</property>
-				  <property name="do_overwrite_confirmation">False</property>
-				  <property name="width_chars">-1</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">_Login screen ready:</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkButton" id="acc_soundtest_ready_button">
+				<widget class="GtkCheckButton" id="acc_sound_success">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
-				  <property name="label">gtk-media-play</property>
-				  <property name="use_stock">True</property>
+				  <property name="label" translatable="yes">Login _successful:</property>
+				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
 
-			  <child>
-			    <widget class="GtkHBox" id="hbox183">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
+			      <child>
+				<widget class="GtkCheckButton" id="acc_sound_failure">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Login _failed:</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
 			      <child>
-				<widget class="GtkFileChooserButton" id="acc_sound_success_button">
+				<widget class="GtkHBox" id="hbox182">
 				  <property name="visible">True</property>
-				  <property name="title" translatable="yes">Select Sound File</property>
-				  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-				  <property name="local_only">True</property>
-				  <property name="show_hidden">False</property>
-				  <property name="do_overwrite_confirmation">False</property>
-				  <property name="width_chars">-1</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkFileChooserButton" id="acc_sound_ready_button">
+				      <property name="visible">True</property>
+				      <property name="title" translatable="yes">Select Sound File</property>
+				      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+				      <property name="local_only">True</property>
+				      <property name="show_hidden">False</property>
+				      <property name="do_overwrite_confirmation">False</property>
+				      <property name="width_chars">-1</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="acc_soundtest_ready_button">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-media-play</property>
+				      <property name="use_stock">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options">fill</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkButton" id="acc_soundtest_success_button">
+				<widget class="GtkHBox" id="hbox183">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label">gtk-media-play</property>
-				  <property name="use_stock">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
 
-			  <child>
-			    <widget class="GtkHBox" id="hbox184">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
+				  <child>
+				    <widget class="GtkFileChooserButton" id="acc_sound_success_button">
+				      <property name="visible">True</property>
+				      <property name="title" translatable="yes">Select Sound File</property>
+				      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+				      <property name="local_only">True</property>
+				      <property name="show_hidden">False</property>
+				      <property name="do_overwrite_confirmation">False</property>
+				      <property name="width_chars">-1</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
 
-			      <child>
-				<widget class="GtkFileChooserButton" id="acc_sound_failure_button">
-				  <property name="visible">True</property>
-				  <property name="title" translatable="yes">Select Sound File</property>
-				  <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
-				  <property name="local_only">True</property>
-				  <property name="show_hidden">False</property>
-				  <property name="do_overwrite_confirmation">False</property>
-				  <property name="width_chars">-1</property>
+				  <child>
+				    <widget class="GtkButton" id="acc_soundtest_success_button">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-media-play</property>
+				      <property name="use_stock">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="y_options">fill</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkButton" id="acc_soundtest_failure_button">
+				<widget class="GtkHBox" id="hbox184">
 				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label">gtk-media-play</property>
-				  <property name="use_stock">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkFileChooserButton" id="acc_sound_failure_button">
+				      <property name="visible">True</property>
+				      <property name="title" translatable="yes">Select Sound File</property>
+				      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+				      <property name="local_only">True</property>
+				      <property name="show_hidden">False</property>
+				      <property name="do_overwrite_confirmation">False</property>
+				      <property name="width_chars">-1</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="acc_soundtest_failure_button">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label">gtk-media-play</property>
+				      <property name="use_stock">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="y_options">fill</property>
 				</packing>
 			      </child>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="y_options">fill</property>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
@@ -3323,96 +5249,58 @@
 		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="accessibility_tab_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Accessibility</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
 
-	  <child>
-	    <widget class="GtkVBox" id="security_tab_vbox">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">18</property>
+	      <child>
+		<widget class="GtkLabel" id="accessibility_tab_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Accessibility</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">tab</property>
+		</packing>
+	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="autologin_vbox">
+		<widget class="GtkVBox" id="security_tab_vbox">
+		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="autologin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Enable Automatic Login</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+		  <property name="spacing">18</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox136">
+		    <widget class="GtkVBox" id="autologin_vbox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label227">
+			<widget class="GtkCheckButton" id="autologin">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Enable Automatic Login</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -3422,57 +5310,95 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkTable" id="table17">
+			<widget class="GtkHBox" id="hbox136">
 			  <property name="visible">True</property>
-			  <property name="n_rows">1</property>
-			  <property name="n_columns">2</property>
 			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">12</property>
+			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="autologin_label">
+			    <widget class="GtkLabel" id="label227">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_User:</property>
-			      <property name="use_underline">True</property>
+			      <property name="label" translatable="yes">    </property>
+			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
 			      <property name="wrap">False</property>
 			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
+			      <property name="xalign">0.5</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">autologin_combo</property>
 			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			      <property name="width_chars">-1</property>
 			      <property name="single_line_mode">False</property>
 			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkComboBoxEntry" id="autologin_combo">
+			    <widget class="GtkTable" id="table17">
 			      <property name="visible">True</property>
-			      <property name="items" translatable="yes">dummy</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="has_frame">True</property>
-			      <property name="focus_on_click">True</property>
+			      <property name="n_rows">1</property>
+			      <property name="n_columns">2</property>
+			      <property name="homogeneous">False</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
+
+			      <child>
+				<widget class="GtkLabel" id="autologin_label">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_User:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">autologin_combo</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkComboBoxEntry" id="autologin_combo">
+				  <property name="visible">True</property>
+				  <property name="items" translatable="yes">dummy</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="has_frame">True</property>
+				  <property name="focus_on_click">True</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options">fill</property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options">fill</property>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
@@ -3485,66 +5411,28 @@
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="timedlogin_vbox">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="timedlogin">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Enable _Timed Login</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
 		      <property name="expand">False</property>
 		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox138">
+		    <widget class="GtkVBox" id="timedlogin_vbox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label231">
+			<widget class="GtkCheckButton" id="timedlogin">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Enable _Timed Login</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -3554,78 +5442,50 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkTable" id="table18">
+			<widget class="GtkHBox" id="hbox138">
 			  <property name="visible">True</property>
-			  <property name="n_rows">3</property>
-			  <property name="n_columns">2</property>
 			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">6</property>
-			  <property name="column_spacing">12</property>
+			  <property name="spacing">0</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="timed_login_label">
+			    <widget class="GtkLabel" id="label231">
 			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
-			      <property name="label" translatable="yes">U_ser:</property>
-			      <property name="use_underline">True</property>
+			      <property name="label" translatable="yes">    </property>
+			      <property name="use_underline">False</property>
 			      <property name="use_markup">False</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
 			      <property name="wrap">False</property>
 			      <property name="selectable">False</property>
-			      <property name="xalign">0</property>
+			      <property name="xalign">0.5</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">timedlogin_combo</property>
 			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			      <property name="width_chars">-1</property>
 			      <property name="single_line_mode">False</property>
 			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="allowremoteauto">
-			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Allo_w remote timed logins</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox148">
+			    <widget class="GtkTable" id="table18">
 			      <property name="visible">True</property>
+			      <property name="n_rows">3</property>
+			      <property name="n_columns">2</property>
 			      <property name="homogeneous">False</property>
-			      <property name="spacing">12</property>
+			      <property name="row_spacing">6</property>
+			      <property name="column_spacing">12</property>
 
 			      <child>
-				<widget class="GtkLabel" id="timedlogin_seconds_label">
+				<widget class="GtkLabel" id="timed_login_label">
 				  <property name="visible">True</property>
 				  <property name="sensitive">False</property>
-				  <property name="label" translatable="yes">_Pause before login:</property>
+				  <property name="label" translatable="yes">U_ser:</property>
 				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3635,59 +5495,66 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">timedlogin_seconds</property>
+				  <property name="mnemonic_widget">timedlogin_combo</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
 				  <property name="angle">0</property>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkHBox" id="hbox141">
+				<widget class="GtkCheckButton" id="allowremoteauto">
 				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">6</property>
+				  <property name="sensitive">False</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">Allo_w remote timed logins</property>
+				  <property name="use_underline">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
 
-				  <child>
-				    <widget class="GtkSpinButton" id="timedlogin_seconds">
-				      <property name="visible">True</property>
-				      <property name="sensitive">False</property>
-				      <property name="can_focus">True</property>
-				      <property name="climb_rate">1</property>
-				      <property name="digits">0</property>
-				      <property name="numeric">False</property>
-				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				      <property name="snap_to_ticks">False</property>
-				      <property name="wrap">False</property>
-				      <property name="adjustment">0 0 100 1 10 10</property>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">True</property>
-				    </packing>
-				  </child>
+			      <child>
+				<widget class="GtkHBox" id="hbox148">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">12</property>
 
 				  <child>
-				    <widget class="GtkLabel" id="timedlogin_seconds_units">
+				    <widget class="GtkLabel" id="timedlogin_seconds_label">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
-				      <property name="label" translatable="yes">seconds</property>
-				      <property name="use_underline">False</property>
+				      <property name="label" translatable="yes">_Pause before login:</property>
+				      <property name="use_underline">True</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
 				      <property name="wrap">False</property>
 				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
+				      <property name="xalign">0</property>
 				      <property name="yalign">0.5</property>
 				      <property name="xpad">0</property>
 				      <property name="ypad">0</property>
+				      <property name="mnemonic_widget">timedlogin_seconds</property>
 				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				      <property name="width_chars">-1</property>
 				      <property name="single_line_mode">False</property>
@@ -3699,38 +5566,97 @@
 				      <property name="fill">False</property>
 				    </packing>
 				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox141">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">6</property>
+
+				      <child>
+					<widget class="GtkSpinButton" id="timedlogin_seconds">
+					  <property name="visible">True</property>
+					  <property name="sensitive">False</property>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">False</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">0 0 100 1 10 10</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">True</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="timedlogin_seconds_units">
+					  <property name="visible">True</property>
+					  <property name="sensitive">False</property>
+					  <property name="label" translatable="yes">seconds</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
 				</widget>
 				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
+				  <property name="left_attach">0</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
+				  <property name="x_options">fill</property>
 				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
 
-			  <child>
-			    <widget class="GtkComboBoxEntry" id="timedlogin_combo">
-			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
-			      <property name="items" translatable="yes">dummy</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="has_frame">True</property>
-			      <property name="focus_on_click">True</property>
+			      <child>
+				<widget class="GtkComboBoxEntry" id="timedlogin_combo">
+				  <property name="visible">True</property>
+				  <property name="sensitive">False</property>
+				  <property name="items" translatable="yes">dummy</property>
+				  <property name="add_tearoffs">False</property>
+				  <property name="has_frame">True</property>
+				  <property name="focus_on_click">True</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="y_options">fill</property>
+				</packing>
+			      </child>
 			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="y_options">fill</property>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
@@ -3743,71 +5669,33 @@
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="security_vbox">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">18</property>
 
 		  <child>
-		    <widget class="GtkVBox" id="vbox101">
+		    <widget class="GtkVBox" id="security_vbox">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkLabel" id="security_label">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Security</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
+		      <property name="spacing">18</property>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox142">
+			<widget class="GtkVBox" id="vbox101">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
+			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkLabel" id="label238">
+			    <widget class="GtkLabel" id="security_label">
 			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">    </property>
+			      <property name="label" translatable="yes">Security</property>
 			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
+			      <property name="use_markup">True</property>
 			      <property name="justify">GTK_JUSTIFY_LEFT</property>
 			      <property name="wrap">False</property>
 			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
+			      <property name="xalign">0</property>
 			      <property name="yalign">0.5</property>
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
@@ -3824,110 +5712,386 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkVBox" id="vbox102">
+			    <widget class="GtkHBox" id="hbox142">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label238">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">    </property>
+				  <property name="use_underline">False</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_LEFT</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkVBox" id="vbox102">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkCheckButton" id="allowroot">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">_Allow local system administrator login</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkCheckButton" id="allowremoteroot">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">A_llow remote system administrator login</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkCheckButton" id="enable_debug">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">E_nable debug messages to system log</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkCheckButton" id="disallow_tcp">
+				      <property name="visible">True</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">_Deny TCP connections to Xserver</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox181">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">0</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label275">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">    </property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="xforwarding_label">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Disables X forwarding, but does not affect XDMCP.</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">True</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkTable" id="table31">
+				      <property name="visible">True</property>
+				      <property name="n_rows">3</property>
+				      <property name="n_columns">6</property>
+				      <property name="homogeneous">False</property>
+				      <property name="row_spacing">6</property>
+				      <property name="column_spacing">12</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label350">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Relax permissions:</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="mnemonic_widget">gg_mode_combobox</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">0</property>
+					  <property name="right_attach">1</property>
+					  <property name="top_attach">1</property>
+					  <property name="bottom_attach">2</property>
+					  <property name="x_options">fill</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label351">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">L_ogin retry delay:</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="mnemonic_widget">gg_mode_combobox</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">0</property>
+					  <property name="right_attach">1</property>
+					  <property name="top_attach">0</property>
+					  <property name="bottom_attach">1</property>
+					  <property name="x_options">fill</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
 
-			      <child>
-				<widget class="GtkCheckButton" id="allowroot">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Allow local system administrator login</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+				      <child>
+					<widget class="GtkSpinButton" id="relax_permissions">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">False</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">1 0 2 1 10 10</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">1</property>
+					  <property name="right_attach">2</property>
+					  <property name="top_attach">1</property>
+					  <property name="bottom_attach">2</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
 
-			      <child>
-				<widget class="GtkCheckButton" id="allowremoteroot">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">A_llow remote system administrator login</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+				      <child>
+					<widget class="GtkLabel" id="label353">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">seconds</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">2</property>
+					  <property name="right_attach">3</property>
+					  <property name="top_attach">0</property>
+					  <property name="bottom_attach">1</property>
+					  <property name="x_options">fill</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
 
-			      <child>
-				<widget class="GtkCheckButton" id="enable_debug">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">E_nable debug messages to system log</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+				      <child>
+					<widget class="GtkSpinButton" id="retry_delay">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">False</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">1 0 100 1 10 10</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">1</property>
+					  <property name="right_attach">2</property>
+					  <property name="top_attach">0</property>
+					  <property name="bottom_attach">1</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
 
-			      <child>
-				<widget class="GtkCheckButton" id="disallow_tcp">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Deny TCP connections to Xserver</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+				      <child>
+					<widget class="GtkLabel" id="label392">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Minimal UID:</property>
+					  <property name="use_underline">True</property>
+					  <property name="use_markup">False</property>
+					  <property name="justify">GTK_JUSTIFY_LEFT</property>
+					  <property name="wrap">False</property>
+					  <property name="selectable">False</property>
+					  <property name="xalign">0</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					  <property name="mnemonic_widget">gg_mode_combobox</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">0</property>
+					  <property name="right_attach">1</property>
+					  <property name="top_attach">2</property>
+					  <property name="bottom_attach">3</property>
+					  <property name="x_options">fill</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
 
-			      <child>
-				<widget class="GtkHBox" id="hbox181">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
+				      <child>
+					<widget class="GtkSpinButton" id="minimal_uid_spinbutton">
+					  <property name="visible">True</property>
+					  <property name="can_focus">True</property>
+					  <property name="climb_rate">1</property>
+					  <property name="digits">0</property>
+					  <property name="numeric">True</property>
+					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					  <property name="snap_to_ticks">False</property>
+					  <property name="wrap">False</property>
+					  <property name="adjustment">1 0 50000 1 10 10</property>
+					</widget>
+					<packing>
+					  <property name="left_attach">1</property>
+					  <property name="right_attach">2</property>
+					  <property name="top_attach">2</property>
+					  <property name="bottom_attach">3</property>
+					  <property name="y_options"></property>
+					</packing>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">True</property>
+				      <property name="fill">True</property>
+				    </packing>
+				  </child>
 
 				  <child>
-				    <widget class="GtkLabel" id="label275">
+				    <widget class="GtkCheckButton" id="check_dir_owner_checkbutton">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">    </property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Check directory owner</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -3937,22 +6101,16 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkLabel" id="xforwarding_label">
+				    <widget class="GtkCheckButton" id="never_cookies_NFS_checkbutton">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">Disables X forwarding, but does not affect XDMCP.</property>
-				      <property name="use_underline">False</property>
-				      <property name="use_markup">True</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Never place cookies on NFS</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -3960,38 +6118,18 @@
 				      <property name="fill">False</property>
 				    </packing>
 				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox145">
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">12</property>
 
 				  <child>
-				    <widget class="GtkLabel" id="label241">
+				    <widget class="GtkCheckButton" id="a_login_curr_session_checkbutton">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">L_ogin retry delay:</property>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Disable multiple logins for a single user</property>
 				      <property name="use_underline">True</property>
-				      <property name="use_markup">False</property>
-				      <property name="justify">GTK_JUSTIFY_LEFT</property>
-				      <property name="wrap">False</property>
-				      <property name="selectable">False</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				      <property name="mnemonic_widget">retry_delay</property>
-				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				      <property name="width_chars">-1</property>
-				      <property name="single_line_mode">False</property>
-				      <property name="angle">0</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -4001,65 +6139,27 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkHBox" id="hbox146">
+				    <widget class="GtkCheckButton" id="a_restart_server_checkbutton">
 				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">6</property>
-
-				      <child>
-					<widget class="GtkSpinButton" id="retry_delay">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="climb_rate">1</property>
-					  <property name="digits">0</property>
-					  <property name="numeric">False</property>
-					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-					  <property name="snap_to_ticks">False</property>
-					  <property name="wrap">False</property>
-					  <property name="adjustment">1 0 100 1 10 10</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">True</property>
-					  <property name="fill">True</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label242">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">seconds</property>
-					  <property name="use_underline">False</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+				      <property name="can_focus">True</property>
+				      <property name="label" translatable="yes">Always restart server</property>
+				      <property name="use_underline">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+				      <property name="active">False</property>
+				      <property name="inconsistent">False</property>
+				      <property name="draw_indicator">True</property>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
 				      <property name="expand">False</property>
-				      <property name="fill">True</property>
+				      <property name="fill">False</property>
 				    </packing>
 				  </child>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
-				  <property name="expand">True</property>
+				  <property name="expand">False</property>
 				  <property name="fill">True</property>
 				</packing>
 			      </child>
@@ -4067,7 +6167,7 @@
 			    <packing>
 			      <property name="padding">0</property>
 			      <property name="expand">False</property>
-			      <property name="fill">True</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
 			</widget>
@@ -4080,108 +6180,71 @@
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox103">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox151">
+		    <widget class="GtkVBox" id="vbox103">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">12</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkButton" id="config_xserverbutton">
+			<widget class="GtkHBox" id="hbox151">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Configure _X Server...</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">12</property>
+
+			  <child>
+			    <widget class="GtkButton" id="config_xserverbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Configure _X Server...</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			      <property name="pack_type">GTK_PACK_END</property>
+			    </packing>
+			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			  <property name="pack_type">GTK_PACK_END</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="security_tab_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Security</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="users_tab_vbox">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">12</property>
 
 	      <child>
-		<widget class="GtkLabel" id="fb_informationlabel">
+		<widget class="GtkLabel" id="security_tab_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt;  Users in the Include list will appear in the face browser if enabled and will appear in the user drop-down lists for automatic and timed logins on the Security tab.  Users in the Exclude list will not appear.</property>
+		  <property name="label" translatable="yes">Security</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
-		  <property name="justify">GTK_JUSTIFY_FILL</property>
-		  <property name="wrap">True</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
 		  <property name="ypad">0</property>
 		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
@@ -4190,30 +6253,34 @@
 		  <property name="angle">0</property>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="type">tab</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox125">
+		<widget class="GtkVBox" id="users_tab_vbox">
+		  <property name="border_width">12</property>
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
+		  <property name="spacing">12</property>
 
 		  <child>
-		    <widget class="GtkCheckButton" id="fb_allusers">
-		      <property name="border_width">3</property>
+		    <widget class="GtkLabel" id="fb_informationlabel">
 		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Include all users from /etc/passwd (not for NIS)</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
-		      <property name="active">False</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Note:&lt;/b&gt;  Users in the Include list will appear in the face browser if enabled and will appear in the user drop-down lists for automatic and timed logins on the Security tab.  Users in the Exclude list will not appear.</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">True</property>
+		      <property name="justify">GTK_JUSTIFY_FILL</property>
+		      <property name="wrap">True</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0</property>
+		      <property name="yalign">0</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -4223,148 +6290,364 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkTable" id="table22">
+		    <widget class="GtkVBox" id="vbox125">
 		      <property name="visible">True</property>
-		      <property name="n_rows">3</property>
-		      <property name="n_columns">3</property>
 		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">6</property>
-		      <property name="column_spacing">12</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="fb_includelabel">
+			<widget class="GtkCheckButton" id="fb_allusers">
+			  <property name="border_width">3</property>
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">I_nclude:</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Include all users from /etc/passwd (not for NIS)</property>
 			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">fb_include_treeview</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="fb_excludelabel">
+			<widget class="GtkTable" id="table22">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">E_xclude:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">fb_exclude_treeview</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options"></property>
-			</packing>
-		      </child>
+			  <property name="n_rows">3</property>
+			  <property name="n_columns">3</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
 
-		      <child>
-			<widget class="GtkScrolledWindow" id="scrolledwindow19">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+			  <child>
+			    <widget class="GtkLabel" id="fb_includelabel">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">I_nclude:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">fb_include_treeview</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkLabel" id="fb_excludelabel">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">E_xclude:</property>
+			      <property name="use_underline">True</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="mnemonic_widget">fb_exclude_treeview</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">2</property>
+			      <property name="right_attach">3</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
 
 			  <child>
-			    <widget class="GtkTreeView" id="fb_include_treeview">
+			    <widget class="GtkScrolledWindow" id="scrolledwindow19">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="headers_visible">False</property>
-			      <property name="rules_hint">False</property>
-			      <property name="reorderable">False</property>
-			      <property name="enable_search">True</property>
-			      <property name="fixed_height_mode">False</property>
-			      <property name="hover_selection">False</property>
-			      <property name="hover_expand">False</property>
+			      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+			      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			      <property name="shadow_type">GTK_SHADOW_IN</property>
+			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+			      <child>
+				<widget class="GtkTreeView" id="fb_include_treeview">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="headers_visible">False</property>
+				  <property name="rules_hint">False</property>
+				  <property name="reorderable">False</property>
+				  <property name="enable_search">True</property>
+				  <property name="fixed_height_mode">False</property>
+				  <property name="hover_selection">False</property>
+				  <property name="hover_expand">False</property>
+				</widget>
+			      </child>
 			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			    </packing>
 			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="scrolledwindow20">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 			  <child>
-			    <widget class="GtkTreeView" id="fb_exclude_treeview">
+			    <widget class="GtkScrolledWindow" id="scrolledwindow20">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="headers_visible">False</property>
-			      <property name="rules_hint">False</property>
-			      <property name="reorderable">False</property>
-			      <property name="enable_search">True</property>
-			      <property name="fixed_height_mode">False</property>
-			      <property name="hover_selection">False</property>
-			      <property name="hover_expand">False</property>
+			      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+			      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			      <property name="shadow_type">GTK_SHADOW_IN</property>
+			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+			      <child>
+				<widget class="GtkTreeView" id="fb_exclude_treeview">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="headers_visible">False</property>
+				  <property name="rules_hint">False</property>
+				  <property name="reorderable">False</property>
+				  <property name="enable_search">True</property>
+				  <property name="fixed_height_mode">False</property>
+				  <property name="hover_selection">False</property>
+				  <property name="hover_expand">False</property>
+				</widget>
+			      </child>
 			    </widget>
+			    <packing>
+			      <property name="left_attach">2</property>
+			      <property name="right_attach">3</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			    </packing>
 			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			</packing>
-		      </child>
 
-		      <child>
-			<widget class="GtkVBox" id="vbox124">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
+			  <child>
+			    <widget class="GtkVBox" id="vbox124">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkVBox" id="UsersButtonBox">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">6</property>
+
+				  <child>
+				    <widget class="GtkButton" id="fb_toexclude">
+				      <property name="visible">True</property>
+				      <property name="sensitive">False</property>
+				      <property name="can_focus">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+
+				      <child>
+					<widget class="GtkImage" id="image19">
+					  <property name="visible">True</property>
+					  <property name="stock">gtk-go-forward</property>
+					  <property name="icon_size">4</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="fb_toinclude">
+				      <property name="visible">True</property>
+				      <property name="sensitive">False</property>
+				      <property name="can_focus">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+
+				      <child>
+					<widget class="GtkImage" id="image20">
+					  <property name="visible">True</property>
+					  <property name="stock">gtk-go-back</property>
+					  <property name="icon_size">4</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">True</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkHBox" id="hbox193">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">6</property>
+
+			      <child>
+				<widget class="GtkButton" id="fb_includedelete">
+				  <property name="visible">True</property>
+				  <property name="sensitive">False</property>
+				  <property name="can_focus">True</property>
+				  <property name="label">gtk-remove</property>
+				  <property name="use_stock">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				  <property name="pack_type">GTK_PACK_END</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkButton" id="fb_includeadd">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+
+				  <child>
+				    <widget class="GtkAlignment" id="alignment22">
+				      <property name="visible">True</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox198">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image21">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-add</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label294">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">_Add...</property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+					</widget>
+				      </child>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				  <property name="pack_type">GTK_PACK_END</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
 
 			  <child>
-			    <widget class="GtkVBox" id="UsersButtonBox">
+			    <widget class="GtkHBox" id="hbox194">
 			      <property name="visible">True</property>
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkButton" id="fb_toexclude">
+				<widget class="GtkButton" id="fb_excludedelete">
 				  <property name="visible">True</property>
 				  <property name="sensitive">False</property>
 				  <property name="can_focus">True</property>
@@ -4372,14 +6655,66 @@
 				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkImage" id="image19">
+				    <widget class="GtkAlignment" id="alignment21">
 				      <property name="visible">True</property>
-				      <property name="stock">gtk-go-forward</property>
-				      <property name="icon_size">4</property>
 				      <property name="xalign">0.5</property>
 				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox192">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image18">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-remove</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label290">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">R_emove</property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+					</widget>
+				      </child>
 				    </widget>
 				  </child>
 				</widget>
@@ -4387,26 +6722,78 @@
 				  <property name="padding">0</property>
 				  <property name="expand">False</property>
 				  <property name="fill">False</property>
+				  <property name="pack_type">GTK_PACK_END</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkButton" id="fb_toinclude">
+				<widget class="GtkButton" id="fb_excludeadd">
 				  <property name="visible">True</property>
-				  <property name="sensitive">False</property>
 				  <property name="can_focus">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
 
 				  <child>
-				    <widget class="GtkImage" id="image20">
+				    <widget class="GtkAlignment" id="alignment20">
 				      <property name="visible">True</property>
-				      <property name="stock">gtk-go-back</property>
-				      <property name="icon_size">4</property>
 				      <property name="xalign">0.5</property>
 				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox191">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image17">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-add</property>
+					      <property name="icon_size">4</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label289">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">A_dd...</property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0.5</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+					</widget>
+				      </child>
 				    </widget>
 				  </child>
 				</widget>
@@ -4414,311 +6801,136 @@
 				  <property name="padding">0</property>
 				  <property name="expand">False</property>
 				  <property name="fill">False</property>
+				  <property name="pack_type">GTK_PACK_END</property>
 				</packing>
 			      </child>
 			    </widget>
 			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">False</property>
+			      <property name="left_attach">2</property>
+			      <property name="right_attach">3</property>
+			      <property name="top_attach">2</property>
+			      <property name="bottom_attach">3</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options">fill</property>
 			    </packing>
 			  </child>
 			</widget>
 			<packing>
-			  <property name="left_attach">1</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox193">
+			<widget class="GtkFixed" id="fixed6">
+			  <property name="height_request">6</property>
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkButton" id="fb_includedelete">
-			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
-			      <property name="can_focus">True</property>
-			      <property name="label">gtk-remove</property>
-			      <property name="use_stock">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			      <property name="pack_type">GTK_PACK_END</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkButton" id="fb_includeadd">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment22">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox198">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image21">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-add</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label294">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">_Add...</property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			      <property name="pack_type">GTK_PACK_END</property>
-			    </packing>
-			  </child>
 			</widget>
 			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">1</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox194">
+			<widget class="GtkTable" id="table36">
 			  <property name="visible">True</property>
+			  <property name="n_rows">2</property>
+			  <property name="n_columns">2</property>
 			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
+			  <property name="row_spacing">6</property>
+			  <property name="column_spacing">12</property>
 
 			  <child>
-			    <widget class="GtkButton" id="fb_excludedelete">
+			    <widget class="GtkFileChooserButton" id="default_face_filechooser">
 			      <property name="visible">True</property>
 			      <property name="sensitive">False</property>
-			      <property name="can_focus">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment21">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox192">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image18">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-remove</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
+			      <property name="title" translatable="yes">Select Logo Image</property>
+			      <property name="action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
+			      <property name="local_only">True</property>
+			      <property name="show_hidden">False</property>
+			      <property name="do_overwrite_confirmation">False</property>
+			      <property name="width_chars">-1</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="y_options">fill</property>
+			    </packing>
+			  </child>
 
-				      <child>
-					<widget class="GtkLabel" id="label290">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">R_emove</property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
+			  <child>
+			    <widget class="GtkFileChooserButton" id="global_face_dir_filechooser">
+			      <property name="visible">True</property>
+			      <property name="sensitive">False</property>
+			      <property name="title" translatable="yes">Select Logo Image</property>
+			      <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+			      <property name="local_only">True</property>
+			      <property name="show_hidden">False</property>
+			      <property name="do_overwrite_confirmation">False</property>
+			      <property name="width_chars">-1</property>
 			    </widget>
 			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			      <property name="pack_type">GTK_PACK_END</property>
+			      <property name="left_attach">1</property>
+			      <property name="right_attach">2</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="y_options">fill</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkButton" id="fb_excludeadd">
+			    <widget class="GtkCheckButton" id="global_face_dir_checkbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Global face dir</property>
+			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">1</property>
+			      <property name="bottom_attach">2</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
+			    </packing>
+			  </child>
 
-			      <child>
-				<widget class="GtkAlignment" id="alignment20">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">0</property>
-				  <property name="yscale">0</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkHBox" id="hbox191">
-				      <property name="visible">True</property>
-				      <property name="homogeneous">False</property>
-				      <property name="spacing">2</property>
-
-				      <child>
-					<widget class="GtkImage" id="image17">
-					  <property name="visible">True</property>
-					  <property name="stock">gtk-add</property>
-					  <property name="icon_size">4</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label289">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">A_dd...</property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-					<packing>
-					  <property name="padding">0</property>
-					  <property name="expand">False</property>
-					  <property name="fill">False</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
+			  <child>
+			    <widget class="GtkCheckButton" id="default_face_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Default face</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
 			    </widget>
 			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			      <property name="pack_type">GTK_PACK_END</property>
+			      <property name="left_attach">0</property>
+			      <property name="right_attach">1</property>
+			      <property name="top_attach">0</property>
+			      <property name="bottom_attach">1</property>
+			      <property name="x_options">fill</property>
+			      <property name="y_options"></property>
 			    </packing>
 			  </child>
 			</widget>
 			<packing>
-			  <property name="left_attach">2</property>
-			  <property name="right_attach">3</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
@@ -4728,138 +6940,133 @@
 		      <property name="fill">True</property>
 		    </packing>
 		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="hbox157">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkButton" id="fb_faceapply">
+		    <widget class="GtkHBox" id="hbox217">
 		      <property name="visible">True</property>
-		      <property name="sensitive">False</property>
-		      <property name="can_focus">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="focus_on_click">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkAlignment" id="alignment17">
+			<widget class="GtkButton" id="fb_faceapply">
 			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">0</property>
-			  <property name="yscale">0</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
+			  <property name="sensitive">False</property>
+			  <property name="can_focus">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox186">
+			    <widget class="GtkAlignment" id="alignment26">
 			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">2</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xscale">0</property>
+			      <property name="yscale">0</property>
+			      <property name="top_padding">0</property>
+			      <property name="bottom_padding">0</property>
+			      <property name="left_padding">0</property>
+			      <property name="right_padding">0</property>
 
 			      <child>
-				<widget class="GtkImage" id="image14">
+				<widget class="GtkHBox" id="hbox218">
 				  <property name="visible">True</property>
-				  <property name="stock">gtk-apply</property>
-				  <property name="icon_size">4</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">2</property>
 
-			      <child>
-				<widget class="GtkLabel" id="label280">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">A_pply User Changes</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
+				  <child>
+				    <widget class="GtkImage" id="image25">
+				      <property name="visible">True</property>
+				      <property name="stock">gtk-apply</property>
+				      <property name="icon_size">4</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+
+				  <child>
+				    <widget class="GtkLabel" id="label313">
+				      <property name="visible">True</property>
+				      <property name="label" translatable="yes">A_pply User Changes</property>
+				      <property name="use_underline">True</property>
+				      <property name="use_markup">False</property>
+				      <property name="justify">GTK_JUSTIFY_LEFT</property>
+				      <property name="wrap">False</property>
+				      <property name="selectable">False</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				      <property name="width_chars">-1</property>
+				      <property name="single_line_mode">False</property>
+				      <property name="angle">0</property>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
 				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
 			      </child>
 			    </widget>
 			  </child>
 			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			  <property name="pack_type">GTK_PACK_END</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<placeholder/>
 		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
 		      <property name="expand">False</property>
 		      <property name="fill">False</property>
-		      <property name="pack_type">GTK_PACK_END</property>
 		    </packing>
 		  </child>
-
-		  <child>
-		    <placeholder/>
-		  </child>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="tab_expand">False</property>
+		  <property name="tab_fill">True</property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
 
-	  <child>
-	    <widget class="GtkLabel" id="users_tab_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Users</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
+	      <child>
+		<widget class="GtkLabel" id="users_tab_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Users</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="type">tab</property>
+		</packing>
+	      </child>
 	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
 	  </child>
 	</widget>
 	<packing>
@@ -5986,7 +8193,7 @@
 				      <child>
 					<widget class="GtkTable" id="table19">
 					  <property name="visible">True</property>
-					  <property name="n_rows">3</property>
+					  <property name="n_rows">4</property>
 					  <property name="n_columns">2</property>
 					  <property name="homogeneous">False</property>
 					  <property name="row_spacing">6</property>
@@ -6139,6 +8346,56 @@
 					      <property name="y_options">fill</property>
 					    </packing>
 					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label302">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">Priority:</property>
+					      <property name="use_underline">True</property>
+					      <property name="use_markup">False</property>
+					      <property name="justify">GTK_JUSTIFY_LEFT</property>
+					      <property name="wrap">False</property>
+					      <property name="selectable">False</property>
+					      <property name="xalign">0</property>
+					      <property name="yalign">0.5</property>
+					      <property name="xpad">0</property>
+					      <property name="ypad">0</property>
+					      <property name="mnemonic_widget">xserver_style_combobox</property>
+					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					      <property name="width_chars">-1</property>
+					      <property name="single_line_mode">False</property>
+					      <property name="angle">0</property>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">0</property>
+					      <property name="right_attach">1</property>
+					      <property name="top_attach">3</property>
+					      <property name="bottom_attach">4</property>
+					      <property name="x_options">fill</property>
+					      <property name="y_options"></property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkSpinButton" id="xserv_priority_spinbutton">
+					      <property name="visible">True</property>
+					      <property name="can_focus">True</property>
+					      <property name="climb_rate">1</property>
+					      <property name="digits">0</property>
+					      <property name="numeric">False</property>
+					      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+					      <property name="snap_to_ticks">False</property>
+					      <property name="wrap">False</property>
+					      <property name="adjustment">1 0 100 1 10 10</property>
+					    </widget>
+					    <packing>
+					      <property name="left_attach">1</property>
+					      <property name="right_attach">2</property>
+					      <property name="top_attach">3</property>
+					      <property name="bottom_attach">4</property>
+					      <property name="y_options"></property>
+					    </packing>
+					  </child>
 					</widget>
 					<packing>
 					  <property name="padding">0</property>
--- gdm2/gui/gdmsession.c.org	2006-12-04 18:44:31.000000000 +0000
+++ gdm2/gui/gdmsession.c	2006-12-04 18:49:53.000000000 +0000
@@ -107,9 +107,20 @@
         *sessions = g_list_prepend (*sessions, g_strdup (key));
 }
 
+/* Just a wrapper to ensure compatibility with the
+   existing code */
 void
 gdm_session_list_init ()
 {
+	_gdm_session_list_init (&sessnames, &sessions, 
+				&default_session, &current_session);	
+}
+
+/* The real gdm_session_list_init */
+void
+_gdm_session_list_init (GHashTable **sessnames, GList **sessions, 
+			gchar **default_session, const gchar **current_session)
+{
     GdmSession *session = NULL;
     gboolean some_dir_exists = FALSE;
     gboolean searching_for_default = TRUE;
@@ -119,31 +130,28 @@
     DIR *sessdir;
     int i;
 
-    sessnames = g_hash_table_new (g_str_hash, g_str_equal);
+    *sessnames = g_hash_table_new (g_str_hash, g_str_equal);
 
     if (gdm_config_get_bool (GDM_KEY_SHOW_GNOME_FAILSAFE)) {
 	session = g_new0 (GdmSession, 1);
 	session->name = g_strdup (_("Failsafe _GNOME"));
-	session->clearname = g_strdup (_("Failsafe GNOME"));
 	session->comment = g_strdup (_("This is a failsafe session that will log you "
 		"into GNOME. No startup scripts will be read "
 		"and it is only to be used when you can't log "
 		"in otherwise.  GNOME will use the 'Default' "
 		"session."));
-	g_hash_table_insert (sessnames, g_strdup (GDM_SESSION_FAILSAFE_GNOME), session);
+	g_hash_table_insert (*sessnames, g_strdup (GDM_SESSION_FAILSAFE_GNOME), session);
     }
 
     if (gdm_config_get_bool (GDM_KEY_SHOW_XTERM_FAILSAFE)) {
-	/* Valgrind complains that the below is leaked */
 	session = g_new0 (GdmSession, 1);
 	session->name = g_strdup (_("Failsafe _Terminal"));
-	session->clearname = g_strdup (_("Failsafe Terminal"));
 	session->comment = g_strdup (_("This is a failsafe session that will log you "
 		"into a terminal.  No startup scripts will be read "
 		"and it is only to be used when you can't log "
 		"in otherwise.  To exit the terminal, "
 		"type 'exit'."));
-	g_hash_table_insert (sessnames, g_strdup (GDM_SESSION_FAILSAFE_XTERM),
+	g_hash_table_insert (*sessnames, g_strdup (GDM_SESSION_FAILSAFE_XTERM),
 		session);
     }
 
@@ -183,7 +191,7 @@
 		    }
 
 		    /* already found this session, ignore */
-		    if (g_hash_table_lookup (sessnames, dent->d_name) != NULL) {
+		    if (g_hash_table_lookup (*sessnames, dent->d_name) != NULL) {
 			    dent = readdir (sessdir);
 			    continue;
 		    }
@@ -194,9 +202,8 @@
 
 		    if (ve_config_get_bool (cfg, "Desktop Entry/Hidden=false")) {
 			    session = g_new0 (GdmSession, 1);
-			    session->name      = g_strdup (dent->d_name);
-			    session->clearname = NULL;
-			    g_hash_table_insert (sessnames, g_strdup (dent->d_name), session);
+			    session->name = "foo";
+			    g_hash_table_insert (*sessnames, g_strdup (dent->d_name), session);
 			    ve_config_destroy (cfg);
 			    dent = readdir (sessdir);
 			    continue;
@@ -204,25 +211,17 @@
 
 		    tryexec = ve_config_get_string (cfg, "Desktop Entry/TryExec");
 		    if ( ! ve_string_empty (tryexec)) {
-			    char **tryexecvec = g_strsplit (tryexec, " ", -1);
-			    char *full = NULL;
-
-			    /* Do not pass any arguments to g_find_program_in_path */
-			    if (tryexecvec != NULL)
-				full = g_find_program_in_path (tryexecvec[0]);
-
+			    char *full = g_find_program_in_path (tryexec);
 			    if (full == NULL) {
 				    session = g_new0 (GdmSession, 1);
-				    session->name      = g_strdup (dent->d_name);
-				    session->clearname = NULL;
-				    g_hash_table_insert (sessnames, g_strdup (dent->d_name),
+				    session->name = "foo";
+				    g_hash_table_insert (*sessnames, g_strdup (dent->d_name),
 					 session);
 				    g_free (tryexec);
 				    ve_config_destroy (cfg);
 				    dent = readdir (sessdir);
 				    continue;
 			    }
-			    g_strfreev (tryexecvec);
 			    g_free (full);
 		    }
 		    g_free (tryexec);
@@ -235,9 +234,8 @@
 
 		    if G_UNLIKELY (ve_string_empty (exec) || ve_string_empty (name)) {
 			    session = g_new0 (GdmSession, 1);
-			    session->name      = g_strdup (dent->d_name);
-			    session->clearname = NULL;
-			    g_hash_table_insert (sessnames, g_strdup (dent->d_name), session);
+			    session->name = "foo";
+			    g_hash_table_insert (*sessnames, g_strdup (dent->d_name), session);
 			    g_free (exec);
 			    g_free (name);
 			    g_free (comment);
@@ -246,34 +244,35 @@
 		    }
 
 		    /* if we found the default session */
-		    if ( ! ve_string_empty (gdm_config_get_string (GDM_KEY_DEFAULT_SESSION)) &&
-			 strcmp (dent->d_name, gdm_config_get_string (GDM_KEY_DEFAULT_SESSION)) == 0) {
-			    g_free (default_session);
-			    default_session = g_strdup (dent->d_name);
-			    searching_for_default = FALSE;
-		    }
-
-		    /* if there is a session called Default */
-		    if (searching_for_default &&
-			g_ascii_strcasecmp (dent->d_name, "default.desktop") == 0) {
-			    g_free (default_session);
-			    default_session = g_strdup (dent->d_name);
-		    }
-
-		    if (searching_for_default &&
-			g_ascii_strcasecmp (dent->d_name, "gnome.desktop") == 0) {
-			    /* Just in case there is no default session and
-			     * no default link, make gnome the default */
-			    if (default_session == NULL)
-				    default_session = g_strdup (dent->d_name);
-
+		    if (default_session != NULL) {
+			    if ( ! ve_string_empty (gdm_config_get_string (GDM_KEY_DEFAULT_SESSION)) &&
+				 strcmp (dent->d_name, gdm_config_get_string (GDM_KEY_DEFAULT_SESSION)) == 0) {
+				    g_free (*default_session);
+				    *default_session = g_strdup (dent->d_name);
+				    searching_for_default = FALSE;
+			    }
+			    
+			    /* if there is a session called Default */
+			    if (searching_for_default &&
+				g_ascii_strcasecmp (dent->d_name, "default.desktop") == 0) {
+				    g_free (*default_session);
+				    *default_session = g_strdup (dent->d_name);
+			    }
+			    
+			    if (searching_for_default &&
+				g_ascii_strcasecmp (dent->d_name, "gnome.desktop") == 0) {
+				    /* Just in case there is no default session and
+				     * no default link, make gnome the default */
+				    if (*default_session == NULL)
+					    *default_session = g_strdup (dent->d_name);
+				    
+			    }
 		    }
 
 		    session = g_new0 (GdmSession, 1);
-		    session->name      = g_strdup (name);
-		    session->clearname = NULL;
-		    session->comment   = g_strdup (comment);
-		    g_hash_table_insert (sessnames, g_strdup (dent->d_name), session);
+		    session->name = g_strdup (name);
+		    session->comment = g_strdup (comment);
+		    g_hash_table_insert (*sessnames, g_strdup (dent->d_name), session);
 		    g_free (exec);
 		    g_free (comment);
 		    dent = readdir (sessdir);
@@ -293,55 +292,57 @@
 	session_dir_whacked_out = TRUE;
     }
 
-    if G_UNLIKELY (g_hash_table_size (sessnames) == 0) {
+    if G_UNLIKELY (g_hash_table_size (*sessnames) == 0) {
 	    gdm_common_warning ("Error, no sessions found in the session directory <%s>.",
 		ve_sure_string (gdm_config_get_string (GDM_KEY_SESSION_DESKTOP_DIR)));
 
 	    session_dir_whacked_out = TRUE;
-	    default_session         = g_strdup (GDM_SESSION_FAILSAFE_GNOME);
+	    if (default_session != NULL)
+		    *default_session         = g_strdup (GDM_SESSION_FAILSAFE_GNOME);
     }
 
 
     if (gdm_config_get_bool (GDM_KEY_SHOW_GNOME_FAILSAFE)) {
-	    session            = g_new0 (GdmSession, 1);
-	    session->name      = g_strdup (_("Failsafe _GNOME"));
-	    session->clearname = g_strdup (_("Failsafe GNOME"));
-	    session->comment   = g_strdup (_("This is a failsafe session that will log you "
+	    session          = g_new0 (GdmSession, 1);
+	    session->name    = g_strdup (_("Failsafe _GNOME"));
+	    session->comment = g_strdup (_("This is a failsafe session that will log you "
 				    "into GNOME. No startup scripts will be read "
                                     "and it is only to be used when you can't log "
                                     "in otherwise.  GNOME will use the 'Default' "
 				    "session."));
-	    g_hash_table_insert (sessnames,
+	    g_hash_table_insert (*sessnames,
 		g_strdup (GDM_SESSION_FAILSAFE_GNOME), session);
     }
 
     if (gdm_config_get_bool (GDM_KEY_SHOW_XTERM_FAILSAFE)) {
-	    session            = g_new0 (GdmSession, 1);
-	    session->name      = g_strdup (_("Failsafe _Terminal"));
-	    session->clearname = g_strdup (_("Failsafe Terminal"));
-	    session->comment   = g_strdup (_("This is a failsafe session that will log you "
+	    session          = g_new0 (GdmSession, 1);
+	    session->name    = g_strdup (_("Failsafe _Terminal"));
+	    session->comment = g_strdup (_("This is a failsafe session that will log you "
 				    "into a terminal.  No startup scripts will be read "
 				    "and it is only to be used when you can't log "
 				    "in otherwise.  To exit the terminal, "
 				    "type 'exit'."));
-	    g_hash_table_insert (sessnames,
+	    g_hash_table_insert (*sessnames,
 		g_strdup (GDM_SESSION_FAILSAFE_XTERM), session);
     }
 
     /* Convert to list (which is unsorted) */
-    g_hash_table_foreach (sessnames,
-	(GHFunc) gdm_session_list_from_hash_table_func, &sessions);
+    g_hash_table_foreach (*sessnames,
+			  (GHFunc) gdm_session_list_from_hash_table_func, sessions);
 
     /* Prioritize and sort the list */
-    sessions = g_list_sort (sessions, (GCompareFunc) gdm_session_sort_func);
+    *sessions = g_list_sort (*sessions, (GCompareFunc) gdm_session_sort_func);
 
-    if G_UNLIKELY (default_session == NULL) {
-	    default_session = g_strdup (GDM_SESSION_FAILSAFE_GNOME);
-	    gdm_common_warning ("No default session link found. Using Failsafe GNOME.");
+    if (default_session != NULL)
+	    if G_UNLIKELY (*default_session == NULL) {
+		    *default_session = g_strdup (GDM_SESSION_FAILSAFE_GNOME);
+		    gdm_common_warning ("No default session link found. Using Failsafe GNOME.");
+	    }
+    if (current_session != NULL &&
+	default_session != NULL) {
+	    if (*current_session == NULL)
+		    *current_session = *default_session;
     }
-    
-    if (current_session == NULL)
-            current_session = default_session;
 }
 
 static gboolean
--- gdm2/gui/gdmuser.h.org	2006-12-04 19:44:56.000000000 +0000
+++ gdm2/gui/gdmuser.h	2006-12-04 19:45:17.000000000 +0000
@@ -34,6 +34,7 @@
 };
 
 gboolean gdm_is_user_valid		(const char *username);
+gint     gdm_user_uid                   (const char *username);
 void     gdm_users_init                 (GList **users, GList **users_string,
 					char *exclude_user, GdkPixbuf *defface,
 					int *size_of_users, gboolean is_local,
--- gdm2/gui/Makefile.am.org	2006-12-04 18:42:25.000000000 +0000
+++ gdm2/gui/Makefile.am	2006-12-04 18:42:56.000000000 +0000
@@ -132,6 +132,7 @@
 gdmsetup_LDFLAGS = -export-dynamic
 gdmsetup_LDADD = \
 	libgdmcommon.a		\
+	libgdmwm.a		\
 	$(GUI_LIBS)		\
 	$(INTLLIBS)		\
 	$(GLIB_LIBS)		\
--- gdm2/gui/gdmsetup.c.org	2006-12-04 18:52:59.000000000 +0000
+++ gdm2/gui/gdmsetup.c	2006-12-04 19:34:23.000000000 +0000
@@ -47,17 +47,15 @@
 #include "misc.h"
 #include "gdmcomm.h"
 #include "gdmuser.h"
+#include "gdmsession.h"
 #include "gdmconfig.h"
 
 static char     *GdmSoundProgram = NULL;
 static gchar    *GdmExclude      = NULL;
 static gchar    *GdmInclude      = NULL;
-static gint      GdmMinimalUID   = 100;
 static gint      GdmIconMaxHeight;
 static gint      GdmIconMaxWidth;
 static gboolean  GdmIncludeAll;
-static gboolean  GdmAllowRoot;
-static gboolean  GdmAllowRemoteRoot;
 static gboolean  GdmUserChangesUnsaved;
 static gboolean  GdmRandomFromSelectedChangesWarn;
 
@@ -84,6 +82,13 @@
 static gchar     *custom_config_file;
 static GSList    *xservers;
 
+/* This is used to store changes made to all
+   possible fields of custom/normal commands */
+static GHashTable  *GdmCommandChangesUnsaved = NULL;
+
+/* Used to store all available sessions */
+static GList *sessions = NULL;
+
 enum {
 	XSERVER_COLUMN_VT,
 	XSERVER_COLUMN_SERVER,
@@ -116,6 +121,7 @@
 };
 
 enum {
+	GENERAL_TAB,
 	LOCAL_TAB,
 	REMOTE_TAB,
 	ACCESSIBILITY_TAB,
@@ -124,6 +130,19 @@
 };
 
 enum {
+	CLOCK_AUTO,
+	CLOCK_YES,
+	CLOCK_NO
+};
+
+enum {
+	HALT_CMD,
+	REBOOT_CMD,
+	SUSPEND_CMD,
+	CUSTOM_CMD
+};
+
+enum {
 	LOCAL_PLAIN,
 	LOCAL_PLAIN_WITH_FACE,
 	LOCAL_THEMED
@@ -393,9 +412,154 @@
 	const char *key = g_object_get_data (G_OBJECT (toggle), "key");
 	gboolean    val = gdm_config_get_bool ((gchar *)key);
 
-	if ( ! ve_bool_equal (val, GTK_TOGGLE_BUTTON (toggle)->active)) {
-		gdm_setup_config_set_bool (key, GTK_TOGGLE_BUTTON (toggle)->active);
+	if (strcmp (ve_sure_string (key), GDM_KEY_ENTRY_INVISIBLE) == 0) {
+		/* This is a lil bit back to front
+		   true is false and false is true in this case */
+		if ( ve_bool_equal (val, GTK_TOGGLE_BUTTON (toggle)->active)) {
+			gdm_setup_config_set_bool (key, !GTK_TOGGLE_BUTTON (toggle)->active);
+		}
+	}
+	else if (strcmp (ve_sure_string (key), GDM_KEY_GLOBAL_FACE_DIR) == 0) {
+		/* Once enabled write the curently selected item
+		   in the filechooser widget, otherwise disable
+		   the config entry, i.e. write an empty string */
+		if (GTK_TOGGLE_BUTTON (toggle)->active == TRUE) {
+			gchar *filename;
+			GtkWidget *file_chooser;
+
+			file_chooser = glade_helper_get (xml, "global_face_dir_filechooser",
+							 GTK_TYPE_FILE_CHOOSER_BUTTON);
+			filename  = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_chooser));
+			
+			if (strcmp (ve_sure_string (gdm_config_get_string ((char*)key)), 
+				    ve_sure_string (filename)) != 0)				
+				gdm_setup_config_set_string (key, ve_sure_string (filename));
+			
+			g_free (filename);
+		}
+		else
+			gdm_setup_config_set_string (key, "");		    
+	}	
+	else if (strcmp (ve_sure_string (key), GDM_KEY_DEFAULT_FACE) == 0) {
+		/* Once enabled write the curently selected item
+		   in the filechooser widget, otherwise disable
+		   the config entry, i.e. write an empty string */
+		if (GTK_TOGGLE_BUTTON (toggle)->active == TRUE) {
+			gchar *filename;
+			GtkWidget *file_chooser;
+			
+			file_chooser = glade_helper_get (xml, "default_face_filechooser",
+							 GTK_TYPE_FILE_CHOOSER_BUTTON);
+			filename  = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_chooser));
+			
+			if (strcmp (ve_sure_string (gdm_config_get_string ((char*)key)), 
+				    ve_sure_string (filename)) != 0)				
+				gdm_setup_config_set_string (key, ve_sure_string (filename));
+			
+			g_free (filename);
+		}
+		else
+			gdm_setup_config_set_string (key, "");		    
+	}
+	else if (strcmp (ve_sure_string (key), GDM_KEY_GTKRC) == 0) {
+		/* Once enabled write the curently selected item
+		   in the filechooser widget, otherwise disable
+		   the config entry, i.e. write an empty string */
+		if (GTK_TOGGLE_BUTTON (toggle)->active == TRUE) {
+			gchar *filename;
+			GtkWidget *file_chooser;
+			
+			file_chooser = glade_helper_get (xml, "gtkrc_chooserbutton",
+							 GTK_TYPE_FILE_CHOOSER_BUTTON);
+			filename  = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_chooser));
+			
+			if (strcmp (ve_sure_string (gdm_config_get_string ((char*)key)), 
+				    ve_sure_string (filename)) != 0)				
+				gdm_setup_config_set_string (key, ve_sure_string (filename));
+			
+			g_free (filename);
+		}
+		else
+			gdm_setup_config_set_string (key, "");		    
 	}
+	else if (strcmp (ve_sure_string (key), GDM_KEY_DEFAULT_SESSION) == 0) {
+		/* Once enabled write the curently selected item
+		   in the combobox widget, otherwise disable
+		   the config entry, i.e. write an empty string */		
+
+		if (GTK_TOGGLE_BUTTON (toggle)->active == TRUE) {
+			gint selected;
+			gchar *value;
+			gchar *new_val = NULL;			
+			GtkWidget *default_session_combobox;
+			
+			default_session_combobox = glade_helper_get (xml, "default_session_combobox", 
+							     GTK_TYPE_COMBO_BOX);
+
+			selected = gtk_combo_box_get_active (GTK_COMBO_BOX (default_session_combobox));
+			
+			value = gdm_config_get_string ((gchar *)key);
+									
+			new_val = g_strdup ((gchar*) g_slist_nth_data (sessions, selected));					
+			
+			if (strcmp (ve_sure_string (value), ve_sure_string (new_val)) != 0)				
+				gdm_setup_config_set_string (key, ve_sure_string (new_val));
+			
+			g_free (value);
+			g_free (new_val);
+		}
+		else
+			gdm_setup_config_set_string (key, "");		    
+	}	
+	else if (strcmp (ve_sure_string (key), GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE) == 0 ||
+		 strcmp (ve_sure_string (key), GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE) == 0) {
+		/* This only applies to custom commands
+		   First find which command has been ticked on/off then put the new value 
+		   together with the corresponding key into the command changed hash. 
+		   Enable apply command changes button. If command is equal to the existing
+		   config value remove it from the hash and disable the apply command changes 
+		   button (if applicable) */
+		   
+		gchar *key_string;
+		gboolean old_val = FALSE;
+		GtkWidget *apply_cmd_changes;
+		GtkWidget *command_combobox;
+		gint selected, i;
+		
+		val = GTK_TOGGLE_BUTTON (toggle)->active;
+		apply_cmd_changes = glade_helper_get (xml, "command_apply_button", GTK_TYPE_BUTTON);
+		command_combobox = glade_helper_get (xml, 
+						     "cmd_type_combobox",
+						     GTK_TYPE_COMBO_BOX);
+		
+		selected = gtk_combo_box_get_active (GTK_COMBO_BOX (command_combobox));
+		
+		i = selected - CUSTOM_CMD;
+		key_string = g_strdup_printf(_("%s%d="), ve_sure_string (key), i); 
+		old_val = gdm_config_get_bool (key_string);
+	
+		if (val != old_val) {	
+			gboolean *p_val = g_new0 (gboolean, 1);
+			*p_val = val;
+			g_hash_table_insert (GdmCommandChangesUnsaved, g_strdup (key_string), p_val);
+		}
+		else if (g_hash_table_lookup (GdmCommandChangesUnsaved, key_string) != NULL) {
+			g_hash_table_remove (GdmCommandChangesUnsaved, key_string);
+		}
+
+		g_free (key_string);
+	
+		if (g_hash_table_size (GdmCommandChangesUnsaved) == 0)
+			gtk_widget_set_sensitive (apply_cmd_changes, FALSE);
+		else 
+			gtk_widget_set_sensitive (apply_cmd_changes, TRUE);
+	}	
+	else {
+		/* All other cases */
+		if ( ! ve_bool_equal (val, GTK_TOGGLE_BUTTON (toggle)->active)) {
+			gdm_setup_config_set_bool (key, GTK_TOGGLE_BUTTON (toggle)->active);
+		}
+	}	
 
 	return FALSE;
 }
@@ -464,18 +628,131 @@
 	run_timeout (toggle, 200, logo_toggle_timeout);
 }
 
+/* Forward declarations */
+static void
+setup_user_combobox_list (const char *name, const char *key);
+static char *
+strings_list_add (char *strings_list, const char *string, const char *sep);
+static char *
+strings_list_remove (char *strings_list, const char *string, const char *sep);
+
 static gboolean
 intspin_timeout (GtkWidget *spin)
 {
 	const char *key = g_object_get_data (G_OBJECT (spin), "key");
 	int new_val = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
 	int val;
+	gboolean greeters_need_update = FALSE;
 
 	val = gdm_config_get_int ((gchar *)key);
 
+	if (strcmp (ve_sure_string (key), GDM_KEY_MINIMAL_UID) == 0){
+		/* We have changed MinimalUID, so we need to go through
+		   the list of existing users in the Include list and remove
+		   the entries that do not match the criteria anymore. If there 
+		   are any user is informed about the changes. Auto login and 
+		   timed login comboboxes are adjusted and greeters restarted */
+		char **list;
+		char *removed = NULL;	
+		
+		list = g_strsplit (GdmInclude, ",", 0);
+		int i;
+		for (i=0; list != NULL && list[i] != NULL; i++) {
+			if (gdm_user_uid (list[i]) >= new_val) 
+				continue;					
+			
+			GdmInclude = strings_list_remove (GdmInclude, list[i], ",");
+			removed = strings_list_add(removed, list[i], ",");
+			
+		}
+		g_strfreev (list);
+
+		//Now if there were items to remove then
+		if (removed != NULL) {
+			gboolean  valid;
+			gchar *text;
+			GtkWidget *include_treeview;
+			GtkTreeModel *include_model;			
+			GtkWidget *dlg;	
+			GtkTreeIter iter;			
+
+			//Inform user about the change and its implications
+			dlg = ve_hig_dialog_new (NULL,
+						 GTK_DIALOG_MODAL,
+						 GTK_MESSAGE_WARNING,
+						 GTK_BUTTONS_OK,
+						 _("Users include list modification"),
+						 _("Some of the users in the Include list "
+						   "(Users tab) now have uid lower than "
+						   "MinumalUID and will be removed."));
+			gtk_dialog_run (GTK_DIALOG (dlg));
+			gtk_widget_destroy (dlg);						
+
+			include_treeview  = glade_helper_get (xml, "fb_include_treeview",
+							      GTK_TYPE_TREE_VIEW);
+			include_model = gtk_tree_view_get_model (GTK_TREE_VIEW (include_treeview));
+
+			valid = gtk_tree_model_get_iter_first (include_model, &iter);
+			while (valid) {
+				gtk_tree_model_get (include_model, &iter, USERLIST_NAME,
+						    &text, -1);				
+				
+				if (strstr (removed, text) != NULL) {					
+					valid = gtk_list_store_remove (GTK_LIST_STORE (include_model), &iter);	
+				}
+				else {				
+					valid = gtk_tree_model_iter_next (include_model, &iter);
+				}
+			}
+			g_free (text);
+			/* Now we need to save updated list, toggle the 
+			   automatic and timed loggon comboboxes and update greeters */
+			gdm_setup_config_set_string (GDM_KEY_INCLUDE, GdmInclude);				
+			
+			greeters_need_update = TRUE;
+
+		}
+		
+		g_free (removed);
+
+		/* We also need to check if user (if any) in the
+		   autologon/timed logon still match the criteria */
+		gchar *autologon_user;
+		gchar *timedlogon_user;
+		
+		autologon_user = gdm_config_get_string (GDM_KEY_AUTOMATIC_LOGIN);
+		timedlogon_user = gdm_config_get_string (GDM_KEY_TIMED_LOGIN);
+
+		if(!ve_string_empty (autologon_user)) {
+			if (gdm_is_user_valid (autologon_user) && gdm_user_uid (autologon_user) < new_val) {
+				gdm_setup_config_set_string (GDM_KEY_AUTOMATIC_LOGIN, "");			
+				greeters_need_update = TRUE;
+			}
+		}
+
+		if(!ve_string_empty (timedlogon_user)) {
+			if (gdm_is_user_valid (timedlogon_user) && gdm_user_uid (timedlogon_user) < new_val) {
+				gdm_setup_config_set_string (GDM_KEY_TIMED_LOGIN, "");						
+				greeters_need_update = TRUE;
+			}
+		}
+
+		g_free (autologon_user);
+		g_free (timedlogon_user);
+
+	}
+
 	if (val != new_val)
 		gdm_setup_config_set_int (key, new_val);
 
+	if (greeters_need_update) {
+		setup_user_combobox_list ("autologin_combo",
+					  GDM_KEY_AUTOMATIC_LOGIN);
+		setup_user_combobox_list ("timedlogin_combo",
+					  GDM_KEY_TIMED_LOGIN);
+		update_greeters ();
+	}
+
 	return FALSE;
 }
 
@@ -667,6 +944,7 @@
 	GtkWidget *style_combobox;
 	GtkWidget *handled_checkbutton;
 	GtkWidget *flexible_checkbutton;
+	GtkWidget *priority_spinbutton;
 	GtkListStore *store;
 	GdmXserver *xserver;
 
@@ -682,6 +960,8 @@
 	                                        GTK_TYPE_CHECK_BUTTON);
 	flexible_checkbutton = glade_helper_get (xml_xservers, "xserver_flexible_checkbutton",
 	                                         GTK_TYPE_CHECK_BUTTON);
+	priority_spinbutton = glade_helper_get(xml_xservers, "xserv_priority_spinbutton",
+					       GTK_TYPE_SPIN_BUTTON);
 
 	/* Get list of servers that are set to start */
 	store = gtk_list_store_new (XSERVER_NUM_COLUMNS,
@@ -703,6 +983,8 @@
 		gtk_combo_box_set_active (GTK_COMBO_BOX (style_combobox), XSERVER_LAUNCH_CHOOSER);
 	}
 	
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON (priority_spinbutton), 
+				   xserver->priority);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (handled_checkbutton),
 	                              xserver->handled);
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (flexible_checkbutton),
@@ -1004,6 +1286,46 @@
 				GTK_COMBO_BOX (combo_box)), &iter,
 				0, &new_val, -1);
 		}
+		else {
+			/* The selection was typed so there are two possibilities
+			   1. The typed value is a user
+			   2. The typed value is a script, garbage, ete (anything but an
+			   existing user)
+			   If its case 1. then we check if the user matches the MinimalUID 
+			   criteria or is not root. If its case 2. we do not do any checking */
+			
+			new_val = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_box));
+			if (gdm_is_user_valid (ve_sure_string (new_val))) {
+				gint user_uid = gdm_user_uid (new_val);
+				gint GdmMinimalUID = gdm_config_get_int (GDM_KEY_MINIMAL_UID);
+				
+				if (user_uid == 0 || user_uid < GdmMinimalUID) {
+					/* we can't accept users that have uid lower
+					   than minimal uid, or uid = 0 (root) */
+					gchar *str;
+					GtkWidget *dialog;
+					
+					if (gdm_user_uid (new_val) == 0)
+						str = g_strdup (_("Autologin or timed login to the root account is forbidden."));
+					else 
+						str = g_strdup_printf (_("The \"%s\" user UID is lower than allowed MinimalUID."), new_val);				
+					
+					dialog = ve_hig_dialog_new (NULL,
+								    GTK_DIALOG_MODAL,
+								    GTK_MESSAGE_ERROR,
+								    GTK_BUTTONS_OK,
+								    _("User not allowed"),
+								    str);
+					gtk_dialog_run (GTK_DIALOG (dialog));
+					gtk_widget_destroy (dialog);
+					g_free (str);
+					
+					gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
+					return TRUE;
+				}
+			}
+		}
+
 
 		val = gdm_config_get_string ((gchar *)key);
 		if (new_val &&
@@ -1067,6 +1389,125 @@
 		}
 		g_free (section);
 	}
+	/* Use 24 clock combobox */
+	else if (strcmp (ve_sure_string (key), GDM_KEY_USE_24_CLOCK) == 0) {		
+		gchar *val;		
+		gchar *new_val;
+		
+		new_val = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_box));
+		val = gdm_config_get_string ((gchar *)key);
+		if (new_val &&
+		    strcmp (ve_sure_string (val), ve_sure_string (new_val)) != 0) {			
+			gdm_setup_config_set_string (key, new_val);
+		}
+		g_free (new_val);
+		g_free (val);
+	}
+	/* Commands combobox */
+	else if (strcmp (ve_sure_string (key), _("command_chooser_combobox")) == 0) {
+		/* We need to set the data according to selected command */
+		GtkWidget *hrs_cmd_entry = NULL;
+		GtkWidget *cust_cmd_entry = NULL;
+		GtkWidget *cust_cmd_label_entry = NULL;
+		GtkWidget *cust_cmd_lrlabel_entry = NULL;
+		GtkWidget *cust_cmd_text_entry = NULL;
+		GtkWidget *cust_cmd_tooltip_entry = NULL;
+		GtkWidget *cust_cmd_persistent_checkbox = NULL;
+		GtkWidget *cust_cmd_norestart_checkbox = NULL;
+		gchar *val = NULL;
+		gchar *key_string = NULL;
+		gboolean bool_val = FALSE;		
+
+		hrs_cmd_entry = glade_helper_get (xml, "hrs_cmd_path_entry",
+						  GTK_TYPE_ENTRY);					
+
+		if (selected == HALT_CMD) {
+			val = gdm_config_get_string (GDM_KEY_HALT);		
+			gtk_entry_set_text (GTK_ENTRY (hrs_cmd_entry), ve_sure_string (val));
+		}
+		else if (selected == REBOOT_CMD) {
+			val = gdm_config_get_string (GDM_KEY_REBOOT);			
+			gtk_entry_set_text (GTK_ENTRY (hrs_cmd_entry), ve_sure_string (val));
+		}
+		else if (selected == SUSPEND_CMD) {
+			val = gdm_config_get_string (GDM_KEY_SUSPEND);			
+			gtk_entry_set_text (GTK_ENTRY (hrs_cmd_entry), ve_sure_string (val));
+		}
+		else {
+			gint i = selected - CUSTOM_CMD;
+			/* Here we are going to deal with custom commands */
+			key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, i); 
+			cust_cmd_entry  = glade_helper_get (xml, "custom_cmd_path_entry",			
+							    GTK_TYPE_ENTRY);			
+			val = gdm_config_get_string (key_string);
+			gtk_entry_set_text (GTK_ENTRY (cust_cmd_entry), ve_sure_string (val));
+			g_free (key_string);
+			g_free (val);
+			
+			key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_LABEL_TEMPLATE, i);
+			cust_cmd_label_entry  = glade_helper_get (xml, "custom_cmd_label_entry",			
+								  GTK_TYPE_ENTRY);			
+			val = gdm_config_get_string (key_string);
+			gtk_entry_set_text (GTK_ENTRY (cust_cmd_label_entry), ve_sure_string (val));
+			g_free (key_string);
+			g_free (val);
+
+			key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_LR_LABEL_TEMPLATE, i);
+			cust_cmd_lrlabel_entry  = glade_helper_get (xml, "custom_cmd_lrlabel_entry",
+								    GTK_TYPE_ENTRY);			
+			val = gdm_config_get_string (key_string);
+			gtk_entry_set_text (GTK_ENTRY (cust_cmd_lrlabel_entry), ve_sure_string (val));
+			g_free (key_string);
+			g_free (val);
+
+			key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_TEXT_TEMPLATE, i);
+			cust_cmd_text_entry  = glade_helper_get (xml, "custom_cmd_text_entry",
+								 GTK_TYPE_ENTRY);			
+			val = gdm_config_get_string (key_string);
+			gtk_entry_set_text (GTK_ENTRY (cust_cmd_text_entry), ve_sure_string (val));
+			g_free (key_string);
+			g_free (val);
+			
+			key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_TOOLTIP_TEMPLATE, i);
+			cust_cmd_tooltip_entry  = glade_helper_get (xml, "custom_cmd_tooltip_entry",
+								    GTK_TYPE_ENTRY);			
+			val = gdm_config_get_string (key_string);
+			gtk_entry_set_text (GTK_ENTRY (cust_cmd_tooltip_entry), ve_sure_string (val));
+			g_free (key_string);
+			
+			key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE, i);
+			cust_cmd_norestart_checkbox  = glade_helper_get (xml, "custom_cmd_norestart_checkbutton",
+								    GTK_TYPE_CHECK_BUTTON);
+			bool_val = gdm_config_get_bool (key_string);
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cust_cmd_norestart_checkbox), bool_val);
+			g_free (key_string);
+			
+			key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE, i);
+			cust_cmd_persistent_checkbox  = glade_helper_get (xml, "custom_cmd_persistent_checkbutton",
+									 GTK_TYPE_CHECK_BUTTON);
+			bool_val = gdm_config_get_bool (key_string);
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cust_cmd_persistent_checkbox), bool_val);
+
+		}
+		g_free (val);
+		g_free (key_string);
+	}
+	/* Default session combobox*/
+	else if (strcmp (ve_sure_string (key), GDM_KEY_DEFAULT_SESSION) == 0) {
+		/* First we get the selected index. Next we lookup the actual
+		   filename in the List of sessions */
+		gchar *val;
+		gchar *new_val = NULL;
+		
+		val = gdm_config_get_string ((gchar *)key);
+		new_val = g_strdup ((gchar*) g_slist_nth_data (sessions, selected));
+		
+		if (strcmp (ve_sure_string (val), ve_sure_string (new_val)) != 0)
+			gdm_setup_config_set_string (key,  ve_sure_string (new_val));
+
+		g_free (new_val);
+		g_free (val);		
+	}
 	return FALSE;
 }
 
@@ -1295,6 +1736,32 @@
 			mode_combobox = glade_helper_get (xml, "gg_mode_combobox",
 			                                  GTK_TYPE_COMBO_BOX);
 			gtk_combo_box_set_active (GTK_COMBO_BOX (mode_combobox), selected);
+
+			if (mode_combobox != combobox) {
+				/* Display a warning when no themes are selected and the
+				   Random from selected option has been activated. 
+				   This is a bit of a HACK as combo_box handler is 
+				   called multiple times and we want this warning 
+				   to be displayed only once */
+				if (selected == RANDOM_THEME && ve_string_empty (selected_themes)) {
+					GtkWidget *warn_dlg = ve_hig_dialog_new (NULL /* parent */,
+										 GTK_DIALOG_MODAL /* flags */,
+										 GTK_MESSAGE_WARNING,
+										 GTK_BUTTONS_OK,
+										 _("No themes selected!"),
+										 _("You need one or more themes "
+										   "selected for the \"Random from selected\" "
+										   "option to be valid. Failure to do so will "
+										   "force \"Selected only\" mode."));
+					gtk_dialog_run (GTK_DIALOG (warn_dlg));
+					gtk_widget_destroy (warn_dlg);
+					
+					GdmRandomFromSelectedChangesWarn = TRUE;
+				}
+				else if (selected == ONE_THEME) {
+					GdmRandomFromSelectedChangesWarn = FALSE;
+				}
+			}
 		}
 
 		radioColumn = gtk_tree_view_get_column (GTK_TREE_VIEW (theme_list),
@@ -1385,6 +1852,70 @@
 	else if (strcmp (ve_sure_string (key), GDM_KEY_SERVER_PREFIX) == 0 ) {
 		init_servers_combobox (gtk_combo_box_get_active (GTK_COMBO_BOX (combobox)));
 	}
+	else if (strcmp (ve_sure_string (key), _("command_chooser_combobox")) == 0) {
+		gint selected;
+		GtkWidget *hrs_cmd_vbox;
+		GtkWidget *custom_cmd_vbox;
+		
+		selected = gtk_combo_box_get_active (GTK_COMBO_BOX (combobox));			
+
+		/* First of all we need to check if we had made any changes
+		   to any of the command fields. If so user gets reminded and
+		   given an option to save, or discard */
+		if (g_hash_table_size (GdmCommandChangesUnsaved) != 0) {
+			GtkWidget *prompt;
+			GtkWidget *setup_dialog;
+			GtkWidget *apply_command;
+			gint response;
+			
+			setup_dialog = glade_helper_get (xml, "setup_dialog", GTK_TYPE_WINDOW);
+			
+			prompt = ve_hig_dialog_new (GTK_WINDOW (setup_dialog),
+						    GTK_DIALOG_MODAL |
+						    GTK_DIALOG_DESTROY_WITH_PARENT,
+						    GTK_MESSAGE_WARNING,
+						    GTK_BUTTONS_NONE,
+						    _("Apply changes to the modified command?"),
+						    _("If you don't apply, the changes "
+						      "will be discarded."));
+			
+			gtk_dialog_add_button (GTK_DIALOG (prompt), "gtk-cancel", GTK_RESPONSE_CANCEL); 
+			gtk_dialog_add_button (GTK_DIALOG (prompt), "gtk-apply", GTK_RESPONSE_APPLY);
+			
+			response = gtk_dialog_run (GTK_DIALOG (prompt));
+			gtk_widget_destroy (prompt);	       
+			
+			apply_command = glade_helper_get (xml, "command_apply_button",
+							  GTK_TYPE_BUTTON);
+			if (response == GTK_RESPONSE_APPLY)				
+				g_signal_emit_by_name (G_OBJECT (apply_command), "clicked");
+			
+			else {
+				g_hash_table_remove_all (GdmCommandChangesUnsaved);				
+				gtk_widget_set_sensitive (apply_command, FALSE);	
+			}
+		}
+		
+		
+		hrs_cmd_vbox = glade_helper_get (xml, "hrs_command_vbox",
+						 GTK_TYPE_VBOX);
+		custom_cmd_vbox = glade_helper_get (xml, "custom_command_vbox",
+						      GTK_TYPE_VBOX);		
+		if (selected > SUSPEND_CMD) {
+			/* We are dealing with custom commands */							
+			gtk_widget_show (custom_cmd_vbox);
+			gtk_widget_hide (hrs_cmd_vbox);					
+		}
+		else {
+			/* We are dealing with hrs (Halt, Reboot, Shutdown) commands */
+			gtk_widget_hide (custom_cmd_vbox);
+			gtk_widget_show (hrs_cmd_vbox);	
+		}
+
+		/* We dont want default timeout for this one so we
+		   are going to bail out now */
+		return run_timeout (combobox, 100, combobox_timeout);		
+	}
 	run_timeout (combobox, 500, combobox_timeout);
 }
 
@@ -1546,6 +2077,64 @@
 		g_signal_connect (G_OBJECT (toggle), "toggled",	
 		                  G_CALLBACK (timedlogin_allow_remote_toggled), timedlogin_allow_remote);
 	}
+	else if (strcmp ("vis_feedback_passwd_checkbox", ve_sure_string (name)) == 0) {
+		/* This one is a lil bit back to front
+		   true is false and false is true */
+		GtkWidget *use_circles_in_passwd;
+		use_circles_in_passwd = glade_helper_get (xml, "use_circles_passwd_checkbox", 
+							  GTK_TYPE_CHECK_BUTTON);
+		
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle), !val);
+		gtk_widget_set_sensitive (use_circles_in_passwd, !val);
+		
+		g_signal_connect (G_OBJECT (toggle), "toggled",
+		                  G_CALLBACK (toggle_toggled), toggle);	
+		g_signal_connect (G_OBJECT (toggle), "toggled",
+		                  G_CALLBACK (toggle_toggled_sensitivity_positive), use_circles_in_passwd);
+		
+	}
+	else if (strcmp ("local_set_pos_checkbox", ve_sure_string (name)) == 0) {
+		
+		GtkWidget *posx;
+		GtkWidget *posy;
+
+		posx =  glade_helper_get (xml, "local_posx_spinbutton", 
+					  GTK_TYPE_SPIN_BUTTON);
+		
+		posy =  glade_helper_get (xml, "local_posy_spinbutton", 
+					  GTK_TYPE_SPIN_BUTTON);
+
+		gtk_widget_set_sensitive (posx, val);
+		gtk_widget_set_sensitive (posy, val);
+		
+		g_signal_connect (G_OBJECT (toggle), "toggled",
+		                  G_CALLBACK (toggle_toggled), toggle);	
+		g_signal_connect (G_OBJECT (toggle), "toggled",
+		                  G_CALLBACK (toggle_toggled_sensitivity_positive), posx);
+		g_signal_connect (G_OBJECT (toggle), "toggled",
+		                  G_CALLBACK (toggle_toggled_sensitivity_positive), posy);
+	}
+	else if (strcmp ("remote_set_pos_checkbox", ve_sure_string (name)) == 0) {
+		
+		GtkWidget *posx;
+		GtkWidget *posy;
+
+		posx =  glade_helper_get (xml, "remote_posx_spinbutton", 
+					  GTK_TYPE_SPIN_BUTTON);
+		
+		posy =  glade_helper_get (xml, "remote_posy_spinbutton", 
+					  GTK_TYPE_SPIN_BUTTON);
+
+		gtk_widget_set_sensitive (posx, val);
+		gtk_widget_set_sensitive (posy, val);
+		
+		g_signal_connect (G_OBJECT (toggle), "toggled",
+		                  G_CALLBACK (toggle_toggled), toggle);	
+		g_signal_connect (G_OBJECT (toggle), "toggled",
+		                  G_CALLBACK (toggle_toggled_sensitivity_positive), posx);
+		g_signal_connect (G_OBJECT (toggle), "toggled",
+		                  G_CALLBACK (toggle_toggled_sensitivity_positive), posy);
+	}
 	else {
 		g_signal_connect (G_OBJECT (toggle), "toggled",
 		                  G_CALLBACK (toggle_toggled), NULL);
@@ -1893,6 +2482,30 @@
 		}
 
 		if (fd->type == INCLUDE) {
+			/* Now the user is valid but his/hers UID might be smaller than the MinimalUID */
+			gint user_uid = gdm_user_uid (text);
+			if (user_uid < gdm_config_get_int (GDM_KEY_MINIMAL_UID)) {
+				GtkWidget *setup_dialog;
+				GtkWidget *dialog;
+				gchar *str;
+				
+				str = g_strdup_printf (_("The \"%s\" user UID is lower than allowed MinimalUID."), text); 
+				
+				setup_dialog = glade_helper_get (xml_add_users, "add_user_dialog",
+								 GTK_TYPE_WINDOW);
+				
+				dialog = ve_hig_dialog_new (GTK_WINDOW (setup_dialog),
+							    GTK_DIALOG_MODAL | 
+							    GTK_DIALOG_DESTROY_WITH_PARENT,
+							    GTK_MESSAGE_ERROR,
+							    GTK_BUTTONS_OK,
+							    _("Cannot add user"),
+							    str);
+				gtk_dialog_run (GTK_DIALOG (dialog));
+				gtk_widget_destroy (dialog);
+				g_free (str);
+				return;
+			}
 			gtk_list_store_append (fd->fc->include_store, &iter);
 			gtk_list_store_set (fd->fc->include_store, &iter,
 				USERLIST_NAME, text, -1);
@@ -1977,6 +2590,30 @@
 	if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
 	        gtk_tree_model_get (model, &iter, USERLIST_NAME, &text, -1);
 		if (fd->type == INCLUDE) {
+			/* We cant move the users that have uid smaller that MinimalUID */
+			gint user_uid = gdm_user_uid (text);
+			if (user_uid < gdm_config_get_int (GDM_KEY_MINIMAL_UID)) {
+				GtkWidget *setup_dialog;
+				GtkWidget *dialog;
+				gchar *str;
+				
+				str = g_strdup_printf (_("The \"%s\" user UID is lower than allowed MinimalUID."), text); 
+				
+				setup_dialog = glade_helper_get (xml_add_users, "add_user_dialog",
+								 GTK_TYPE_WINDOW);
+				
+				dialog = ve_hig_dialog_new (GTK_WINDOW (setup_dialog),
+							    GTK_DIALOG_MODAL | 
+							    GTK_DIALOG_DESTROY_WITH_PARENT,
+							    GTK_MESSAGE_ERROR,
+							    GTK_BUTTONS_OK,
+							    _("Cannot add user"),
+							    str);
+				gtk_dialog_run (GTK_DIALOG (dialog));
+				gtk_widget_destroy (dialog);
+				g_free (str);
+				return;
+			}
 			gtk_list_store_remove (fd->fc->exclude_store, &iter);
 			gtk_list_store_append (fd->fc->include_store, &iter);
 			gtk_list_store_set (fd->fc->include_store, &iter,
@@ -1992,6 +2629,50 @@
 	}
 }
 
+/* Hash key happens to be equal to the config entry key,
+   se we save the value under the key and clean up
+*/
+gboolean
+unsaved_data_from_hash_table_func (gpointer key, gpointer value, gpointer user_data)
+{
+	gchar *c_key = key;
+        if (strncmp (c_key, GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE, 
+		     strlen (GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE)) == 0 ||
+	    strncmp (c_key, GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE,
+		     strlen (GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE)) == 0) {//Lukas
+		gboolean *p_val = (gboolean*)value;
+		gdm_setup_config_set_bool (c_key, *p_val);
+	}
+	else
+		gdm_setup_config_set_string (c_key, (gchar*)value);	
+	
+	/* And final cleanup */
+	g_free (value);
+	g_free (key);
+
+	return TRUE;
+}
+
+/* Go thru and remove each of the hash entries
+   then clean the hash (if not already empty)
+   just in case, then de-sensitise the apply 
+   command changes button
+*/
+static void
+command_apply (GtkWidget *button, gpointer data)
+{
+	g_hash_table_foreach_remove (GdmCommandChangesUnsaved,
+				     (GHRFunc) unsaved_data_from_hash_table_func, NULL);
+
+	/* Just to make sure */
+	if (g_hash_table_size (GdmCommandChangesUnsaved) != 0)
+		g_hash_table_remove_all (GdmCommandChangesUnsaved);
+
+	gtk_widget_set_sensitive (button, FALSE);
+
+	update_greeters ();
+}
+
 static void
 browser_apply (GtkWidget *button, gpointer data)
 {
@@ -2638,6 +3319,73 @@
 	return FALSE;
 }
 
+static gboolean
+greeter_command_entry_timeout (GtkWidget *entry)
+{
+	GtkWidget *apply_cmd_changes;
+	GtkWidget *command_combobox;
+	gint selected;
+
+	const char *key = g_object_get_data (G_OBJECT (entry), "key");
+	gchar *val      = gtk_entry_get_text (GTK_ENTRY (entry));
+	
+	apply_cmd_changes = glade_helper_get (xml, "command_apply_button", GTK_TYPE_BUTTON);
+	command_combobox = glade_helper_get (xml, "cmd_type_combobox", GTK_TYPE_COMBO_BOX);
+	
+	selected = gtk_combo_box_get_active (GTK_COMBO_BOX (command_combobox));	
+
+	/* All hrs (Halt, Shutdown, Suspend) commands will fall into this category */
+	if (strcmp ("hrs_custom_cmd", ve_sure_string (key)) == 0) {
+		gchar *old_val;
+		gchar *cmd_key = NULL;
+
+		if (selected == HALT_CMD)
+			cmd_key = g_strdup (GDM_KEY_HALT);			
+		else if (selected == REBOOT_CMD)
+			cmd_key = g_strdup (GDM_KEY_REBOOT);
+		else if (selected == SUSPEND_CMD)
+			cmd_key = g_strdup (GDM_KEY_SUSPEND);
+		
+		old_val = gdm_config_get_string (cmd_key);		
+			
+		if (strcmp (ve_sure_string (val), ve_sure_string (old_val)) != 0) 			
+			g_hash_table_insert (GdmCommandChangesUnsaved, g_strdup (cmd_key), g_strdup (val));
+
+		else if (g_hash_table_lookup (GdmCommandChangesUnsaved, cmd_key) != NULL)			
+			g_hash_table_remove (GdmCommandChangesUnsaved, cmd_key);		
+		
+		g_free (old_val);
+		g_free (cmd_key);
+	}
+	/* All the custom commands will fall into this category */
+	else {
+		gchar *key_string;
+		gchar *old_val;
+		gint i;			
+
+		i = selected - CUSTOM_CMD;
+		key_string = g_strdup_printf(_("%s%d="), ve_sure_string (key), i); 
+		old_val = gdm_config_get_string (key_string);				
+	
+		
+		if (strcmp (ve_sure_string (val), ve_sure_string (old_val)) != 0)
+			g_hash_table_insert (GdmCommandChangesUnsaved, g_strdup (key_string), g_strdup (val));
+		
+		else if (g_hash_table_lookup (GdmCommandChangesUnsaved, key_string) != NULL)
+			g_hash_table_remove (GdmCommandChangesUnsaved, key_string);
+		
+		g_free (old_val);
+		g_free (key_string);
+	}	
+	
+	if (g_hash_table_size (GdmCommandChangesUnsaved) == 0)
+		gtk_widget_set_sensitive (apply_cmd_changes, FALSE);
+	else 
+		gtk_widget_set_sensitive (apply_cmd_changes, TRUE);
+	
+	return FALSE;
+}
+
 static void
 greeter_entry_untranslate_changed (GtkWidget *entry)
 {
@@ -2645,6 +3393,155 @@
 }
 
 static void
+greeter_command_entry_changed (GtkWidget *entry)
+{
+	run_timeout (entry, 100, greeter_command_entry_timeout);
+}
+
+static void
+command_response (GtkWidget *button, gpointer data)
+{
+
+	GtkWidget *chooser = NULL;
+	GtkWidget *setup_dialog;
+	gint response;
+	gchar *filename;
+	
+	setup_dialog = glade_helper_get (xml, "setup_dialog", GTK_TYPE_WINDOW);
+	
+	/* first get the file */
+	chooser = gtk_file_chooser_dialog_new (_("Select Command"),
+					       GTK_WINDOW (setup_dialog),
+					       GTK_FILE_CHOOSER_ACTION_OPEN,
+					       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+					       GTK_STOCK_OK, GTK_RESPONSE_OK,
+					       NULL);	
+
+	response = gtk_dialog_run (GTK_DIALOG (chooser));
+	
+	if (response != GTK_RESPONSE_OK) {
+		gtk_widget_destroy (chooser);
+		return;
+	}
+
+	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (chooser));
+	gtk_widget_destroy (chooser);
+
+	if (filename == NULL) {
+		
+		GtkWidget *dialog;
+		
+		dialog = ve_hig_dialog_new (GTK_WINDOW (setup_dialog),
+					    GTK_DIALOG_MODAL | 
+					    GTK_DIALOG_DESTROY_WITH_PARENT,
+					    GTK_MESSAGE_ERROR,
+					    GTK_BUTTONS_OK,
+					    _("No file selected"),
+					    "");
+		gtk_dialog_run (GTK_DIALOG (dialog));
+		gtk_widget_destroy (dialog);
+		return;
+	}
+
+	const gchar *key;
+	gchar *value;
+	GtkWidget *command_combobox;
+	GtkWidget *command_entry = NULL;
+	gint selected;
+	
+	key = g_object_get_data (G_OBJECT (button), "key");	
+	
+	/* Then according to the selected command
+	   append the chosen filepath onto the existing
+	   string */
+	
+	command_combobox = glade_helper_get (xml, 
+					     "cmd_type_combobox",
+					     GTK_TYPE_COMBO_BOX);
+	
+	selected = gtk_combo_box_get_active (GTK_COMBO_BOX (command_combobox));
+	
+	if (selected == HALT_CMD)
+		value = gdm_config_get_string (GDM_KEY_HALT);			
+	else if (selected == REBOOT_CMD)
+		value = gdm_config_get_string (GDM_KEY_REBOOT);		
+	else if (selected == SUSPEND_CMD) 
+		value = gdm_config_get_string (GDM_KEY_SUSPEND);
+	else {
+		gchar *key_string;
+		gint i;
+
+		i = selected - CUSTOM_CMD;
+		
+		key_string = g_strdup_printf(_("%s%d="), GDM_KEY_CUSTOM_CMD_TEMPLATE, i); 
+		value = gdm_config_get_string (key_string);		
+		g_free (key_string);
+	}
+	
+	value = strings_list_add (value, filename, ";");
+	
+	if (strcmp (ve_sure_string (key), "add_hrs_cmd_button") == 0)				
+		command_entry = glade_helper_get (xml, "hrs_cmd_path_entry", GTK_TYPE_ENTRY);		
+	
+	else if (strcmp (ve_sure_string (key), "add_custom_cmd_button") == 0)				
+		command_entry = glade_helper_get (xml, "custom_cmd_path_entry", GTK_TYPE_ENTRY);		
+			       
+
+	gtk_entry_set_text (GTK_ENTRY (command_entry), ve_sure_string (value));
+
+	g_free (value);
+	g_free (filename);
+}
+
+static void
+default_filechooser_response (GtkWidget *file_chooser, gpointer data)
+{
+	gchar *filename;
+	gchar *key;
+	gchar *value;
+		
+	filename  = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (file_chooser));
+	key = g_object_get_data (G_OBJECT (file_chooser), "key");	
+	value     = gdm_config_get_string (key);
+	
+	if (strcmp (ve_sure_string (key), GDM_KEY_GLOBAL_FACE_DIR) == 0) {
+		/* we need to append trailing / so it matches the default
+		   config  values. This is not really necessary but makes
+		   things neater */
+		gchar *corr_filename;
+		
+		corr_filename = g_strdup_printf("%s/", ve_sure_string (filename));
+		
+		if (strcmp (ve_sure_string (value), corr_filename) != 0)
+			gdm_setup_config_set_string (key, corr_filename);	
+		
+		g_free (corr_filename);
+	}
+	else {
+		/* All other cases */
+		if (strcmp (ve_sure_string (value), ve_sure_string (filename)) != 0)
+			gdm_setup_config_set_string (key, ve_sure_string (filename));		
+	}
+	
+	g_free (filename);
+	g_free (value);
+}
+
+static void
+setup_general_command_buttons (const char *name,
+			       const char *key)
+{
+	GtkWidget *button = glade_helper_get (xml, name, GTK_TYPE_BUTTON);
+	
+	g_object_set_data_full (G_OBJECT (button),
+				"key", g_strdup (key),
+				(GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (button), "clicked",
+			  G_CALLBACK (command_response),
+			  NULL);
+}
+
+static void
 setup_greeter_untranslate_entry (const char *name,
 				 const char *key)
 {
@@ -2917,6 +3814,34 @@
 	return n;
 }
 
+/* This function removes *string with the addition of *sep
+   as a postfix deliminator the string from *strings_list, then
+   returns a copy of the new strings_list. */
+static char *
+strings_list_remove (char *strings_list, const char *string, const char *sep)
+{
+    if (ve_string_empty (strings_list))
+        return strings_list;
+    
+    char **actions;   
+    gint i;
+    GString *msg = g_string_new ("");
+    const char *separator = "";
+    
+    actions = g_strsplit (strings_list, sep, -1);
+        for (i = 0; actions[i]; i++) {
+        if (strncmp (actions[i], string, strlen (string)) == 0)
+            continue;
+        g_string_append_printf (msg, "%s%s", separator, actions[i]);
+        separator = sep;
+    }
+    g_strfreev (actions);
+    char *n = g_strdup (msg->str);
+    g_string_free (msg, TRUE);
+    g_free (strings_list);
+    return n;
+}
+
 static void
 acc_modules_toggled (GtkWidget *toggle, gpointer data)
 {
@@ -3008,9 +3933,101 @@
 static void
 setup_users_tab (void)
 {
+	GtkFileFilter *filter;
+	GtkWidget *default_face_filechooser;
+	GtkWidget *default_face_checkbox;
+	GtkWidget *global_face_dir_filechooser;
+	GtkWidget *global_face_dir_checkbox;
+	gchar *filename;
+
 	setup_greeter_toggle ("fb_allusers",
 			      GDM_KEY_INCLUDE_ALL);
 	setup_face ();
+
+	/* Setup default face */
+	default_face_filechooser = glade_helper_get (xml, 
+						     "default_face_filechooser",
+						     GTK_TYPE_FILE_CHOOSER_BUTTON);
+
+	filter = gtk_file_filter_new ();
+        gtk_file_filter_set_name (filter, _("Images"));
+        gtk_file_filter_add_pixbuf_formats (filter);
+        gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (default_face_filechooser), filter);
+
+	filename = gdm_config_get_string (GDM_KEY_DEFAULT_FACE);
+
+	default_face_checkbox = glade_helper_get (xml,
+						  "default_face_checkbutton", 
+						  GTK_TYPE_CHECK_BUTTON);
+	
+
+	if (!ve_string_empty (filename) && access (filename, R_OK|X_OK)) {
+		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (default_face_filechooser),
+					       filename);
+		
+		gtk_widget_set_sensitive (default_face_filechooser, TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (default_face_checkbox), TRUE);
+		
+	}	
+	else {
+		gtk_widget_set_sensitive (default_face_filechooser, FALSE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (default_face_checkbox), FALSE);
+	}
+	
+	g_object_set_data_full (G_OBJECT (default_face_filechooser),
+				"key", g_strdup (GDM_KEY_DEFAULT_FACE),
+				(GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (default_face_filechooser), "selection-changed",
+			  G_CALLBACK (default_filechooser_response),
+			  NULL);	
+	
+	g_object_set_data_full (G_OBJECT (default_face_checkbox),
+				"key", g_strdup (GDM_KEY_DEFAULT_FACE),
+				(GDestroyNotify) g_free);       	
+	g_signal_connect (G_OBJECT (default_face_checkbox), "toggled",
+			  G_CALLBACK (toggle_toggled), default_face_checkbox);	
+	g_signal_connect (G_OBJECT (default_face_checkbox), "toggled",
+			  G_CALLBACK (toggle_toggled_sensitivity_positive), default_face_filechooser);			
+	
+	/* Setup global face dir */
+	g_free (filename);		
+	
+	global_face_dir_filechooser = glade_helper_get (xml, 
+							"global_face_dir_filechooser",
+							GTK_TYPE_FILE_CHOOSER_BUTTON);	
+
+	filename = gdm_config_get_string (GDM_KEY_GLOBAL_FACE_DIR);
+
+	global_face_dir_checkbox = glade_helper_get (xml,
+						     "global_face_dir_checkbutton", 
+						     GTK_TYPE_CHECK_BUTTON);
+	
+	if (!ve_string_empty (filename) && access (filename, R_OK|X_OK) == 0) {
+		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (global_face_dir_filechooser),
+					       filename);
+		gtk_widget_set_sensitive (global_face_dir_filechooser, TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (global_face_dir_checkbox), TRUE);
+	}
+	else {
+		gtk_widget_set_sensitive (global_face_dir_filechooser, FALSE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (global_face_dir_checkbox), FALSE);
+	}
+       
+
+	g_object_set_data_full (G_OBJECT (global_face_dir_filechooser),
+				"key", g_strdup (GDM_KEY_GLOBAL_FACE_DIR),
+				(GDestroyNotify) g_free);		
+	g_signal_connect (G_OBJECT (global_face_dir_filechooser), "selection-changed",
+			  G_CALLBACK (default_filechooser_response), NULL);
+			
+	g_object_set_data_full (G_OBJECT (global_face_dir_checkbox),
+				"key", g_strdup (GDM_KEY_GLOBAL_FACE_DIR),
+				(GDestroyNotify) g_free);       	
+	g_signal_connect (G_OBJECT (global_face_dir_checkbox), "toggled",
+			  G_CALLBACK (toggle_toggled), global_face_dir_checkbox);	
+	g_signal_connect (G_OBJECT (global_face_dir_checkbox), "toggled",
+			  G_CALLBACK (toggle_toggled_sensitivity_positive), global_face_dir_filechooser);				
+	g_free (filename);
 }
 
 static void
@@ -4481,6 +5498,44 @@
 }
 
 static gboolean
+xserver_priority_timeout (GtkWidget *entry)
+{
+	GtkWidget *mod_combobox;
+	GSList *li;
+	const char *key  = g_object_get_data (G_OBJECT (entry), "key");
+	gint value = 0;
+	gchar *section;
+	
+	mod_combobox    = glade_helper_get (xml_xservers, "xserver_mod_combobox",
+	                                    GTK_TYPE_COMBO_BOX);
+	
+	/* Get xserver section to update */
+	section = gtk_combo_box_get_active_text (GTK_COMBO_BOX (mod_combobox));
+	
+	for (li = xservers; li != NULL; li = li->next) {
+		GdmXserver *svr = li->data;
+		if (strcmp (ve_sure_string (svr->id), ve_sure_string (section)) == 0) {
+		
+			
+			if (strcmp (ve_sure_string (key),
+				    ve_sure_string (GDM_KEY_SERVER_PRIORITY)) == 0)
+				value = svr->priority;
+			
+			/* Update this servers configuration */
+			gint new_value = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (entry));
+			if (new_value != value) {
+				svr->priority = new_value;				
+				update_xserver (section, svr);			
+			}
+			break;
+		}
+	}
+	g_free (section);
+
+	return FALSE;
+}
+
+static gboolean
 xserver_toggle_timeout (GtkWidget *toggle)
 {
 	GtkWidget *mod_combobox;
@@ -4542,6 +5597,12 @@
 }
 
 static void
+xserver_priority_changed (GtkWidget *entry)
+{
+	run_timeout (entry, 500, xserver_priority_timeout);
+}
+
+static void
 xserver_append_combobox (GdmXserver *xserver, GtkComboBox *combobox)
 {
 	gtk_combo_box_append_text (combobox, (xserver->id));
@@ -4832,6 +5893,7 @@
 	GtkWidget *handled_check, *flexible_check;
 	GtkWidget *greeter_radio, *chooser_radio;
 	GtkWidget *create_button, *delete_button;
+	GtkWidget *priority_spinbutton;
 
 	/* Get Widgets from glade */
 	frame           = glade_helper_get (xml, "xserver_modify_frame",
@@ -4840,6 +5902,8 @@
                                         GTK_TYPE_ENTRY);
 	command_entry   = glade_helper_get (xml, "xserver_command_entry",
 	                                    GTK_TYPE_ENTRY);
+	priority_spinbutton = glade_helper_get(xml, "xserv_priority_spinbutton",
+					       GTK_TYPE_SPIN_BUTTON);
 	handled_check   = glade_helper_get (xml, "xserver_handled_checkbutton",
 	                                    GTK_TYPE_CHECK_BUTTON);
 	flexible_check  = glade_helper_get (xml, "xserver_flexible_checkbutton",
@@ -4950,6 +6014,7 @@
 setup_xserver_support (GladeXML *xml_xservers)
 {
 	GtkWidget *command_entry;
+	GtkWidget *priority_spinbutton;
 	GtkWidget *name_entry;
 	GtkWidget *handled_check;
 	GtkWidget *flexible_check;
@@ -4977,6 +6042,8 @@
                                             GTK_TYPE_ENTRY);
 	command_entry   = glade_helper_get (xml_xservers, "xserver_command_entry",
 	                                    GTK_TYPE_ENTRY);
+	priority_spinbutton = glade_helper_get(xml_xservers, "xserv_priority_spinbutton",
+					       GTK_TYPE_SPIN_BUTTON);
 	handled_check   = glade_helper_get (xml_xservers, "xserver_handled_checkbutton",
 	                                    GTK_TYPE_CHECK_BUTTON);
 	flexible_check  = glade_helper_get (xml_xservers, "xserver_flexible_checkbutton",
@@ -5050,7 +6117,9 @@
 	g_object_set_data_full (G_OBJECT (style_combobox), "key",
 	                        g_strdup (GDM_KEY_SERVER_CHOOSER),
 	                        (GDestroyNotify) g_free);
-		
+	g_object_set_data_full (G_OBJECT (priority_spinbutton), "key",
+				g_strdup (GDM_KEY_SERVER_PRIORITY),
+	                        (GDestroyNotify) g_free);
 	/* Signals Handlers */
     	g_signal_connect (G_OBJECT (name_entry), "changed",
 	                  G_CALLBACK (xserver_entry_changed),NULL);
@@ -5068,7 +6137,9 @@
 	                  G_CALLBACK (xserver_remove_display), NULL);
 	g_signal_connect (G_OBJECT (selection), "changed",
 	                  G_CALLBACK (xserver_row_selected), NULL);
-			  
+	g_signal_connect (G_OBJECT (priority_spinbutton), "value_changed",
+	                  G_CALLBACK (xserver_priority_changed), NULL);
+	
 	/* TODO: In the future, allow creation & delection of servers
 	g_signal_connect (create_button, "clicked",
 			  G_CALLBACK (xserver_create), NULL);
@@ -5171,6 +6242,24 @@
 	/* Setup Allow remote timed logins */
 	setup_notify_toggle ("allowremoteauto", GDM_KEY_ALLOW_REMOTE_AUTOLOGIN);
 
+	/* Setup check dir owner */
+	setup_notify_toggle ("check_dir_owner_checkbutton", GDM_KEY_CHECK_DIR_OWNER);
+
+	/* Setup never place cookies on NFS */
+	setup_notify_toggle ("never_cookies_NFS_checkbutton", GDM_KEY_NEVER_PLACE_COOKIES_ON_NFS);
+	
+	/* Setup Relax permissions */
+	setup_intspin ("relax_permissions", GDM_KEY_RELAX_PERM);
+	
+	/* Setup MinumalUID */
+	setup_intspin ("minimal_uid_spinbutton", GDM_KEY_MINIMAL_UID);
+
+	/* Setup always login current session */
+	setup_notify_toggle ("a_login_curr_session_checkbutton", GDM_KEY_ALWAYS_LOGIN_CURRENT_SESSION);
+
+	/* Setup always restart server */
+	setup_notify_toggle ("a_restart_server_checkbutton", GDM_KEY_ALWAYS_RESTART_SERVER);
+
 	/* Setup Configure XDMCP button */
 	XDMCPbutton = glade_helper_get (xml, "config_xserverbutton",
 	                                GTK_TYPE_BUTTON);
@@ -5839,6 +6928,26 @@
 }
 
 static void
+hookup_plain_behaviour (void)
+{
+	/* Setup qiver */
+	setup_notify_toggle ("local_quiver_checkbox", GDM_KEY_QUIVER);
+	
+	/* Setup lock position */
+	setup_notify_toggle ("local_lock_pos_checkbox", GDM_KEY_LOCK_POSITION);
+
+	/* Setup set position */
+	setup_notify_toggle ("local_set_pos_checkbox", GDM_KEY_SET_POSITION);
+
+	/* Setup positionX */
+	setup_intspin ("local_posx_spinbutton", GDM_KEY_POSITION_X);
+
+	/* Setup positionX */
+	setup_intspin ("local_posy_spinbutton", GDM_KEY_POSITION_Y);
+	
+}
+
+static void
 hookup_plain_logo (void)	
 {
 	/* Initialize and hookup callbacks for plain logo settings */
@@ -5950,6 +7059,9 @@
 	/* Plain background settings */
 	hookup_plain_background ();
 
+	/* Plain behaviour settings */
+	hookup_plain_behaviour ();
+
 	/* Plain logo settings */
 	hookup_plain_logo ();	
 	
@@ -5961,6 +7073,278 @@
 }
 
 static void
+setup_default_session (void)
+{
+	GtkWidget *default_session_combobox;
+	GtkWidget *default_session_checkbox;
+	GHashTable *sessnames        = NULL;
+	GList *tmp;
+	gint i = 0;
+	gint active = 0;
+	gchar *org_val;
+
+	_gdm_session_list_init (&sessnames, &sessions, NULL, NULL);
+	
+	default_session_combobox = glade_helper_get (xml, "default_session_combobox", GTK_TYPE_COMBO_BOX);
+
+	org_val = gdm_config_get_string (GDM_KEY_DEFAULT_SESSION);
+	
+	for (tmp = sessions; tmp != NULL; tmp = tmp->next, i++) {
+		GdmSession *session;
+		gchar *file;
+
+		file = (gchar *) tmp->data;
+		if (strcmp (ve_sure_string (org_val), ve_sure_string (file)) == 0)		
+			active = i;
+		
+		session = g_hash_table_lookup (sessnames, file);
+		
+		gtk_combo_box_append_text (GTK_COMBO_BOX (default_session_combobox), session->name);
+	}
+	
+	gtk_widget_set_sensitive (default_session_combobox, TRUE);
+
+	gtk_combo_box_set_active (GTK_COMBO_BOX (default_session_combobox), active);
+	
+	g_object_set_data_full (G_OBJECT (default_session_combobox), "key",
+	                        g_strdup (GDM_KEY_DEFAULT_SESSION),
+				(GDestroyNotify) g_free);
+	
+	g_signal_connect (default_session_combobox, "changed",
+		          G_CALLBACK (combobox_changed), NULL);
+	
+	default_session_checkbox = glade_helper_get (xml,
+						     "default_session_checkbutton", 
+						     GTK_TYPE_CHECK_BUTTON);
+	
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (default_session_checkbox), !ve_string_empty (org_val));
+	
+	g_object_set_data_full (G_OBJECT (default_session_checkbox),
+				"key", g_strdup (GDM_KEY_DEFAULT_SESSION),
+				(GDestroyNotify) g_free);       
+	
+	g_signal_connect (G_OBJECT (default_session_checkbox), "toggled",
+			  G_CALLBACK (toggle_toggled), default_session_checkbox);
+	g_signal_connect (G_OBJECT (default_session_checkbox), "toggled",
+			  G_CALLBACK (toggle_toggled_sensitivity_positive), default_session_combobox);
+	
+	g_free (org_val);
+	
+}
+
+static void
+setup_general_tab (void)
+{
+	GtkWidget *gtkrc_filechooser;
+	GtkWidget *gtkrc_checkbox;
+	GtkWidget *clock_type_chooser;
+	GtkWidget *command_chooser;
+	GtkWidget *hrs_cmd_path_entry;
+	GtkWidget *custom_cmd_path_entry;
+	GtkWidget *custom_cmd_label_entry;
+	GtkWidget *custom_cmd_lrlabel_entry;
+	GtkWidget *custom_cmd_text_entry;
+	GtkWidget *custom_cmd_tooltip_entry;
+	GtkWidget *custom_cmd_persistent_checkbutton;
+	GtkWidget *custom_cmd_norestart_checkbutton;
+	GtkWidget *apply_command_changes_button;
+	gchar *gtkrc_filename;
+	gchar *user_24hr_clock;
+
+	
+	/* Setup use visual feedback in the passwotrd entry */
+	setup_notify_toggle ("vis_feedback_passwd_checkbox", GDM_KEY_ENTRY_INVISIBLE);
+
+	/* Setup use circles in the password entry */
+	setup_notify_toggle ("use_circles_passwd_checkbox", GDM_KEY_ENTRY_CIRCLES);
+	
+	/* Setup default session */
+	setup_default_session ();
+	
+	/* Setup GtkRC file path */
+	gtkrc_filechooser = glade_helper_get (xml, 
+					      "gtkrc_chooserbutton",
+					      GTK_TYPE_FILE_CHOOSER_BUTTON);
+
+	gtkrc_filename = gdm_config_get_string (GDM_KEY_GTKRC);
+
+	gtkrc_checkbox = glade_helper_get (xml,
+					   "gtkrc_checkbutton", 
+					   GTK_TYPE_CHECK_BUTTON);		
+	
+	if (!ve_string_empty (gtkrc_filename) && access (gtkrc_filename, R_OK) == 0) {
+		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (gtkrc_filechooser),
+					       gtkrc_filename);
+		
+		gtk_widget_set_sensitive (gtkrc_filechooser, TRUE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtkrc_checkbox), TRUE);
+		
+	}
+	else {
+		gtk_widget_set_sensitive (gtkrc_filechooser, FALSE);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtkrc_checkbox), FALSE);	
+	}
+		
+	g_object_set_data_full (G_OBJECT (gtkrc_filechooser),
+				"key", g_strdup (GDM_KEY_GTKRC),
+				(GDestroyNotify) g_free);
+
+	g_signal_connect (G_OBJECT (gtkrc_filechooser), "selection-changed",
+			  G_CALLBACK (default_filechooser_response),
+			  NULL);
+	
+	
+	g_object_set_data_full (G_OBJECT (gtkrc_checkbox),
+				"key", g_strdup (GDM_KEY_GTKRC),
+				(GDestroyNotify) g_free);       
+	
+	g_signal_connect (G_OBJECT (gtkrc_checkbox), "toggled",
+			  G_CALLBACK (toggle_toggled), gtkrc_checkbox);	
+	g_signal_connect (G_OBJECT (gtkrc_checkbox), "toggled",
+			  G_CALLBACK (toggle_toggled_sensitivity_positive), gtkrc_filechooser);
+	
+	g_free (gtkrc_filename);
+
+	/* Setup user 24Hr Clock */
+	clock_type_chooser = glade_helper_get (xml, 
+					      "use_24hr_clock_combobox",
+					      GTK_TYPE_COMBO_BOX);	
+	
+	user_24hr_clock = gdm_config_get_string (GDM_KEY_USE_24_CLOCK);
+	if (!ve_string_empty (user_24hr_clock)) {
+		if (strcasecmp (ve_sure_string (user_24hr_clock), _("auto")) == 0) {
+			gtk_combo_box_set_active (GTK_COMBO_BOX (clock_type_chooser), CLOCK_AUTO);
+		}
+		else if (strcasecmp (ve_sure_string (user_24hr_clock), _("yes")) == 0) {
+			gtk_combo_box_set_active (GTK_COMBO_BOX (clock_type_chooser), CLOCK_AUTO);
+		}
+		else if (strcasecmp (ve_sure_string (user_24hr_clock), _("no")) == 0) {	
+			gtk_combo_box_set_active (GTK_COMBO_BOX (clock_type_chooser), CLOCK_NO);
+		}
+	}
+	
+	g_object_set_data_full (G_OBJECT (clock_type_chooser), "key",
+	                        g_strdup (GDM_KEY_USE_24_CLOCK), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (clock_type_chooser), "changed",
+	                  G_CALLBACK (combobox_changed), NULL);		
+
+	
+	/* Set up unsaved changes storage container */
+	GdmCommandChangesUnsaved = g_hash_table_new (g_str_hash, g_str_equal);
+
+	/* Set up Halt, Rebewt, Suspend and Custom command fields */
+	command_chooser = glade_helper_get (xml, 
+					    "cmd_type_combobox",
+					    GTK_TYPE_COMBO_BOX);
+	
+	/* Add halt, rebewt and suspend commands */
+	gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Halt command"));
+	gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Reboot command"));
+	gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), _("Suspend command"));
+
+	/* Add all the custom commands */
+	gint i;
+	for (i = 0; i < GDM_CUSTOM_COMMAND_MAX; i++) {
+		gchar *label = g_strdup_printf("Custom command %d", i);
+		gtk_combo_box_append_text (GTK_COMBO_BOX (command_chooser), label);
+		g_free (label);
+	}
+	
+	g_object_set_data_full (G_OBJECT (command_chooser), "key",
+	                        _("command_chooser_combobox"), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (command_chooser), "changed",
+	                  G_CALLBACK (combobox_changed), NULL);			
+
+	/* Lets setup handlers for all the entries 
+	   They will be assigned exactly the same key and handler
+	   as their only functionality would be to notify about changes */
+
+	hrs_cmd_path_entry = glade_helper_get (xml, 
+					       "hrs_cmd_path_entry",
+					       GTK_TYPE_ENTRY);	
+	g_object_set_data_full (G_OBJECT (hrs_cmd_path_entry), "key",
+	                        g_strdup ("hrs_custom_cmd"), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (hrs_cmd_path_entry), "changed",
+			  G_CALLBACK (greeter_command_entry_changed), NULL);
+		
+	custom_cmd_path_entry = glade_helper_get (xml, 
+						  "custom_cmd_path_entry",
+						  GTK_TYPE_ENTRY);	
+	g_object_set_data_full (G_OBJECT (custom_cmd_path_entry), "key",
+	                        g_strdup (GDM_KEY_CUSTOM_CMD_TEMPLATE), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (custom_cmd_path_entry), "changed",
+	                  G_CALLBACK (greeter_command_entry_changed), NULL);
+
+	custom_cmd_label_entry = glade_helper_get (xml, 
+						   "custom_cmd_label_entry",
+						   GTK_TYPE_ENTRY);	
+	g_object_set_data_full (G_OBJECT (custom_cmd_label_entry), "key",
+	                        g_strdup (GDM_KEY_CUSTOM_CMD_LABEL_TEMPLATE), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (custom_cmd_label_entry), "changed",
+	                  G_CALLBACK (greeter_command_entry_changed), NULL);
+
+	
+	custom_cmd_lrlabel_entry = glade_helper_get (xml, 
+						   "custom_cmd_lrlabel_entry",
+						   GTK_TYPE_ENTRY);	
+	g_object_set_data_full (G_OBJECT (custom_cmd_lrlabel_entry), "key",
+	                        g_strdup (GDM_KEY_CUSTOM_CMD_LR_LABEL_TEMPLATE), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (custom_cmd_lrlabel_entry), "changed",
+	                  G_CALLBACK (greeter_command_entry_changed), NULL);
+
+	custom_cmd_text_entry = glade_helper_get (xml, 
+						  "custom_cmd_text_entry",
+						  GTK_TYPE_ENTRY);	
+	g_object_set_data_full (G_OBJECT (custom_cmd_text_entry), "key",
+	                        g_strdup (GDM_KEY_CUSTOM_CMD_TEXT_TEMPLATE), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (custom_cmd_text_entry), "changed",
+	                  G_CALLBACK (greeter_command_entry_changed), NULL);
+
+	custom_cmd_tooltip_entry = glade_helper_get (xml, 
+						     "custom_cmd_tooltip_entry",
+						     GTK_TYPE_ENTRY);	
+	g_object_set_data_full (G_OBJECT (custom_cmd_tooltip_entry), "key",
+	                        g_strdup (GDM_KEY_CUSTOM_CMD_TOOLTIP_TEMPLATE), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (custom_cmd_tooltip_entry), "changed",
+	                  G_CALLBACK (greeter_command_entry_changed), NULL);
+
+	custom_cmd_persistent_checkbutton = glade_helper_get (xml, 
+							      "custom_cmd_persistent_checkbutton",
+							      GTK_TYPE_CHECK_BUTTON);	
+	g_object_set_data_full (G_OBJECT (custom_cmd_persistent_checkbutton), "key",
+	                        g_strdup (GDM_KEY_CUSTOM_CMD_IS_PERSISTENT_TEMPLATE), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (custom_cmd_persistent_checkbutton), "toggled",
+			  G_CALLBACK (toggle_toggled), custom_cmd_persistent_checkbutton);	
+	
+	custom_cmd_norestart_checkbutton = glade_helper_get (xml, 
+							     "custom_cmd_norestart_checkbutton",
+							     GTK_TYPE_CHECK_BUTTON);	
+	g_object_set_data_full (G_OBJECT (custom_cmd_norestart_checkbutton), "key",
+	                        g_strdup (GDM_KEY_CUSTOM_CMD_NO_RESTART_TEMPLATE), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (custom_cmd_norestart_checkbutton), "toggled",
+			  G_CALLBACK (toggle_toggled), custom_cmd_norestart_checkbutton);
+
+		
+	/* Set up append command buttons */
+	setup_general_command_buttons("hrs_command_add", "add_hrs_cmd_button");
+	setup_general_command_buttons("custom_command_add", "add_custom_cmd_button");
+	
+	/* set up apply command changes button */
+	apply_command_changes_button = glade_helper_get (xml, 
+							 "command_apply_button",
+							 GTK_TYPE_BUTTON);
+	g_object_set_data_full (G_OBJECT (apply_command_changes_button), "key",
+	                        g_strdup ("apply_command_changes"), (GDestroyNotify) g_free);
+	g_signal_connect (G_OBJECT (apply_command_changes_button), "clicked",
+			  G_CALLBACK (command_apply), apply_command_changes_button);
+	
+	gtk_widget_set_sensitive (apply_command_changes_button, FALSE);
+
+	/* Finally lets set our default choice */
+	gtk_combo_box_set_active (GTK_COMBO_BOX (command_chooser), HALT_CMD);       	
+}
+
+static void
 setup_local_tab (void)
 {
 	setup_local_plain_settings ();
@@ -6114,6 +7498,25 @@
 }
 
 static void
+hookup_remote_plain_behaviour (void)
+{
+	/* Setup qiver */
+	setup_notify_toggle ("remote_quiver_checkbox", GDM_KEY_QUIVER);
+	
+	/* Setup lock position */
+	setup_notify_toggle ("remote_lock_pos_checkbox", GDM_KEY_LOCK_POSITION);
+
+	/* Setup set position */
+	setup_notify_toggle ("remote_set_pos_checkbox", GDM_KEY_SET_POSITION);
+
+	/* Setup positionX */
+	setup_intspin ("remote_posx_spinbutton", GDM_KEY_POSITION_X);
+
+	/* Setup positionX */
+	setup_intspin ("remote_posy_spinbutton", GDM_KEY_POSITION_Y);	
+}
+
+static void
 hookup_remote_plain_logo (void)	
 {
 	/* Initialize and hookup callbacks for plain logo settings */
@@ -6398,6 +7801,10 @@
 	glade_helper_tagify_label (xml, "themes_label", "b");
 	glade_helper_tagify_label (xml, "sounds_label", "b");
 	glade_helper_tagify_label (xml, "local_background_label", "b");
+	glade_helper_tagify_label (xml, "local_behaviour_label", "b");	
+	glade_helper_tagify_label (xml, "commands_label", "b");
+	glade_helper_tagify_label (xml, "custom_cmd_note_label", "i");
+	glade_helper_tagify_label (xml, "custom_cmd_note_label", "small");
 	glade_helper_tagify_label (xml, "local_logo_label", "b");
 	glade_helper_tagify_label (xml, "local_menubar_label", "b");
 	glade_helper_tagify_label (xml, "local_welcome_message_label", "b");
@@ -6408,6 +7815,7 @@
 	glade_helper_tagify_label (xml, "gg_copyright_label", "b");
 	glade_helper_tagify_label (xml, "gg_copyright_label", "small");
 	glade_helper_tagify_label (xml, "remote_plain_background_label", "b");
+	glade_helper_tagify_label (xml, "remote_behaviour_label", "b");
 	glade_helper_tagify_label (xml, "remote_logo_label", "b");
 	glade_helper_tagify_label (xml, "remote_welcome_message_label", "b");
 	glade_helper_tagify_label (xml, "label_welcomeremote_note", "i");
@@ -6421,6 +7829,7 @@
 	glade_helper_tagify_label (xml, "fb_informationlabel", "small");
 	
 	/* Setup preference tabs */
+	setup_general_tab ();
 	setup_local_tab (); 
 	setup_remote_tab ();
  	setup_accessibility_tab (); 
@@ -6556,7 +7965,6 @@
 	if (GdmRandomFromSelectedChangesWarn == TRUE) {
 		
 		GtkWidget *prompt;
-		gint response;
 		
 		prompt = ve_hig_dialog_new (NULL,
 					    GTK_DIALOG_MODAL,
@@ -6705,13 +8113,26 @@
          */
 	GdmIconMaxHeight   = gdm_config_get_int (GDM_KEY_MAX_ICON_HEIGHT);
 	GdmIconMaxWidth    = gdm_config_get_int (GDM_KEY_MAX_ICON_WIDTH);
-	GdmMinimalUID      = gdm_config_get_int (GDM_KEY_MINIMAL_UID);
 	GdmIncludeAll      = gdm_config_get_bool (GDM_KEY_INCLUDE_ALL);
 	GdmInclude         = gdm_config_get_string (GDM_KEY_INCLUDE);
+	
+	/* We need to make sure that the users in the include list exist
+	   and have uid that are higher than MinimalUID. This protects us
+	   from invalid data obtained from the config file */
+	char **list;
+	gint GdmMinimalUID = gdm_config_get_int (GDM_KEY_MINIMAL_UID);
+	list = g_strsplit (GdmInclude, ",", 0);
+	int i;
+	for (i=0; list != NULL && list[i] != NULL; i++) {
+		if (gdm_is_user_valid (list[i]) && gdm_user_uid (list[i]) >= GdmMinimalUID)
+			continue;
+		
+		GdmInclude = strings_list_remove (GdmInclude, list[i], ",");
+	}
+	g_strfreev (list);
+
 	GdmExclude         = gdm_config_get_string (GDM_KEY_EXCLUDE);
 	GdmSoundProgram    = gdm_config_get_string (GDM_KEY_SOUND_PROGRAM);
-	GdmAllowRoot       = gdm_config_get_bool (GDM_KEY_ALLOW_ROOT);
-	GdmAllowRemoteRoot = gdm_config_get_bool (GDM_KEY_ALLOW_REMOTE_ROOT);
 
 	if (ve_string_empty (GdmSoundProgram) ||
             g_access (GdmSoundProgram, X_OK) != 0) {
@@ -6720,11 +8141,16 @@
 
         xservers = gdm_config_get_xservers (FALSE);
 
-	dialog = setup_gui ();
-
 	/* Done using socket */
 	gdmcomm_comm_bulk_stop ();
 
+	/* Once we corrected the include list we need to save it if
+	   it was modified */
+	if ( strcmp (ve_sure_string (gdm_config_get_string (GDM_KEY_INCLUDE)), ve_sure_string (GdmInclude)) != 0)
+		gdm_setup_config_set_string (GDM_KEY_INCLUDE, GdmInclude);
+	
+	dialog = setup_gui ();
+
 	g_signal_connect (G_OBJECT (dialog), "response",
 			  G_CALLBACK (apply_user_changes), dialog);
 	gtk_widget_show (dialog);
--- gdm2/gui/gdmuser.c.org	2006-12-04 19:45:35.000000000 +0000
+++ gdm2/gui/gdmuser.c	2006-12-04 19:46:14.000000000 +0000
@@ -289,6 +289,17 @@
     return (NULL != getpwnam (username));
 }
 
+gint
+gdm_user_uid (const char *username)
+{
+    struct passwd *pwent;
+    pwent = getpwnam (username);
+    if (pwent != NULL)
+	    return pwent->pw_uid;
+
+    return -1;
+}
+
 void 
 gdm_users_init (GList **users,
 		GList **users_string,
