Index: gok/gok-page-accessmethod.c
===================================================================
--- gok/gok-page-accessmethod.c	(revision 2506)
+++ gok/gok-page-accessmethod.c	(working copy)
@@ -57,8 +57,8 @@ static gboolean m_bUsChangingName;
 static GokFilledCombo* m_pGokFilledComboFirst;
 
 /**
-* gok-settings-page-accessmethod-initialize
-* @pWindowSettings: Pointer to the settings dialog window.
+* gok_page_accessmethod_initialize
+* @xml: Pointer to the Glade UI description of the settings dialog.
 *
 * Initializes this page of the gok settings dialog. This must be called
 * prior to any calls on this page.
@@ -549,19 +549,20 @@ void gok_page_accessmethod_update_contro
 * gok_page_accessmethod_draw_controls
 * @NameAccessMethod: Name of the access methods that needs the controls.
 * @pControlParent: Pointer to the GOK control that will contain the new controls.
-* @pContainter: Pointer to the container widget for the controls.
 * @pControl: Pointer to the GokControl that you want drawn.
+* @pSizeGroup: Pointer to the GtkSizeGroup the control belongs to.
 * @bShow: If TRUE then the controls will be show, if FALSE they will be hidden.
 * 
 * Draws the controls for the GokControl.
 **/
-void gok_page_accessmethod_draw_controls (gchar* NameAccessMethod, GokControl* pControlParent, GokControl* pControl, gboolean bShow)
+void gok_page_accessmethod_draw_controls (gchar* NameAccessMethod, GokControl* pControlParent, GokControl* pControl, GtkSizeGroup* pSizeGroup, gboolean bShow)
 {
 	GtkWidget* pWidget;
 	GtkWidget* pEntry;
 	static GSList* ListRadioButtons;
 	GtkObject* spinRateAdjustment;
 	gchar* pControlName;
+	gchar* pFrameHeader;
 	int settingInt;
 	gchar* settingString;
 	GokFilledCombo* pFilledComboNew;
@@ -579,15 +580,21 @@ void gok_page_accessmethod_draw_controls
 			}
 			else /* create the control */
 			{
+				/* create a new size group */
+				if (pSizeGroup == NULL)
+					pSizeGroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+
 				switch (pControl->Type)
 				{
 					case CONTROL_TYPE_LABEL:
 						pWidget = gtk_label_new (_(pControl->String));
+						g_object_set (pWidget, "xalign", 0., NULL);
 						gtk_widget_ref (pWidget);
 						gtk_object_set_data_full (GTK_OBJECT (gok_settingsdialog_get_window()), "GOKlabel", pWidget,
 						                            (GtkDestroyNotify) gtk_widget_unref);
 						gtk_widget_show (pWidget);
 						gtk_box_pack_start (GTK_BOX (pControlParent->pWidget), pWidget, FALSE, FALSE, 0);
+						gtk_size_group_add_widget (pSizeGroup, pWidget);
 						break;
 						
 					case CONTROL_TYPE_HBOX:
@@ -595,6 +602,7 @@ void gok_page_accessmethod_draw_controls
 						gtk_widget_ref (pWidget);
 						gtk_object_set_data_full (GTK_OBJECT (gok_settingsdialog_get_window()), "GOKhbox", pWidget,
 						                            (GtkDestroyNotify) gtk_widget_unref);
+						gtk_container_set_border_width (GTK_CONTAINER (pWidget), pControl->Border);
 						gtk_widget_show (pWidget);
 						
 						if (pControlParent->Type == CONTROL_TYPE_FRAME)
@@ -604,7 +612,6 @@ void gok_page_accessmethod_draw_controls
 						else
 						{
 							gtk_box_pack_start (GTK_BOX (pControlParent->pWidget), pWidget, TRUE, TRUE, 0);
-							gtk_container_set_border_width (GTK_CONTAINER (pControlParent->pWidget), pControl->Border);
 						}
 						break;
 						
@@ -613,6 +620,7 @@ void gok_page_accessmethod_draw_controls
 						gtk_widget_ref (pWidget);
 						gtk_object_set_data_full (GTK_OBJECT (gok_settingsdialog_get_window()), "GOKvbox", pWidget,
 						                            (GtkDestroyNotify) gtk_widget_unref);
+						gtk_container_set_border_width (GTK_CONTAINER (pWidget), pControl->Border);
 						gtk_widget_show (pWidget);
 						
 						if (pControlParent->Type == CONTROL_TYPE_FRAME)
@@ -622,7 +630,6 @@ void gok_page_accessmethod_draw_controls
 						else
 						{
 							gtk_box_pack_start (GTK_BOX (pControlParent->pWidget), pWidget, TRUE, TRUE, 0);
-							gtk_container_set_border_width (GTK_CONTAINER (pControlParent->pWidget), pControl->Border);
 						}
 						break;
 						
@@ -678,10 +685,14 @@ void gok_page_accessmethod_draw_controls
 						break;
 						
 					case CONTROL_TYPE_FRAME:
-						pWidget = gtk_frame_new (_(pControl->String));
+						pFrameHeader = g_markup_printf_escaped ("<b>%s</b>", _(pControl->String));
+						pWidget = gtk_frame_new (pFrameHeader);
+						g_free (pFrameHeader);
 						gtk_widget_ref (pWidget);
 						gtk_object_set_data_full (GTK_OBJECT (gok_settingsdialog_get_window()), "GOKframe", pWidget,
 						                            (GtkDestroyNotify) gtk_widget_unref);
+						gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (pWidget))), TRUE);
+						gtk_frame_set_shadow_type (GTK_FRAME (pWidget), GTK_SHADOW_NONE);
 						gtk_widget_show (pWidget);
 						gtk_box_pack_start (GTK_BOX (pControlParent->pWidget), pWidget, FALSE, FALSE, 0);
 						break;
@@ -788,7 +799,7 @@ void gok_page_accessmethod_draw_controls
 		/* create any child controls */
 		if (pControl->pControlChild != NULL)
 		{
-			gok_page_accessmethod_draw_controls (NameAccessMethod, pControl, pControl->pControlChild, bShow);
+			gok_page_accessmethod_draw_controls (NameAccessMethod, pControl, pControl->pControlChild, pSizeGroup, bShow);
 		}
 
 		pControl = pControl->pControlNext;
@@ -907,9 +918,9 @@ void gok_page_accessmethod_change_contro
 			/* hide the controls from the previous access method */
 			if (m_pAccessMethod != NULL)
 			{
-				gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, m_pAccessMethod->pControlOperation, FALSE);
-				gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, m_pAccessMethod->pControlFeedback, FALSE);
-				gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, m_pAccessMethod->pControlOptions, FALSE);
+				gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, m_pAccessMethod->pControlOperation, NULL, FALSE);
+				gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, m_pAccessMethod->pControlFeedback, NULL, FALSE);
+				gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, m_pAccessMethod->pControlOptions, NULL, FALSE);
 			}
 
 			/* store the new access method */
@@ -930,9 +941,9 @@ void gok_page_accessmethod_change_contro
 			gtk_label_set_text (GTK_LABEL (pLabelDescription), pAccessMethod->Description);
 				
 			/* display the controls for the selected access method */
-			gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, pAccessMethod->pControlOperation, TRUE);
-			gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, pAccessMethod->pControlFeedback, TRUE);
-			gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, pAccessMethod->pControlOptions, TRUE);
+			gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, pAccessMethod->pControlOperation, NULL, TRUE);
+			gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, pAccessMethod->pControlFeedback, NULL, TRUE);
+			gok_page_accessmethod_draw_controls (pNameAccessMethod, &ControlParent, pAccessMethod->pControlOptions, NULL, TRUE);
 
 			gok_page_accessmethod_update_associated (pAccessMethod);
 			return;
Index: automatic-scanning.xml.in
===================================================================
--- automatic-scanning.xml.in	(revision 2506)
+++ automatic-scanning.xml.in	(working copy)
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-
 <GOK:accessmethodroot xmlns:GOK="http://www.gnome.org/GOK">
 
 <!-- User interface for the access method -->
@@ -7,64 +6,48 @@
 <_GOK:description xml:space="preserve">Press a switch to start scanning.  Press another switch or the same switch again to select.</_GOK:description>
 
 <GOK:operation>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Operation">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Start scanning:" />
-				<GOK:control name="movehighlighter" _string="Start Scanning" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Activate:" />
-				<GOK:control name="select" type="combobox" _string="Activate" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Operation">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Start scanning:" />
+			<GOK:control name="movehighlighter" _string="Start Scanning" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activate:" />
+			<GOK:control name="select" type="combobox" _string="Activate" fillwith="actions" qualifier="switch+mousebutton" />
 		</GOK:control>
 	</GOK:control>	
 </GOK:control>	
 </GOK:operation>
 
 <GOK:feedback>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Feedback">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Movement:" />
-				<GOK:control _name="feedbackmovement" _string="Feedback Movement" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-	
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Activation:" />
-				<GOK:control _name="feedbackselection" _string="Feedback Activation" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Feedback">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Movement:" />
+			<GOK:control _name="feedbackmovement" _string="Feedback Movement" type="combobox" fillwith="feedbacks" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activation:" />
+			<GOK:control _name="feedbackselection" _string="Feedback Activation" type="combobox" fillwith="feedbacks" />
 		</GOK:control>
 	</GOK:control>
 </GOK:control>
 </GOK:feedback>
 
 <GOK:options>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Options">
-
-	<GOK:control type="vbox" size="2" border="0" spacing="5">
-
-		<GOK:control type="hbox" size="1" border="0" spacing="5">
+<GOK:control type="frame" _string="Options">
+	<GOK:control type="vbox" border="12" spacing="8">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Scan Delay:" />
 			<GOK:control name="scanspeed" type="spinbutton" _string="Scan Speed:" value="100" min="10" max="500" stepincrement="1" pageincrement="10" pagesize="10" />
 		</GOK:control>
 
-		<GOK:control type="hbox" size="1" border="0" spacing="5">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Initial Delay:" />
 			<GOK:control name="initialdelay" type="spinbutton" _string="Initial Delay:" value="0" min="0" max="500" stepincrement="1" pageincrement="10" pagesize="10" />
 		</GOK:control>
-
-		<GOK:control type="hbox" size="2" border="5" spacing="20">
-			<GOK:control name="wrap" type="checkbutton" _string="Wrap Rows/Columns" />
-		</GOK:control>
-	
+		<GOK:control name="wrap" type="checkbutton" _string="Wrap Rows/Columns" />	
 <!--		<GOK:control type="hbox" size="2" border="5" spacing="20">
 			<GOK:control name="autorepeat" type="checkbutton" _string="Auto Repeat On" associated="repeatrate+repeatratelabel+repeatratesuffix" associatedstate="1" />
 			<GOK:control type="hbox" size="2" border="0" spacing="5">
@@ -73,20 +56,18 @@
 				<GOK:control name="repeatratesuffix" type="label" _string="(100s of a second)" />
 			</GOK:control>
 		</GOK:control> -->
-
-		<GOK:control type="hbox" size="3" border="5" spacing="20">
+		<GOK:control type="hbox" spacing="20">
 			<GOK:control type="label" _string="Scanning Direction:" />
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
+			<GOK:control type="hbox" spacing="4">
 				<GOK:control name="topbottom" type="radiobutton" _string="Top/Bottom" value="0" groupstart="yes"/>
 				<GOK:control name="topbottom" type="radiobutton" _string="Bottom/Top" value="1" />
 			</GOK:control>
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
+			<GOK:control type="hbox" spacing="4">
 				<GOK:control name="leftright" type="radiobutton" _string="Left/Right" value="0" groupstart="yes"/>
 				<GOK:control name="leftright" type="radiobutton" _string="Right/Left" value="1" />
 			</GOK:control>
 		</GOK:control>
-
-		<GOK:control type="hbox" size="2" border="5" spacing="10">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control name="cyclenumber" type="label" _string="Cycles Before Stopping:" />
 			<GOK:control name="cycles" type="spinbutton" _string="Cycles Before Stopping:" value="3" min="1" max="10" stepincrement="1" pageincrement="3" pagesize="3" />
 <!--			<GOK:control name="continuouscycle" type="checkbutton" _string="Continuous Cycle On" associated="cycles+cyclenumber" associatedstate="0"/> -->
Index: directed.xml.in
===================================================================
--- directed.xml.in	(revision 2506)
+++ directed.xml.in	(working copy)
@@ -1,78 +1,61 @@
 <?xml version="1.0"?>
-
 <GOK:accessmethodroot xmlns:GOK="http://www.gnome.org/GOK">
 
-
 <!-- User interface for the access method -->
-
 <GOK:accessmethod name="directed" _displayname="5 Switch Directed">
-<GOK:description xml:space="preserve">Move the highlighter in 4 directions.  Select key.</GOK:description>
+<_GOK:description xml:space="preserve">Move the highlighter in 4 directions.  Select key.</_GOK:description>
 
 <GOK:operation>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Operation">
-	<GOK:control type="vbox" size="8" spacing="5" border="0">
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Up:" />
-				<GOK:control name="moveup" _string="Up:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Down:" />
-				<GOK:control name="movedown" _string="Down:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Left:" />
-				<GOK:control name="moveleft" _string="Left:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Right:" />
-				<GOK:control name="moveright" _string="Right:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-				
-		<GOK:control type="hbox" size="2" spacing="5" border="0">
+<GOK:control type="frame" _string="Operation">
+	<GOK:control type="vbox" spacing="4" border="12">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Up:" />
+			<GOK:control name="moveup" _string="Up:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Down:" />
+			<GOK:control name="movedown" _string="Down:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Left:" />
+			<GOK:control name="moveleft" _string="Left:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Right:" />
+			<GOK:control name="moveright" _string="Right:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Activate:" />
 			<GOK:control name="select" type="combobox" _string="Select:" fillwith="actions" qualifier="switch+mousebutton" />
 		</GOK:control>
-
-	</GOK:control>	
-</GOK:control>	
+	</GOK:control>
+</GOK:control>
 </GOK:operation>
 
 <GOK:feedback>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Feedback">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Movement:" />
-				<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-	
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Activation:" />
-				<GOK:control name="feedbackselection" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Feedback">
+	<GOK:control type="vbox" spacing="4" border="12">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Movement:" />
+			<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activation:" />
+			<GOK:control name="feedbackselection" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
 		</GOK:control>
 	</GOK:control>
 </GOK:control>
 </GOK:feedback>
 
 <GOK:options>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Options">
-	<GOK:control type="vbox" size="2" border="5" spacing="5">
-	
-		<GOK:control type="hbox" size="3" border="0" spacing="5">
+<GOK:control type="frame" _string="Options">
+	<GOK:control type="vbox" spacing="4" border="12">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Scan Delay:" />
 			<GOK:control name="scanspeed" type="spinbutton" _string="Scan Speed:" value="100" min="10" max="500" stepincrement="1" pageincrement="10" pagesize="10" />
 			<GOK:control type="label" _string="(100s of a second)" />
 		</GOK:control>
-
-		<GOK:control type="hbox" size="2" border="5" spacing="20">
-			<GOK:control name="wrap" type="checkbutton" _string="Wrap Rows/Columns" />
-		</GOK:control>
-
-
+		<GOK:control name="wrap" type="checkbutton" _string="Wrap Rows/Columns" />
 	</GOK:control>
 </GOK:control>
 </GOK:options>
Index: direct-selection.xml.in
===================================================================
--- direct-selection.xml.in	(revision 2506)
+++ direct-selection.xml.in	(working copy)
@@ -1,48 +1,35 @@
 <?xml version="1.0"?>
-
-
 <GOK:accessmethodroot xmlns:GOK="http://www.gnome.org/GOK">
 
 <!-- User interface for the access method -->
-
 <GOK:accessmethod name="directselection" _displayname="Direct Selection">
 <_GOK:description xml:space="preserve">Move the mouse pointer to highlight a key.  Press a switch to select.</_GOK:description>
 
 <GOK:operation>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Operation">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Select:" />
-				<GOK:control name="keyenter+keyleave" type="combobox" _string="Select:" fillwith="actions" qualifier="mousepointer" />
-			</GOK:control>
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Activate:" />
-				<GOK:control name="outputselected" type="combobox" _string="Activate:" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Operation">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Select:" />
+			<GOK:control name="keyenter+keyleave" type="combobox" _string="Select:" fillwith="actions" qualifier="mousepointer" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activate:" />
+			<GOK:control name="outputselected" type="combobox" _string="Activate:" fillwith="actions" qualifier="switch+mousebutton" />
 		</GOK:control>
 	</GOK:control>	
 </GOK:control>	
 </GOK:operation>
 
 <GOK:feedback>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Feedback">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Movement:" />
-				<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-	
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Activation:" />
-				<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Feedback">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Movement:" />
+			<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activation:" />
+			<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
 		</GOK:control>
 	</GOK:control>
 </GOK:control>
Index: dwell-selection.xml.in
===================================================================
--- dwell-selection.xml.in	(revision 2506)
+++ dwell-selection.xml.in	(working copy)
@@ -1,47 +1,35 @@
 <?xml version="1.0"?>
-
 <GOK:accessmethodroot xmlns:GOK="http://www.gnome.org/GOK">
 
 <!-- User interface for the access method -->
-
 <GOK:accessmethod name="dwellselection" _displayname="Dwell Selection">
 <_GOK:description xml:space="preserve">Move the mouse pointer to highlight a key.  Dwell on the key to select.</_GOK:description>
 
 <GOK:operation>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Operation">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Select:" />
-				<GOK:control name="keyenter+keyleave" _string="Select:" type="combobox" fillwith="actions" qualifier="mousepointer" />
-			</GOK:control>
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Activate:" />
-				<GOK:control name="outputselected" _string="Activate:" type="combobox" fillwith="actions" qualifier="dwell" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Operation">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Select:" />
+			<GOK:control name="keyenter+keyleave" _string="Select:" type="combobox" fillwith="actions" qualifier="mousepointer" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activate:" />
+			<GOK:control name="outputselected" _string="Activate:" type="combobox" fillwith="actions" qualifier="dwell" />
 		</GOK:control>
 	</GOK:control>	
 </GOK:control>	
 </GOK:operation>
 
 <GOK:feedback>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Feedback">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Movement:" />
-				<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-	
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Activation:" />
-				<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Feedback">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Movement:" />
+			<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activation:" />
+			<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
 		</GOK:control>
 	</GOK:control>
 </GOK:control>
Index: inverse-scanning.xml.in
===================================================================
--- inverse-scanning.xml.in	(revision 2506)
+++ inverse-scanning.xml.in	(working copy)
@@ -1,67 +1,50 @@
 <?xml version="1.0"?>
-
 <GOK:accessmethodroot xmlns:GOK="http://www.gnome.org/GOK">
 
 <!-- User interface for the access method -->
-
 <GOK:accessmethod name="inversescanning" _displayname="Inverse Scanning">
 <_GOK:description xml:space="preserve">Press and hold a switch to scan.  Press another switch to select.</_GOK:description>
 
 <GOK:operation>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Operation">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Scan:" />
-				<GOK:control name="movehighlighter" _string="Scan:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-				
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Activate:" />
-				<GOK:control name="select" _string="Activate:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Operation">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Scan:" />
+			<GOK:control name="movehighlighter" _string="Scan:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
+		</GOK:control>	
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activate:" />
+			<GOK:control name="select" _string="Activate:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
 		</GOK:control>
 	</GOK:control>	
 </GOK:control>	
 </GOK:operation>
 
 <GOK:feedback>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Feedback">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Movement:" />
-				<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-	
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Activation:" />
-				<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Feedback">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Movement:" />
+			<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activation:" />
+			<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
 		</GOK:control>
 	</GOK:control>
 </GOK:control>
 </GOK:feedback>
 
 <GOK:options>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Options">
-
-	<GOK:control type="vbox" size="2" border="0" spacing="5">
-
-		<GOK:control type="hbox" size="3" border="0" spacing="5">
+<GOK:control type="frame" _string="Options">
+	<GOK:control type="vbox" border="12" spacing="8">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Scan Delay:" />
 			<GOK:control name="scanspeed" type="spinbutton" _string="Scan Speed:" value="100" min="10" max="500" stepincrement="1" pageincrement="10" pagesize="10" />
 			<GOK:control type="label" _string="(100s of a second)" />
 		</GOK:control>
+		<GOK:control name="wrap" type="checkbutton" _string="Wrap Rows/Columns" />
 
-		<GOK:control type="hbox" size="2" border="5" spacing="20">
-			<GOK:control name="wrap" type="checkbutton" _string="Wrap Rows/Columns" />
-		</GOK:control>
-	
 <!--		<GOK:control type="hbox" size="2" border="5" spacing="20">
 			<GOK:control name="autorepeat" type="checkbutton" _string="Auto Repeat On" />
 			<GOK:control type="hbox" size="3" border="0" spacing="5">
@@ -71,24 +54,23 @@
 			</GOK:control>
 		</GOK:control> -->
 
-		<GOK:control type="hbox" size="3" border="5" spacing="20">
+		<GOK:control type="hbox" spacing="20">
 			<GOK:control type="label" string="Scanning Direction:" />
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
+			<GOK:control type="hbox" spacing="4">
 				<GOK:control name="topbottom" type="radiobutton" _string="Top/Bottom" value="0" groupstart="yes"/>
 				<GOK:control name="topbottom" type="radiobutton" _string="Bottom/Top" value="1" />
 			</GOK:control>
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
+			<GOK:control type="hbox" spacing="4">
 				<GOK:control name="leftright" type="radiobutton" _string="Left/Right" value="0" groupstart="yes"/>
 				<GOK:control name="leftright" type="radiobutton" _string="Right/Left" value="1" />
 			</GOK:control>
 		</GOK:control>
 
-		<GOK:control type="hbox" size="3" border="5" spacing="10">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Cycles Before Stopping:" />
 			<GOK:control name="cycles" type="spinbutton" _string="Cycles Before Stopping:" value="3" min="1" max="10" stepincrement="1" pageincrement="3" pagesize="3" />
 <!--			<GOK:control name="continuouscycle" type="checkbutton" _string="Continuous Cycle On" /> -->
 		</GOK:control>
-	
 	</GOK:control>
 </GOK:control>
 </GOK:options>
Index: singlekey-automatic-scanning.xml.in
===================================================================
--- singlekey-automatic-scanning.xml.in	(revision 2506)
+++ singlekey-automatic-scanning.xml.in	(working copy)
@@ -7,77 +7,59 @@
 <_GOK:description xml:space="preserve">Press a switch to start scanning.  Press another switch or the same switch again to select.</_GOK:description>
 
 <GOK:operation>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Operation">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Start scanning:" />
-				<GOK:control name="movehighlighter" _string="Start Scanning:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Activate:" />
-				<GOK:control name="select" _string="Activate:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Operation">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Start scanning:" />
+			<GOK:control name="movehighlighter" _string="Start Scanning:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activate:" />
+			<GOK:control name="select" _string="Activate:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
 		</GOK:control>
 	</GOK:control>	
 </GOK:control>	
 </GOK:operation>
 
 <GOK:feedback>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Feedback">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Movement:" />
-				<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-	
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Activation:" />
-				<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Feedback">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Movement:" />
+			<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activation:" />
+			<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
 		</GOK:control>
 	</GOK:control>
 </GOK:control>
 </GOK:feedback>
 
 <GOK:options>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Options">
-
-	<GOK:control type="vbox" size="2" border="0" spacing="5">
-
-		<GOK:control type="hbox" size="1" border="0" spacing="5">
+<GOK:control type="frame" _string="Options">
+	<GOK:control type="vbox" border="12" spacing="8">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Scan Delay:" />
 			<GOK:control name="scanspeed" type="spinbutton" _string="Scan Speed:" value="100" min="10" max="500" stepincrement="1" pageincrement="10" pagesize="10" />
 		</GOK:control>
-
-		<GOK:control type="hbox" size="1" border="0" spacing="5">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Initial Delay:" />
 			<GOK:control name="initialdelay" type="spinbutton" _string="Initial Delay:" value="0" min="0" max="500" stepincrement="1" pageincrement="10" pagesize="10" />
 		</GOK:control>
-
-		<GOK:control type="hbox" size="2" border="5" spacing="20">
-			<GOK:control name="wrap" type="checkbutton" _string="Wrap" />
-		</GOK:control>
-	
-		<GOK:control type="hbox" size="3" border="5" spacing="20">
+		<GOK:control name="wrap" type="checkbutton" _string="Wrap Row/Columns" />
+		<GOK:control type="hbox" spacing="20">
 			<GOK:control type="label" _string="Scanning Direction:" />
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
+			<GOK:control type="hbox" spacing="4">
 				<GOK:control name="topbottom" type="radiobutton" _string="Top/Bottom" value="0" groupstart="yes"/>
 				<GOK:control name="topbottom" type="radiobutton" _string="Bottom/Top" value="1" />
 			</GOK:control>
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
+			<GOK:control type="hbox" spacing="4">
 				<GOK:control name="leftright" type="radiobutton" _string="Left/Right" value="0" groupstart="yes"/>
 				<GOK:control name="leftright" type="radiobutton" _string="Right/Left" value="1" />
 			</GOK:control>
 		</GOK:control>
-
-		<GOK:control type="hbox" size="2" border="5" spacing="10">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control name="cyclenumber" type="label" _string="Cycles Before Stopping:" />
 			<GOK:control name="cycles" type="spinbutton" _string="Cycles Before Stopping:" value="3" min="1" max="10" stepincrement="1" pageincrement="3" pagesize="3" />
 		</GOK:control>
@@ -86,7 +68,6 @@
 			<GOK:control name="autostart" type="radiobutton" _string="Autostart (starts automatically)" value="0" groupstart="yes"/>
 			<GOK:control name="autostart" type="radiobutton" _string="Press switch to start" value="1" />
 		</GOK:control>  -->
-	
 	</GOK:control>
 </GOK:control>
 </GOK:options>
Index: singlekey-inverse-scanning.xml.in
===================================================================
--- singlekey-inverse-scanning.xml.in	(revision 2506)
+++ singlekey-inverse-scanning.xml.in	(working copy)
@@ -1,84 +1,64 @@
 <?xml version="1.0"?>
-
 <GOK:accessmethodroot xmlns:GOK="http://www.gnome.org/GOK">
 
 <!-- User interface for the access method -->
-
 <GOK:accessmethod name="keyinversescanning" _displayname="Single Key Inverse Scanning">
 <_GOK:description xml:space="preserve">Press and hold a switch to scan.  Press another switch to select.</_GOK:description>
 
 <GOK:operation>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Operation">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Scan:" />
-				<GOK:control name="movehighlighter" _string="Scan:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-				
-			<GOK:control type="hbox" size="2" spacing="5" border="0">
-				<GOK:control type="label" _string="Activate:" />
-				<GOK:control name="select" _string="Activate:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Operation">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Scan:" />
+			<GOK:control name="movehighlighter" _string="Scan:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
+		</GOK:control>	
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activate:" />
+			<GOK:control name="select" _string="Activate:" type="combobox" fillwith="actions" qualifier="switch+mousebutton" />
 		</GOK:control>
 	</GOK:control>	
 </GOK:control>	
 </GOK:operation>
 
 <GOK:feedback>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Feedback">
-	<GOK:control type="hbox" size="1" spacing="0" border="0">
-		<GOK:control type="vbox" size="3" border="5" spacing="10">
-
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Movement:" />
-				<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-	
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
-				<GOK:control type="label" _string="Activation:" />
-				<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
-			</GOK:control>
-
+<GOK:control type="frame" _string="Feedback">
+	<GOK:control type="vbox" border="12" spacing="4">
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Movement:" />
+			<GOK:control name="feedbackmovement" _string="Feedback Movement:" type="combobox" fillwith="feedbacks" />
+		</GOK:control>
+		<GOK:control type="hbox" spacing="12">
+			<GOK:control type="label" _string="Activation:" />
+			<GOK:control name="feedbackselection" _string="Feedback Activation:" type="combobox" fillwith="feedbacks" />
 		</GOK:control>
 	</GOK:control>
 </GOK:control>
 </GOK:feedback>
 
 <GOK:options>
-<GOK:control type="frame" size="3" spacing="0" border="0" _string="Options">
-
-	<GOK:control type="vbox" size="2" border="0" spacing="5">
-
-		<GOK:control type="hbox" size="3" border="0" spacing="5">
+<GOK:control type="frame" _string="Options">
+	<GOK:control type="vbox" border="12" spacing="8">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Scan Delay:" />
 			<GOK:control name="scanspeed" type="spinbutton" _string="Scan Speed:" value="100" min="10" max="500" stepincrement="1" pageincrement="10" pagesize="10" />
 			<GOK:control type="label" _string="(100s of a second)" />
 		</GOK:control>
-
-		<GOK:control type="hbox" size="2" border="5" spacing="20">
-			<GOK:control name="wrap" type="checkbutton" _string="Wrap Rows/Columns" />
-		</GOK:control>
-	
-		<GOK:control type="hbox" size="3" border="5" spacing="20">
+		<GOK:control name="wrap" type="checkbutton" _string="Wrap Rows/Columns" />
+		<GOK:control type="hbox" spacing="20">
 			<GOK:control type="label" _string="Scanning Direction:" />
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
+			<GOK:control type="hbox" spacing="4">
 				<GOK:control name="topbottom" type="radiobutton" _string="Top/Bottom" value="0" groupstart="yes"/>
 				<GOK:control name="topbottom" type="radiobutton" _string="Bottom/Top" value="1" />
 			</GOK:control>
-			<GOK:control type="hbox" size="2" border="0" spacing="5">
+			<GOK:control type="hbox" spacing="4">
 				<GOK:control name="leftright" type="radiobutton" _string="Left/Right" value="0" groupstart="yes"/>
 				<GOK:control name="leftright" type="radiobutton" _string="Right/Left" value="1" />
 			</GOK:control>
 		</GOK:control>
-
-		<GOK:control type="hbox" size="3" border="5" spacing="10">
+		<GOK:control type="hbox" spacing="12">
 			<GOK:control type="label" _string="Cycles Before Stopping:" />
 			<GOK:control name="cycles" type="spinbutton" _string="Cycles Before Stopping:" value="3" min="1" max="10" stepincrement="1" pageincrement="3" pagesize="3" />
 		</GOK:control>
-	
 	</GOK:control>
 </GOK:control>
 </GOK:options>
Index: gok.glade2
===================================================================
--- gok.glade2	(revision 2506)
+++ gok.glade2	(working copy)
@@ -11,6 +11,13 @@
   <property name="modal">False</property>
   <property name="resizable">False</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <signal name="delete_event" handler="on_dialogSettings_delete_event" last_modification_time="Tue, 15 Oct 2002 16:14:17 GMT"/>
 
   <child>
@@ -122,6 +129,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">spinKeyHeight</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>
 			  <accessibility>
 			    <atkrelation target="spinKeyHeight" type="label-for"/>
 			  </accessibility>
@@ -150,6 +161,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">spinKeyWidth</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>
 			  <accessibility>
 			    <atkrelation target="spinKeyWidth" type="label-for"/>
 			  </accessibility>
@@ -177,6 +192,10 @@
 			  <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>
@@ -201,6 +220,10 @@
 			  <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>
@@ -226,6 +249,10 @@
 			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="mnemonic_widget">spinKeySpacing</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">4</property>
@@ -250,6 +277,10 @@
 			  <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">6</property>
@@ -300,6 +331,10 @@
 		      <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">label_item</property>
@@ -317,7 +352,7 @@
 		<widget class="GtkFrame" id="frame2">
 		  <property name="border_width">4</property>
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0.03</property>
+		  <property name="label_xalign">0.0</property>
 		  <property name="label_yalign">0.5</property>
 		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
@@ -326,7 +361,6 @@
 		      <property name="width_request">2</property>
 		      <property name="height_request">140</property>
 		      <property name="visible">True</property>
-
 		    </widget>
 		  </child>
 
@@ -343,6 +377,10 @@
 		      <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">label_item</property>
@@ -384,6 +422,7 @@
 			      <property name="label" translatable="yes">Dock</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>
@@ -403,6 +442,7 @@
 			      <property name="label" translatable="yes">Fill Width</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>
@@ -436,6 +476,7 @@
 			      <property name="label" translatable="yes">Dock Top</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>
@@ -455,6 +496,7 @@
 			      <property name="label" translatable="yes">Dock Bottom</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>
@@ -490,6 +532,10 @@
 		      <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">label_item</property>
@@ -507,7 +553,7 @@
 		<widget class="GtkFrame" id="frame3">
 		  <property name="border_width">6</property>
 		  <property name="visible">True</property>
-		  <property name="label_xalign">0.02</property>
+		  <property name="label_xalign">0.019999999553</property>
 		  <property name="label_yalign">0.5</property>
 		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
@@ -526,10 +572,11 @@
 			  <property name="label" translatable="yes">_Use Desktop Theme Preferences</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>
-			  <signal name="toggled" handler="on_use_gtk_theme_checkbutton_toggled" />
+			  <signal name="toggled" handler="on_use_gtk_theme_checkbutton_toggled"/>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -551,6 +598,10 @@
 			  <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>
@@ -574,6 +625,10 @@
 		      <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">label_item</property>
@@ -606,6 +661,10 @@
 	      <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>
@@ -641,6 +700,7 @@
 			  <property name="label" translatable="yes">Match physical keyboard as reported by 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="active">False</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
@@ -660,6 +720,7 @@
 			  <property name="label" translatable="yes">Alphanumeric keyboard sorted alphabetically</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>
@@ -680,6 +741,7 @@
 			  <property name="label" translatable="yes">Alphanumeric keyboard arranged by letter frequency</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>
@@ -700,6 +762,7 @@
 			  <property name="label" translatable="yes">Read keyboard from file:</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>
@@ -729,6 +792,8 @@
 			      <property name="max_saved">10</property>
 			      <property name="directory_entry">False</property>
 			      <property name="modal">False</property>
+			      <property name="use_filechooser">False</property>
+			      <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
 
 			      <child internal-child="entry">
 				<widget class="GtkEntry" id="XMLKeyboardFileEntry">
@@ -739,7 +804,7 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				  <signal name="changed" handler="on_compose_keyboard_file_entry_changed" last_modification_time="Thu, 22 Apr 2004 21:07:30 GMT"/>
 				</widget>
@@ -774,6 +839,10 @@
 		      <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">label_item</property>
@@ -814,6 +883,10 @@
 			  <property name="yalign">0.5</property>
 			  <property name="xpad">12</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>
@@ -831,6 +904,8 @@
 			  <property name="browse_dialog_title" translatable="yes">Additional directory to search for GOK keyboard files</property>
 			  <property name="directory_entry">True</property>
 			  <property name="modal">False</property>
+			  <property name="use_filechooser">False</property>
+			  <property name="filechooser_action">GTK_FILE_CHOOSER_ACTION_OPEN</property>
 
 			  <child internal-child="entry">
 			    <widget class="GtkEntry" id="AuxKeyboardEntry">
@@ -841,7 +916,7 @@
 			      <property name="max_length">0</property>
 			      <property name="text" translatable="yes"></property>
 			      <property name="has_frame">True</property>
-			      <property name="invisible_char" translatable="yes">*</property>
+			      <property name="invisible_char">*</property>
 			      <property name="activates_default">False</property>
 			      <signal name="changed" handler="on_aux_keyboard_dir_entry_changed" last_modification_time="Fri, 23 Apr 2004 17:43:34 GMT"/>
 			    </widget>
@@ -869,6 +944,10 @@
 		      <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">label_item</property>
@@ -901,6 +980,10 @@
 	      <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>
@@ -948,6 +1031,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">entryActionName</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>
 			      <accessibility>
 				<atkrelation target="comboActionNames" type="label-for"/>
 			      </accessibility>
@@ -981,7 +1068,7 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				  <signal name="changed" handler="on_entryActionName_changed" last_modification_time="Sat, 20 Mar 2004 03:55:50 GMT"/>
 				</widget>
@@ -1020,6 +1107,7 @@
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <signal name="clicked" handler="on_buttonNewAction_clicked" last_modification_time="Mon, 12 May 2003 22:52:11 GMT"/>
 
 			      <child>
@@ -1029,6 +1117,10 @@
 				  <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="hbox83">
@@ -1066,6 +1158,10 @@
 					  <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>
@@ -1086,6 +1182,7 @@
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <signal name="clicked" handler="on_buttonDeleteAction_clicked" last_modification_time="Mon, 12 May 2003 22:52:21 GMT"/>
 
 			      <child>
@@ -1095,6 +1192,10 @@
 				  <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="hbox84">
@@ -1132,6 +1233,10 @@
 					  <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>
@@ -1152,6 +1257,7 @@
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <signal name="clicked" handler="on_buttonChangeName_clicked" last_modification_time="Mon, 12 May 2003 22:35:21 GMT"/>
 
 			      <child>
@@ -1161,6 +1267,10 @@
 				  <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="hbox85">
@@ -1198,6 +1308,10 @@
 					  <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>
@@ -1234,6 +1348,10 @@
 		      <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">label_item</property>
@@ -1278,6 +1396,10 @@
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">12</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>
 		      <accessibility>
 			<atkrelation target="radiobuttonTypeSwitch" type="label-for"/>
 			<atkrelation target="radiobuttonTypeValuator" type="label-for"/>
@@ -1303,6 +1425,7 @@
 			  <property name="label" translatable="yes">S_witch</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
 			  <property name="active">True</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
@@ -1325,6 +1448,7 @@
 			  <property name="label" translatable="yes">_Valuator</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>
@@ -1407,6 +1531,7 @@
 				  <property name="label" translatable="yes">Switch _1</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>
@@ -1426,6 +1551,7 @@
 				  <property name="label" translatable="yes">Switch _2</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>
@@ -1446,6 +1572,7 @@
 				  <property name="label" translatable="yes">Switch _3</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>
@@ -1466,6 +1593,7 @@
 				  <property name="label" translatable="yes">Switch _4</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>
@@ -1486,6 +1614,7 @@
 				  <property name="label" translatable="yes">Switch _5</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>
@@ -1514,6 +1643,10 @@
 			      <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">label_item</property>
@@ -1556,6 +1689,7 @@
 				      <property name="label" translatable="yes">Activate when _pressed</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>
@@ -1575,6 +1709,7 @@
 				      <property name="label" translatable="yes">Activate when _released</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>
@@ -1603,6 +1738,10 @@
 				  <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">label_item</property>
@@ -1670,6 +1809,10 @@
 				      <property name="xpad">6</property>
 				      <property name="ypad">0</property>
 				      <property name="mnemonic_widget">spinDelay</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>
 				      <accessibility>
 					<atkrelation target="spinDelay" type="label-for"/>
 				      </accessibility>
@@ -1696,6 +1839,10 @@
 				  <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">label_item</property>
@@ -1735,6 +1882,10 @@
 		      <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>
@@ -1772,6 +1923,7 @@
 				  <property name="label" translatable="yes">_X-Y valuator (axes 0 and 1)</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>
@@ -1797,6 +1949,7 @@
 				      <property name="label" translatable="yes">_Single axis:</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>
@@ -1852,6 +2005,10 @@
 			      <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">label_item</property>
@@ -1920,6 +2077,10 @@
 				      <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">6</property>
@@ -1942,6 +2103,7 @@
 				  <property name="label" translatable="yes">Use _key averaging</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>
@@ -1969,6 +2131,10 @@
 			      <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">label_item</property>
@@ -2006,6 +2172,7 @@
 				  <property name="label" translatable="yes">Activate on _Enter</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>
@@ -2025,6 +2192,7 @@
 				  <property name="label" translatable="yes">Activate on Dw_ell</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>
@@ -2045,6 +2213,7 @@
 				  <property name="label" translatable="yes">Activate on _Move</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>
@@ -2074,6 +2243,10 @@
 			      <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">label_item</property>
@@ -2145,6 +2318,10 @@
 				      <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>
@@ -2166,6 +2343,10 @@
 				      <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>
@@ -2197,6 +2378,10 @@
 			      <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">label_item</property>
@@ -2232,6 +2417,10 @@
 		      <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>
@@ -2267,6 +2456,7 @@
 			  <property name="label" translatable="yes">C_ore pointer</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>
@@ -2292,6 +2482,7 @@
 			      <property name="label" translatable="yes">Other _input device:</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>
@@ -2326,7 +2517,7 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				  <signal name="changed" handler="on_entry_input_device_changed" last_modification_time="Tue, 10 Dec 2002 13:42:37 GMT"/>
 				</widget>
@@ -2360,6 +2551,7 @@
 			  <property name="label" translatable="yes">_Joystick</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>
@@ -2388,6 +2580,10 @@
 		      <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">label_item</property>
@@ -2420,6 +2616,10 @@
 	      <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>
@@ -2467,6 +2667,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">entryFeedback</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>
 			      <accessibility>
 				<atkrelation target="comboFeedback" type="label-for"/>
 			      </accessibility>
@@ -2499,7 +2703,7 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				  <signal name="changed" handler="on_entryFeedback_changed" last_modification_time="Wed, 16 Oct 2002 14:24:29 GMT"/>
 				</widget>
@@ -2538,6 +2742,7 @@
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <signal name="clicked" handler="on_buttonAddFeedback_clicked" last_modification_time="Mon, 17 Feb 2003 23:04:28 GMT"/>
 
 			      <child>
@@ -2547,6 +2752,10 @@
 				  <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="hbox86">
@@ -2584,6 +2793,10 @@
 					  <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>
@@ -2604,6 +2817,7 @@
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <signal name="clicked" handler="on_buttonDeleteFeedback_clicked" last_modification_time="Mon, 17 Feb 2003 23:04:39 GMT"/>
 
 			      <child>
@@ -2613,6 +2827,10 @@
 				  <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="hbox87">
@@ -2650,6 +2868,10 @@
 					  <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>
@@ -2670,6 +2892,7 @@
 			      <property name="can_default">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
 			      <signal name="clicked" handler="on_buttonChangeFeedbackName_clicked" last_modification_time="Mon, 17 Feb 2003 23:04:50 GMT"/>
 
 			      <child>
@@ -2679,6 +2902,10 @@
 				  <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="hbox88">
@@ -2716,6 +2943,10 @@
 					  <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>
@@ -2752,6 +2983,10 @@
 		      <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>
 		      <accessibility>
 			<atkrelation target="comboFeedback" type="label-for"/>
 			<atkrelation target="label100" type="labelled-by"/>
@@ -2791,6 +3026,7 @@
 			  <property name="label" translatable="yes">Enable _key flashing</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>
@@ -2808,8 +3044,12 @@
 			  <property name="visible">True</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xscale">0.83</property>
+			  <property name="xscale">0.829999983311</property>
 			  <property name="yscale">1</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="hbox20">
@@ -2831,6 +3071,10 @@
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
 				  <property name="mnemonic_widget">spinKeyFlashing</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>
@@ -2882,6 +3126,10 @@
 		      <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">label_item</property>
@@ -2917,6 +3165,7 @@
 			  <property name="label" translatable="yes">Enable _sound</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>
@@ -2933,8 +3182,12 @@
 			  <property name="visible">True</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xscale">0.66</property>
+			  <property name="xscale">0.660000026226</property>
 			  <property name="yscale">1</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="hbox21">
@@ -2956,6 +3209,10 @@
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
 				  <property name="mnemonic_widget">entrySoundName</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>
 				  <accessibility>
 				    <atkrelation target="comboSoundName" type="label-for"/>
 				  </accessibility>
@@ -2988,7 +3245,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				      <signal name="changed" handler="on_entrySoundName_changed" last_modification_time="Wed, 02 Oct 2002 18:07:52 GMT"/>
 				    </widget>
@@ -3015,6 +3272,7 @@
 				  <property name="label" translatable="yes">_Browse...</property>
 				  <property name="use_underline">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
 				  <signal name="clicked" handler="on_buttonFeedbackSoundFile_clicked" last_modification_time="Wed, 02 Oct 2002 18:07:31 GMT"/>
 				</widget>
 				<packing>
@@ -3048,6 +3306,10 @@
 		      <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">label_item</property>
@@ -3083,6 +3345,7 @@
 			  <property name="label" translatable="yes">Speak key _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>
@@ -3110,6 +3373,10 @@
 		      <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">label_item</property>
@@ -3142,6 +3409,10 @@
 	      <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>
@@ -3150,76 +3421,86 @@
 
 	  <child>
 	    <widget class="GtkVBox" id="AccessMethodsTab">
+	      <property name="border_width">12</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkHBox" id="hbox24">
-		  <property name="border_width">12</property>
+		<widget class="GtkVBox" id="vbox46">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label33">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Method:</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">entryAccessMethodName</property>
-		      <accessibility>
-			<atkrelation target="comboAccessMethods" type="label-for"/>
-		      </accessibility>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
+		  <property name="spacing">12</property>
 
 		  <child>
-		    <widget class="GtkCombo" id="comboAccessMethods">
+		    <widget class="GtkHBox" id="hbox24">
 		      <property name="visible">True</property>
-		      <property name="value_in_list">False</property>
-		      <property name="allow_empty">True</property>
-		      <property name="case_sensitive">False</property>
-		      <property name="enable_arrow_keys">True</property>
-		      <property name="enable_arrows_always">False</property>
-		      <accessibility>
-			<atkproperty name="AtkObject::accessible_name" translatable="yes">AccessMethodName</atkproperty>
-			<atkrelation target="label33" type="labelled-by"/>
-		      </accessibility>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">12</property>
 
-		      <child internal-child="entry">
-			<widget class="GtkEntry" id="entryAccessMethodName">
+		      <child>
+			<widget class="GtkLabel" id="label33">
 			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">access method name</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">False</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" translatable="yes">*</property>
-			  <property name="activates_default">False</property>
-			  <signal name="changed" handler="on_entryName_changed" last_modification_time="Mon, 07 Oct 2002 18:07:07 GMT"/>
+			  <property name="label" translatable="yes">_Method:</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">entryAccessMethodName</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 internal-child="list">
-			<widget class="GtkList" id="combo-list4">
+		      <child>
+			<widget class="GtkCombo" id="comboAccessMethods">
 			  <property name="visible">True</property>
-			  <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+			  <property name="value_in_list">False</property>
+			  <property name="allow_empty">True</property>
+			  <property name="case_sensitive">False</property>
+			  <property name="enable_arrow_keys">True</property>
+			  <property name="enable_arrows_always">False</property>
+
+			  <child internal-child="entry">
+			    <widget class="GtkEntry" id="entryAccessMethodName">
+			      <property name="visible">True</property>
+			      <property name="tooltip" translatable="yes">access method name</property>
+			      <property name="can_focus">True</property>
+			      <property name="editable">False</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>
+			      <signal name="changed" handler="on_entryName_changed" last_modification_time="Mon, 07 Oct 2002 18:07:07 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child internal-child="list">
+			    <widget class="GtkList" id="combo-list4">
+			      <property name="visible">True</property>
+			      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+			    </widget>
+			  </child>
 			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
 		      </child>
 		    </widget>
 		    <packing>
@@ -3228,68 +3509,75 @@
 		      <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="GtkFrame" id="frame10">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="label_xalign">0</property>
-		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox23">
-		      <property name="border_width">6</property>
+		    <widget class="GtkFrame" id="frame10">
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+		      <child>
+			<widget class="GtkHBox" id="hbox23">
+			  <property name="border_width">12</property>
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="labelAmDescription">
+			      <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</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>
 
 		      <child>
-			<widget class="GtkLabel" id="labelAmDescription">
+			<widget class="GtkLabel" id="label31">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes"></property>
+			  <property name="label" translatable="yes">&lt;b&gt;Description&lt;/b&gt;</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</property>
-			  <property name="yalign">0.1</property>
-			  <property name="xpad">5</property>
-			  <property name="ypad">5</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">label_item</property>
 			</packing>
 		      </child>
 		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkLabel" id="label31">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Description&lt;/b&gt;</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>
-		    </widget>
 		    <packing>
-		      <property name="type">label_item</property>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
 		</widget>
@@ -3299,10 +3587,6 @@
 		  <property name="fill">False</property>
 		</packing>
 	      </child>
-
-	      <child>
-		<placeholder/>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="tab_expand">False</property>
@@ -3323,6 +3607,10 @@
 	      <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>
@@ -3358,6 +3646,7 @@
 			  <property name="label" translatable="yes">Enable _word completion</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>
@@ -3389,6 +3678,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">spinNumberPredictions</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>
 			      <accessibility>
 				<atkproperty name="AtkObject::accessible_name" translatable="yes">Number of word predictions:</atkproperty>
 			      </accessibility>
@@ -3448,6 +3741,7 @@
 			  <property name="label" translatable="yes">Use _extra word list file(s)</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>
@@ -3484,7 +3778,7 @@
 				  <property name="max_length">0</property>
 				  <property name="text" translatable="yes"></property>
 				  <property name="has_frame">True</property>
-				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="invisible_char">*</property>
 				  <property name="activates_default">False</property>
 				</widget>
 				<packing>
@@ -3501,6 +3795,7 @@
 				  <property name="label" translatable="yes">Browse</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>
@@ -3539,6 +3834,10 @@
 		      <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">label_item</property>
@@ -3574,6 +3873,7 @@
 			  <property name="label" translatable="yes">Enable co_mmand prediction</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>
@@ -3605,6 +3905,10 @@
 			      <property name="xpad">0</property>
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">spinNumberCommandPredictions</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>
 			      <accessibility>
 				<atkproperty name="AtkObject::accessible_name" translatable="yes">Number of command predictions:</atkproperty>
 			      </accessibility>
@@ -3657,6 +3961,10 @@
 		      <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">label_item</property>
@@ -3689,6 +3997,10 @@
 	      <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>
@@ -3723,6 +4035,7 @@
 		  <property name="label">gtk-help</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_buttonHelp_clicked" last_modification_time="Sun, 29 Feb 2004 17:57:24 GMT"/>
 		</widget>
 	      </child>
@@ -3749,6 +4062,7 @@
 		  <property name="label">gtk-apply</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_buttonApply_clicked" last_modification_time="Tue, 16 Mar 2004 03:30:35 GMT"/>
 		</widget>
 	      </child>
@@ -3762,6 +4076,7 @@
 		  <property name="label">gtk-revert-to-saved</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_buttonRevert_clicked" last_modification_time="Sun, 29 Feb 2004 17:56:17 GMT"/>
 		</widget>
 	      </child>
@@ -3775,6 +4090,7 @@
 		  <property name="label">gtk-cancel</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_buttonCancel_clicked" last_modification_time="Sun, 29 Feb 2004 17:56:25 GMT"/>
 		</widget>
 	      </child>
@@ -3788,6 +4104,7 @@
 		  <property name="label">gtk-ok</property>
 		  <property name="use_stock">True</property>
 		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
 		  <signal name="clicked" handler="on_buttonOK_clicked" last_modification_time="Sun, 29 Feb 2004 17:56:41 GMT"/>
 		</widget>
 	      </child>
@@ -3816,6 +4133,13 @@
   <property name="modal">False</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
 
   <child>
     <widget class="GtkVBox" id="vbox14">
@@ -3826,6 +4150,8 @@
       <child>
 	<widget class="GtkMenuBar" id="menubar1">
 	  <property name="visible">True</property>
+	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
 	  <child>
 	    <widget class="GtkMenuItem" id="file1">
@@ -3955,6 +4281,10 @@
 			  <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>
@@ -3972,7 +4302,7 @@
 			  <property name="max_length">0</property>
 			  <property name="text" translatable="yes"></property>
 			  <property name="has_frame">True</property>
-			  <property name="invisible_char" translatable="yes">*</property>
+			  <property name="invisible_char">*</property>
 			  <property name="activates_default">False</property>
 			</widget>
 			<packing>
@@ -3996,6 +4326,7 @@
 		      <property name="label" translatable="yes">Word Completion</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>
@@ -4014,6 +4345,7 @@
 		      <property name="label" translatable="yes">Command Prediction</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>
@@ -4040,6 +4372,10 @@
 		  <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">label_item</property>
@@ -4079,6 +4415,7 @@
 			  <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>
 			  <signal name="clicked" handler="on_buttonNext_clicked" last_modification_time="Mon, 07 Oct 2002 19:16:27 GMT"/>
 
 			  <child>
@@ -4088,6 +4425,10 @@
 			      <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="hbox89">
@@ -4125,6 +4466,10 @@
 				      <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>
@@ -4149,6 +4494,7 @@
 			  <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>
 			  <signal name="clicked" handler="on_buttonPrevious_clicked" last_modification_time="Mon, 07 Oct 2002 19:16:36 GMT"/>
 
 			  <child>
@@ -4158,6 +4504,10 @@
 			      <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="hbox90">
@@ -4195,6 +4545,10 @@
 				      <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>
@@ -4230,6 +4584,7 @@
 			  <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>
 			  <signal name="clicked" handler="on_buttonAddNewKey_clicked" last_modification_time="Mon, 07 Oct 2002 19:17:52 GMT"/>
 
 			  <child>
@@ -4239,6 +4594,10 @@
 			      <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="hbox91">
@@ -4276,6 +4635,10 @@
 				      <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>
@@ -4300,6 +4663,7 @@
 			  <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>
 			  <signal name="clicked" handler="on_buttonDeleteKey_clicked" last_modification_time="Mon, 07 Oct 2002 19:18:00 GMT"/>
 
 			  <child>
@@ -4309,6 +4673,10 @@
 			      <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="hbox92">
@@ -4346,6 +4714,10 @@
 				      <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>
@@ -4372,6 +4744,7 @@
 			  <property name="label" translatable="yes">Duplicate</property>
 			  <property name="use_underline">True</property>
 			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
 			  <signal name="clicked" handler="on_buttonDuplicate_clicked" last_modification_time="Mon, 07 Oct 2002 19:18:08 GMT"/>
 			</widget>
 			<packing>
@@ -4399,6 +4772,7 @@
 			  <property name="label" translatable="yes">To Front</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>
@@ -4414,6 +4788,7 @@
 			  <property name="label" translatable="yes">To Back</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>
@@ -4486,6 +4861,10 @@
 					  <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>
@@ -4512,7 +4891,7 @@
 					      <property name="max_length">0</property>
 					      <property name="text" translatable="yes"></property>
 					      <property name="has_frame">True</property>
-					      <property name="invisible_char" translatable="yes">*</property>
+					      <property name="invisible_char">*</property>
 					      <property name="activates_default">False</property>
 					    </widget>
 					  </child>
@@ -4557,6 +4936,10 @@
 					  <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>
@@ -4574,7 +4957,7 @@
 					  <property name="max_length">0</property>
 					  <property name="text" translatable="yes"></property>
 					  <property name="has_frame">True</property>
-					  <property name="invisible_char" translatable="yes">*</property>
+					  <property name="invisible_char">*</property>
 					  <property name="activates_default">False</property>
 					</widget>
 					<packing>
@@ -4617,6 +5000,10 @@
 				      <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>
@@ -4643,7 +5030,7 @@
 					  <property name="max_length">0</property>
 					  <property name="text" translatable="yes"></property>
 					  <property name="has_frame">True</property>
-					  <property name="invisible_char" translatable="yes">*</property>
+					  <property name="invisible_char">*</property>
 					  <property name="activates_default">False</property>
 					</widget>
 				      </child>
@@ -4684,6 +5071,10 @@
 			      <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">label_item</property>
@@ -4730,6 +5121,10 @@
 				      <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>
@@ -4784,6 +5179,10 @@
 				      <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>
@@ -4838,6 +5237,10 @@
 				      <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>
@@ -4892,6 +5295,10 @@
 				      <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>
@@ -4942,6 +5349,10 @@
 			      <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">label_item</property>
@@ -4987,7 +5398,7 @@
 				      <property name="max_length">0</property>
 				      <property name="text" translatable="yes"></property>
 				      <property name="has_frame">True</property>
-				      <property name="invisible_char" translatable="yes">*</property>
+				      <property name="invisible_char">*</property>
 				      <property name="activates_default">False</property>
 				    </widget>
 				  </child>
@@ -5045,6 +5456,10 @@
 						  <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>
@@ -5071,7 +5486,7 @@
 						      <property name="max_length">0</property>
 						      <property name="text" translatable="yes"></property>
 						      <property name="has_frame">True</property>
-						      <property name="invisible_char" translatable="yes">*</property>
+						      <property name="invisible_char">*</property>
 						      <property name="activates_default">False</property>
 						    </widget>
 						  </child>
@@ -5104,6 +5519,7 @@
 					      <property name="label" translatable="yes">3 State</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>
@@ -5122,6 +5538,7 @@
 					      <property name="label" translatable="yes">Toggle</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>
@@ -5141,6 +5558,7 @@
 					      <property name="label" translatable="yes">New</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>
@@ -5156,6 +5574,7 @@
 					      <property name="label" translatable="yes">Delete</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>
@@ -5179,6 +5598,10 @@
 					  <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">label_item</property>
@@ -5219,6 +5642,10 @@
 					      <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>
@@ -5245,7 +5672,7 @@
 						  <property name="max_length">0</property>
 						  <property name="text" translatable="yes"></property>
 						  <property name="has_frame">True</property>
-						  <property name="invisible_char" translatable="yes">*</property>
+						  <property name="invisible_char">*</property>
 						  <property name="activates_default">False</property>
 						</widget>
 					      </child>
@@ -5279,6 +5706,10 @@
 					  <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">label_item</property>
@@ -5314,6 +5745,10 @@
 			      <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">label_item</property>
@@ -5354,6 +5789,7 @@
 				      <property name="label" translatable="yes">Normal</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>
@@ -5372,6 +5808,7 @@
 				      <property name="label" translatable="yes">Modifier Pre</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>
@@ -5391,6 +5828,7 @@
 				      <property name="label" translatable="yes">Modifier Post</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>
@@ -5467,6 +5905,7 @@
 					      <property name="label" translatable="yes">Delete</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>
@@ -5480,6 +5919,7 @@
 					      <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="alignment13">
@@ -5488,6 +5928,10 @@
 						  <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="hbox93">
@@ -5525,6 +5969,10 @@
 							  <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>
@@ -5549,6 +5997,7 @@
 					      <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="alignment14">
@@ -5557,6 +6006,10 @@
 						  <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="hbox94">
@@ -5594,6 +6047,10 @@
 							  <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>
@@ -5655,6 +6112,7 @@
 					      <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="alignment15">
@@ -5663,6 +6121,10 @@
 						  <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="hbox95">
@@ -5700,6 +6162,10 @@
 							  <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>
@@ -5738,6 +6204,10 @@
 						  <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>
@@ -5764,7 +6234,7 @@
 						      <property name="max_length">0</property>
 						      <property name="text" translatable="yes"></property>
 						      <property name="has_frame">True</property>
-						      <property name="invisible_char" translatable="yes">*</property>
+						      <property name="invisible_char">*</property>
 						      <property name="activates_default">False</property>
 						    </widget>
 						  </child>
@@ -5814,6 +6284,7 @@
 						  <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="alignment16">
@@ -5822,6 +6293,10 @@
 						      <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="hbox96">
@@ -5859,6 +6334,10 @@
 							      <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>
@@ -5897,6 +6376,10 @@
 						      <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>
@@ -5923,7 +6406,7 @@
 							  <property name="max_length">0</property>
 							  <property name="text" translatable="yes"></property>
 							  <property name="has_frame">True</property>
-							  <property name="invisible_char" translatable="yes">*</property>
+							  <property name="invisible_char">*</property>
 							  <property name="activates_default">False</property>
 							</widget>
 						      </child>
@@ -5955,6 +6438,7 @@
 							  <property name="label" translatable="yes">Press</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>
@@ -5973,6 +6457,7 @@
 							  <property name="label" translatable="yes">Release</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>
@@ -6024,6 +6509,7 @@
 					      <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="alignment17">
@@ -6032,6 +6518,10 @@
 						  <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="hbox97">
@@ -6069,6 +6559,10 @@
 							  <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>
@@ -6107,6 +6601,10 @@
 						  <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>
@@ -6133,7 +6631,7 @@
 						      <property name="max_length">0</property>
 						      <property name="text" translatable="yes"></property>
 						      <property name="has_frame">True</property>
-						      <property name="invisible_char" translatable="yes">*</property>
+						      <property name="invisible_char">*</property>
 						      <property name="activates_default">False</property>
 						    </widget>
 						  </child>
@@ -6195,6 +6693,10 @@
 			      <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">label_item</property>
@@ -6241,6 +6743,10 @@
 				      <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>
@@ -6282,6 +6788,7 @@
 				  <property name="label" translatable="yes">Show Only This Font Group</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>
@@ -6308,6 +6815,10 @@
 			      <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">label_item</property>
@@ -6343,6 +6854,10 @@
 		  <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">label_item</property>
