Index: src/orca/settings.py
===================================================================
--- src/orca/settings.py	(revision 3359)
+++ src/orca/settings.py	(working copy)
@@ -107,6 +107,7 @@
     "brailleSelectorIndicator",
     "enableBrailleMonitor",
     "enableMagnifier",
+    "enableMagLiveUpdating",
     "enableMagCursor",
     "enableMagCursorExplicitSize",
     "magCursorSize",
@@ -114,18 +115,31 @@
     "enableMagCrossHair",
     "enableMagCrossHairClip",
     "magCrossHairSize",
+    "magCrossHairColor",
     "magZoomerType",
     "magZoomerLeft",
     "magZoomerRight",
     "magZoomerTop",
     "magZoomerBottom",
     "magZoomFactor",
+    "enableMagZoomerBorder",
+    "magZoomerBorderSize",
+    "magZoomerBorderColor",
     "enableMagZoomerColorInversion",
+    "magBrightnessLevel",
+    "magBrightnessLevelRed",
+    "magBrightnessLevelBlue",
+    "magBrightnessLevelGreen",
+    "magContrastLevel",
+    "magContrastLevelRed",
+    "magContrastLevelGreen",
+    "magContrastLevelBlue",
     "magSmoothingMode",
     "magMouseTrackingMode",
     "magControlTrackingMode",
     "magTextTrackingMode",
     "magEdgeMargin",
+    "magColorFilteringMode",
     "magSourceDisplay",
     "magTargetDisplay",
     "verbalizePunctuationStyle",
@@ -300,6 +314,12 @@
 #
 enableMagnifier                  = False
 
+# If True, changes made in the Magnifier pane will take place
+# immediately (i.e. without pressing the apply button).  Making
+# them permanent still requires pressing Apply or OK.
+#
+enableMagLiveUpdating            = True
+
 # If True, show the magnification cursor.
 #
 enableMagCursor                  = True
@@ -328,6 +348,10 @@
 #
 magCrossHairSize                 = 16
 
+# Magnification cross-hair color value (hex color spec).
+#
+magCrossHairColor                   = '#000000'
+
 # Magnification Zoomer type.
 #
 MAG_ZOOMER_TYPE_FULL_SCREEN      = 0
@@ -349,10 +373,49 @@
 #
 magZoomFactor                    = 4.0
 
+# If True, display a border around the magnification zoomer region.
+#
+enableMagZoomerBorder           = False
+
+# The color and size of the border which separates the target
+# display from the source display.
+#
+magZoomerBorderSize              = 1
+magZoomerBorderColor             = '#000000'
+
 # If True, invert the magnification zoomer colors.
 #
 enableMagZoomerColorInversion    = False
 
+# The brightness levels.  The range is from -1 to 1, with 0
+# being "normal"/no change.
+#
+magBrightnessLevel               = 0
+magBrightnessLevelRed            = 0
+magBrightnessLevelGreen          = 0
+magBrightnessLevelBlue           = 0
+
+# The contrast levels.  The range is from -1 to 1, with 0
+# being "normal"/no change.
+#
+magContrastLevel                 = 0
+magContrastLevelRed              = 0
+magContrastLevelGreen            = 0
+magContrastLevelBlue             = 0
+
+# Magnification libcolorblind color filtering mode (see magColorFilteringMode).
+#
+MAG_COLOR_FILTERING_MODE_NONE                 = 0
+MAG_COLOR_FILTERING_MODE_SATURATE_RED         = 1
+MAG_COLOR_FILTERING_MODE_SATURATE_GREEN       = 2
+MAG_COLOR_FILTERING_MODE_SATURATE_BLUE        = 3
+MAG_COLOR_FILTERING_MODE_DESATURATE_RED       = 4
+MAG_COLOR_FILTERING_MODE_DESATURATE_GREEN     = 5
+MAG_COLOR_FILTERING_MODE_DESATURATE_BLUE      = 6
+MAG_COLOR_FILTERING_MODE_POSITIVE_HUE_SHIFT   = 7
+MAG_COLOR_FILTERING_MODE_NEGATIVE_HUE_SHIFT   = 8
+magColorFilteringMode = MAG_COLOR_FILTERING_MODE_NONE
+
 # Magnification smoothing mode (see magSmoothingMode).
 #
 MAG_SMOOTHING_MODE_BILINEAR      = 0
Index: src/orca/mag.py
===================================================================
--- src/orca/mag.py	(revision 3359)
+++ src/orca/mag.py	(working copy)
@@ -41,6 +41,7 @@
 import pyatspi
 import debug
 import settings
+import orca_state
 
 _magnifierAvailable = False
 
@@ -56,9 +57,10 @@
 #
 _initialized = False
 
-# The Magnifier
+# The Magnifier and its property bag
 #
 _magnifier = None
+_magnifierPBag = None
 
 # The width and height, in unzoomed system coordinates of the rectangle that,
 # when magnified, will fill the viewport of the magnifier - this needs to be
@@ -100,10 +102,11 @@
 #
 _targetDisplayBounds = None
 
-# The ZoomRegion we care about.  We only use one ZoomRegion and we
-# make it occupy the whole magnifier.
+# The ZoomRegion we care about and its property bag.  We only use one
+# ZoomRegion and we make it occupy the whole magnifier.
 #
 _zoomer = None
+_zoomerPBag = None
 
 # The time of the last mouse event.
 #
@@ -118,6 +121,22 @@
 #
 _fullScreenCapable = True
 
+# Whether or not we're in the process of making "live update" changes
+# to the location of the magnifier.
+#
+_liveUpdatingMagnifier = False
+
+# The original source display bounds.
+#
+_originalSourceDisplayBounds = None
+
+# The current modes of tracking, for use with "live update" changes.
+#
+_mouseTracking = settings.magMouseTrackingMode
+_controlTracking = settings.magControlTrackingMode
+_textTracking = settings.magTextTrackingMode
+_edgeMargin = settings.magEdgeMargin
+
 def __setROI(rect):
     """Sets the region of interest.
 
@@ -321,13 +340,11 @@
     if _pollMouseDisabled:
         _zoomer.setPointerPos(x, y)
 
-    if settings.magMouseTrackingMode == settings.MAG_TRACKING_MODE_PUSH:
+    if _mouseTracking == settings.MAG_TRACKING_MODE_PUSH:
         __setROIPush(x, y)
-    elif settings.magMouseTrackingMode == \
-                                settings.MAG_TRACKING_MODE_PROPORTIONAL:
+    elif _mouseTracking == settings.MAG_TRACKING_MODE_PROPORTIONAL:
         __setROIProportional(x, y)
-    elif settings.magMouseTrackingMode == \
-                                    settings.MAG_TRACKING_MODE_CENTERED:
+    elif _mouseTracking == settings.MAG_TRACKING_MODE_CENTERED:
         __setROICenter(x, y)
 
 def __getValueText(slot, value):
@@ -364,29 +381,28 @@
         print "    Current value:", value, __getValueText(slot, value)
         print
 
-def applySettings():
-    """Looks at the user settings and applies them to the magnifier."""
+def __setupMagnifier(position, left=None, top=None, right=None, bottom=None,
+                     restore=None):
+    """Creates the magnifier in the position specified.
 
-    global _sourceDisplayBounds
-    global _targetDisplayBounds
-    global _zoomer
-    global _roiWidth
-    global _roiHeight
-    global _minROIX
-    global _minROIY
-    global _maxROIX
-    global _maxROIY
-    global _pollMouseDisabled
+    Arguments:
+    - position: the position/type of zoomer (full, left half, etc.)
+    - left:     the left edge of the zoomer (only applicable for custom)
+    - top:      the top edge of the zoomer (only applicable for custom)
+    - right:    the right edge of the zoomer (only applicable for custom)
+    - bottom:   the top edge of the zoomer (only applicable for custom)
+    - restore:  a dictionary of all of the settings which should be restored
+    """
+
     global _fullScreenCapable
+    global _magnifierPBag
+    global _originalSourceDisplayBounds
 
-    ########################################################################
-    #                                                                      #
-    # First set up the magnifier properties.                               #
-    #                                                                      #
-    ########################################################################
-
     _magnifier.clearAllZoomRegions()
 
+    if not restore:
+        restore = {}
+
     # Define where the magnifier will live.
     #
     try:
@@ -408,42 +424,46 @@
     except:
         debug.printException(debug.LEVEL_WARNING)
 
-    magnifierPBag = _magnifier.getProperties()
-    sdb = magnifierPBag.getValue("source-display-bounds").value()
+    _magnifierPBag = _magnifier.getProperties()
+    sdb = _magnifierPBag.getValue("source-display-bounds").value()
+    if not _originalSourceDisplayBounds:
+        _originalSourceDisplayBounds = sdb
+    elif _liveUpdatingMagnifier:
+        sdb = _originalSourceDisplayBounds
 
     # Find out where the user wants to place the target display.
     #
     if _fullScreenCapable and \
-       settings.magZoomerType == settings.MAG_ZOOMER_TYPE_FULL_SCREEN:
+       position == settings.MAG_ZOOMER_TYPE_FULL_SCREEN:
         prefLeft = 0
         prefTop = 0
         prefRight = sdb.x2
         prefBottom = sdb.y2
-    elif settings.magZoomerType == settings.MAG_ZOOMER_TYPE_TOP_HALF:
+    elif position == settings.MAG_ZOOMER_TYPE_TOP_HALF:
         prefLeft = 0
         prefTop = 0
         prefRight = sdb.x2
         prefBottom = sdb.y2 / 2
-    elif settings.magZoomerType == settings.MAG_ZOOMER_TYPE_BOTTOM_HALF:
+    elif position == settings.MAG_ZOOMER_TYPE_BOTTOM_HALF:
         prefLeft = 0
         prefTop = sdb.y2 / 2
         prefRight = sdb.x2
         prefBottom = sdb.y2
-    elif settings.magZoomerType == settings.MAG_ZOOMER_TYPE_LEFT_HALF:
+    elif position == settings.MAG_ZOOMER_TYPE_LEFT_HALF:
         prefLeft = 0
         prefTop = 0
         prefRight = sdb.x2 / 2
         prefBottom = sdb.y2
-    elif settings.magZoomerType == settings.MAG_ZOOMER_TYPE_RIGHT_HALF:
+    elif position == settings.MAG_ZOOMER_TYPE_RIGHT_HALF:
         prefLeft = sdb.x2 / 2
         prefTop = 0
         prefRight = sdb.x2
         prefBottom = sdb.y2
     else:
-        prefLeft   = settings.magZoomerLeft
-        prefTop    = settings.magZoomerTop
-        prefRight  = settings.magZoomerRight
-        prefBottom = settings.magZoomerBottom
+        prefLeft   = left or settings.magZoomerLeft
+        prefTop    = top or settings.magZoomerTop
+        prefRight  = right or settings.magZoomerRight
+        prefBottom = bottom or settings.magZoomerBottom
     updateTarget = True
 
     # If we're not using composite, bad things will happen if we allow the
@@ -460,7 +480,7 @@
         # are all 0, then we know that gnome-mag isn't already running.
         #
         magAlreadyRunning = False
-        tdb = magnifierPBag.getValue("target-display-bounds").value()
+        tdb = _magnifierPBag.getValue("target-display-bounds").value()
         if tdb.x1 or tdb.x2 or tdb.y1 or tdb.y2:
             magAlreadyRunning = True
 
@@ -504,8 +524,8 @@
     # as source-display-bouinds.
     #
     if updateTarget:
-        tdb = magnifierPBag.getValue("target-display-bounds").value()
-        magnifierPBag.setValue(
+        tdb = _magnifierPBag.getValue("target-display-bounds").value()
+        _magnifierPBag.setValue(
             "target-display-bounds",
             ORBit.CORBA.Any(
                 ORBit.CORBA.TypeCode(
@@ -515,72 +535,45 @@
                                            prefRight,
                                            prefBottom)))
 
-    # Set a bunch of other magnifier properties...
-    #
-    if settings.enableMagCursor:
-        bonobo.pbclient_set_float(
-            magnifierPBag, "cursor-scale-factor", 1.0 * settings.magZoomFactor)
-    else:
-        bonobo.pbclient_set_float(
-            magnifierPBag, "cursor-scale-factor", 0.0)
+    bonobo.pbclient_set_string(_magnifierPBag, "cursor-set", "default")
 
-    if settings.enableMagCursorExplicitSize:
-        bonobo.pbclient_set_long(
-            magnifierPBag, "cursor-size", settings.magCursorSize)
-    else:
-        bonobo.pbclient_set_long(
-            magnifierPBag, "cursor-size", 0)
+    enableCursor = restore.get('enableMagCursor', settings.enableMagCursor)
+    explicitSize = restore.get('enableMagCursorExplicitSize',
+                               settings.enableMagCursorExplicitSize)
+    size = restore.get('magCursorSize', settings.magCursorSize)
+    setMagnifierCursor(enableCursor, explicitSize, size, False)
 
-    bonobo.pbclient_set_string(magnifierPBag, "cursor-set", "default")
+    value = restore.get('magCursorColor', settings.magCursorColor)
+    setMagnifierObjectColor("cursor-color", value, False)
 
-    # Convert the colorPreference string to something we can use.
-    # The main issue here is that the color preferences are saved
-    # as 4 byte values per color.  We only need 2 bytes, so we
-    # get rid of the bottom 8 bits.
-    #
-    colorPreference = gtk.gdk.color_parse(settings.magCursorColor)
-    colorPreference.red   = colorPreference.red   >> 8
-    colorPreference.blue  = colorPreference.blue  >> 8
-    colorPreference.green = colorPreference.green >> 8
-    colorString = "0x%02X%02X%02X" \
-                  % (colorPreference.red,
-                     colorPreference.green,
-                     colorPreference.blue)
+    value = restore.get('magCrossHairColor', settings.magCrossHairColor)
+    setMagnifierObjectColor("crosswire-color", value, False)
 
-    color = magnifierPBag.getValue("cursor-color")
-    magnifierPBag.setValue(
-        "cursor-color",
-        ORBit.CORBA.Any(
-            color.typecode(),
-            long(colorString, 0)))
+    value = restore.get('enableMagCrossHair', settings.enableMagCrossHair)
+    setMagnifierCrossHair(value, False)
 
-    color = magnifierPBag.getValue("crosswire-color")
-    magnifierPBag.setValue(
-        "crosswire-color",
-        ORBit.CORBA.Any(
-            color.typecode(),
-            long(colorString, 0)))
+    value = restore.get('enableMagCrossHairClip',
+                        settings.enableMagCrossHairClip)
+    setMagnifierCrossHairClip(value, False)
 
-    if settings.enableMagCrossHair:
-        bonobo.pbclient_set_long(
-            magnifierPBag, "crosswire-size", settings.magCrossHairSize)
-    else:
-        bonobo.pbclient_set_long(
-            magnifierPBag, "crosswire-size", 0)
+def __setupZoomer(restore=None):
+    """Creates a zoomer in the magnifier
+    Arguments:
+    - restore:  a dictionary of all of the settings which should be restored
+    """
 
-    bonobo.pbclient_set_boolean(
-        magnifierPBag, "crosswire-clip", settings.enableMagCrossHairClip)
+    global _sourceDisplayBounds
+    global _targetDisplayBounds
+    global _zoomer
+    global _roiWidth
+    global _roiHeight
+    global _pollMouseDisabled
+    global _zoomerPBag
 
-    ########################################################################
-    #                                                                      #
-    # Now set up the zoomer properties.                                    #
-    #                                                                      #
-    ########################################################################
+    if not restore:
+        restore = {}
 
-    # We set the target-display-bounds above, but let's ask gnome-mag for
-    # what it really set it to.  Hopefully, it was the same thing.
-    #
-    _targetDisplayBounds = magnifierPBag.getValue(
+    _targetDisplayBounds = _magnifierPBag.getValue(
         "target-display-bounds").value()
 
     debug.println(debug.LEVEL_ALL,
@@ -599,7 +592,7 @@
     # one display).  Otherwise, the source-display-bounds will be the
     # entire source screen.
     #
-    _sourceDisplayBounds = magnifierPBag.getValue(
+    _sourceDisplayBounds = _magnifierPBag.getValue(
         "source-display-bounds").value()
 
     debug.println(debug.LEVEL_ALL,
@@ -663,45 +656,102 @@
 
     # Create the zoomer with a magnification factor, an initial ROI, and
     # where in magnifier we want it to be (we want it to be in the whole
-    # magnifier).
+    # magnifier). Initially set the viewport so that it does not appear.
+    # After we set all of the color properties, reset the viewport to
+    # the correct position.  This will prevent the user from seeing the
+    # individual property changes (e.g. brightness, contrast) upon load.
     #
     _zoomer = _magnifier.createZoomRegion(
         settings.magZoomFactor, settings.magZoomFactor,
         GNOME.Magnifier.RectBounds(0, 0, _roiWidth, _roiHeight),
-        GNOME.Magnifier.RectBounds(0, 0, viewportWidth, viewportHeight))
+        GNOME.Magnifier.RectBounds(0, 0, 1, 1))
 
-    zoomerPBag = _zoomer.getProperties()
-    bonobo.pbclient_set_boolean(zoomerPBag, "is-managed", True)
+    _zoomerPBag = _zoomer.getProperties()
+    bonobo.pbclient_set_boolean(_zoomerPBag, "is-managed", True)
 
+    value = restore.get('magZoomFactor', settings.magZoomFactor)
+    setZoomerMagFactor(value, value, False)
+
+    value = restore.get('enableMagZoomerColorInversion',
+                        settings.enableMagZoomerColorInversion)
+    setZoomerColorInversion(value, False)
+
+    brightness = restore.get('magBrightnessLevel', settings.magBrightnessLevel)
+    r = brightness + \
+        restore.get('magBrightnessLevelRed',
+                    settings.magBrightnessLevelRed)
+    g = brightness + \
+        restore.get('magBrightnessLevelGreen',
+                    settings.magBrightnessLevelGreen)
+    b = brightness + \
+        restore.get('magBrightnessLevelBlue',
+                    settings.magBrightnessLevelBlue)
+    setZoomerBrightness(r, g, b, False)
+
+    contrast = restore.get('magContrastLevel', settings.magContrastLevel)
+    r = contrast + \
+        restore.get('magContrastLevelRed',
+                    settings.magContrastLevelRed)
+    g = contrast + \
+        restore.get('magContrastLevelGreen',
+                    settings.magContrastLevelGreen)
+    b = contrast + \
+        restore.get('magContrastLevelBlue',
+                    settings.magContrastLevelBlue)
+    setZoomerContrast(r, g, b, False)
+
+    value = restore.get('magColorFilteringMode',
+                        settings.magColorFilteringMode)
+    setZoomerColorFilter(value, False)
+
+    value = restore.get('magZoomerType', settings.magZoomerType)
+    if value == settings.MAG_ZOOMER_TYPE_FULL_SCREEN:
+        size = 0
+    else:
+        size = restore.get('magZoomerBorderSize', settings.magZoomerBorderSize)
+    color = restore.get('magZoomerBorderColor', settings.magZoomerBorderColor)
+    setZoomerObjectSize("border-size", size, False)
+    setZoomerObjectColor("border-color", color, False)
+
+    value = restore.get('magSmoothingMode', settings.magSmoothingMode)
+    setZoomerSmoothingType(value, False)
+
+    # Now it's safe to display the viewport.
+    #
+    bounds = GNOME.Magnifier.RectBounds(0, 0, viewportWidth, viewportHeight)
+    _zoomer.moveResize(bounds)
+
     # Try to use gnome-mag >= 0.13.1 to allow us to control where to
     # draw the cursor and crosswires.
     #
     try:
-        bonobo.pbclient_set_boolean(zoomerPBag, "poll-mouse", False)
+        bonobo.pbclient_set_boolean(_zoomerPBag, "poll-mouse", False)
         _pollMouseDisabled = True
     except:
         _pollMouseDisabled = False
 
-    _zoomer.setMagFactor(settings.magZoomFactor, settings.magZoomFactor)
+    __updateROIDimensions()
+    _magnifier.addZoomRegion(_zoomer)
 
-    bonobo.pbclient_set_boolean(
-        zoomerPBag, "inverse-video", settings.enableMagZoomerColorInversion)
+def __updateROIDimensions():
+    """Updates the ROI width, height, and maximum and minimum values.
+    """
 
-    if settings.magSmoothingMode == settings.MAG_SMOOTHING_MODE_BILINEAR:
-        try:
-            bonobo.pbclient_set_string(
-                zoomerPBag, "smoothing-type", "bilinear")
-        except:
-            pass
+    global _roiWidth
+    global _roiHeight
+    global _minROIX
+    global _minROIY
+    global _maxROIX
+    global _maxROIY
 
-    viewport = zoomerPBag.getValue("viewport").value()
+    viewport = _zoomerPBag.getValue("viewport").value()
 
     debug.println(debug.LEVEL_ALL,
                   "Magnifier viewport actual: (%d, %d), (%d, %d)" \
                   % (viewport.x1, viewport.y1, viewport.x2, viewport.y2))
 
-    magx = zoomerPBag.getValue("mag-factor-x").value()
-    magy = zoomerPBag.getValue("mag-factor-y").value()
+    magx = _zoomerPBag.getValue("mag-factor-x").value()
+    magy = _zoomerPBag.getValue("mag-factor-y").value()
 
     _roiWidth  = min(_sourceDisplayBounds.x2 - _sourceDisplayBounds.x1,
                      (viewport.x2 - viewport.x1) / magx)
@@ -722,8 +772,12 @@
                   "Magnifier ROI min/max center: (%d, %d), (%d, %d)" \
                   % (_minROIX, _minROIY, _maxROIX, _maxROIY))
 
-    _magnifier.addZoomRegion(_zoomer)
+def applySettings():
+    """Looks at the user settings and applies them to the magnifier."""
 
+    __setupMagnifier(settings.magZoomerType)
+    __setupZoomer()
+
     #print "MAGNIFIER PROPERTIES:", _magnifier
     #__dumpPropertyBag(_magnifier)
     #print "ZOOMER PROPERTIES:", _zoomer
@@ -767,13 +821,10 @@
             haveSomethingToMagnify = False
 
         if haveSomethingToMagnify:
-            if settings.magTextTrackingMode == \
-                   settings.MAG_TRACKING_MODE_CENTERED:
+            if _textTracking == settings.MAG_TRACKING_MODE_CENTERED:
                 __setROICenter(x, y)
-            elif settings.magTextTrackingMode == \
-                     settings.MAG_TRACKING_MODE_PUSH:
-                __setROICursorPush(x, y, width, height,
-                                   settings.magEdgeMargin)
+            elif _textTracking == settings.MAG_TRACKING_MODE_PUSH:
+                __setROICursorPush(x, y, width, height, _edgeMargin)
             return
 
     if not haveSomethingToMagnify:
@@ -786,8 +837,7 @@
             haveSomethingToMagnify = False
 
     if haveSomethingToMagnify:
-        if settings.magControlTrackingMode == \
-               settings.MAG_TRACKING_MODE_CENTERED:
+        if _controlTracking == settings.MAG_TRACKING_MODE_CENTERED:
             centerX = x + width/2
             centerY = y + height/2
 
@@ -800,8 +850,7 @@
                 centerY = y
 
             __setROICenter(centerX, centerY)
-        elif settings.magControlTrackingMode == \
-                 settings.MAG_TRACKING_MODE_PUSH:
+        elif _controlTracking == settings.MAG_TRACKING_MODE_PUSH:
             __setROICursorPush(x, y, width, height)
 
 def init():
@@ -825,17 +874,17 @@
                                    "GNOME/Magnifier/Magnifier")
 
     try:
+        _initialized = True
         applySettings()
         pyatspi.Registry.registerEventListener(__onMouseEvent, "mouse:abs")
 
-        _initialized = True
-
         # Zoom to the upper left corner of the display for now.
         #
         __setROICenter(0, 0)
 
         return True
     except:
+        _initialized = False
         _magnifier.dispose()
         raise
 
@@ -871,3 +920,407 @@
     _initialized = False
 
     return True
+
+######################################################################
+#                                                                    #
+#              Convenience functions for "live" changes              #
+#                                                                    #
+######################################################################
+
+def setupMagnifier(position, left=None, top=None, right=None, bottom=None,
+                   restore=None):
+    """Creates the magnifier in the position specified.
+
+    Arguments:
+    - position: the position/type of zoomer (full, left half, etc.)
+    - left:     the left edge of the zoomer (only applicable for custom)
+    - top:      the top edge of the zoomer (only applicable for custom)
+    - right:    the right edge of the zoomer (only applicable for custom)
+    - bottom:   the top edge of the zoomer (only applicable for custom)
+    - restore:  a dictionary of all of the settings that should be restored
+    """
+
+    global _liveUpdatingMagnifier
+
+    _liveUpdatingMagnifier = True
+    __setupMagnifier(position, left, top, right, bottom, restore)
+    __setupZoomer(restore)
+
+def setMagnifierCursor(enabled, customEnabled, size, updateScreen=True):
+    """Sets the cursor.
+
+    Arguments:
+    - enabled:        Whether or not the cursor should be enabled
+    - customEnabled:  Whether or not a custom size has been enabled
+    - size:           The size it should be set to
+    - updateScreen:   Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+    try:
+        mag = _zoomerPBag.getValue("mag-factor-x").value()
+    except:
+        mag = settings.magZoomFactor
+
+    if enabled:
+        scale = 1.0 * mag
+    else:
+        scale = 0.0
+
+    if not (enabled and customEnabled):
+        size = 0
+
+    bonobo.pbclient_set_float(_magnifierPBag, "cursor-scale-factor", scale)
+    bonobo.pbclient_set_long(_magnifierPBag, "cursor-size", size)
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setMagnifierCrossHair(enabled, updateScreen=True):
+    """Sets the cross-hair.
+
+    Arguments:
+    - enabled: Whether or not the cross-hair should be enabled
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    size = 0
+    if enabled:
+        size = settings.magCrossHairSize
+
+    bonobo.pbclient_set_long(_magnifierPBag, "crosswire-size", size)
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setMagnifierCrossHairClip(enabled, updateScreen=True):
+    """Sets the cross-hair clip.
+
+    Arguments:
+    - enabled: Whether or not the cross-hair clip should be enabled
+    - updateScreen:   Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    bonobo.pbclient_set_boolean(_magnifierPBag, "crosswire-clip", enabled)
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setZoomerColorInversion(enabled, updateScreen=True):
+    """Sets the color inversion.
+
+    Arguments:
+    - enabled: Whether or not color inversion should be enabled
+    - updateScreen:   Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    bonobo.pbclient_set_boolean(_zoomerPBag, "inverse-video", enabled)
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setZoomerBrightness(red=0, green=0, blue=0, updateScreen=True):
+    """Increases/Decreases the brightness level by the specified
+    increments.  Increments are floats ranging from -1 (black/no
+    brightenss) to 1 (white/100% brightness).  0 means no change.
+
+    Arguments:
+    - red:    The amount to alter the red brightness level
+    - green:  The amount to alter the green brightness level
+    - blue:   The amount to alter the blue brightness level
+    - updateScreen:   Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    _zoomer.setBrightness(red, green, blue)
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setZoomerContrast(red=0, green=0, blue=0, updateScreen=True):
+    """Increases/Decreases the contrast level by the specified
+    increments.  Increments are floats ranging from -1 (grey/no
+    contrast) to 1 (white/back/100% contrast).  0 means no change.
+
+    Arguments:
+    - red:    The amount to alter the red contrast level
+    - green:  The amount to alter the green contrast level
+    - blue:   The amount to alter the blue contrast level
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    _zoomer.setContrast(red, green, blue)
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setMagnifierObjectSize(magProperty, size, updateScreen=True):
+    """Sets the specified magnifier property to the specified size.
+
+    Arguments:
+    - magProperty:   The property to set (as a string)
+    - size:          The size to apply
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    bonobo.pbclient_set_long(_magnifierPBag, magProperty, size)
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setZoomerObjectSize(magProperty, size, updateScreen=True):
+    """Sets the specified zoomer property to the specified size.
+
+    Arguments:
+    - magProperty:   The property to set (as a string)
+    - size:          The size to apply
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    bonobo.pbclient_set_long(_zoomerPBag, magProperty, size)
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setZoomerObjectColor(magProperty, colorSetting, updateScreen=True):
+    """Sets the specified zoomer property to the specified color.
+
+    Arguments:
+    - magProperty:  The property to set (as a string)
+    - colorSetting: The Orca color setting to apply
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    colorPreference = gtk.gdk.color_parse(colorSetting)
+
+    # Convert the colorPreference string to something we can use.
+    # The main issue here is that the color preferences are saved
+    # as 4 byte values per color.  We only need 2 bytes, so we
+    # get rid of the bottom 8 bits.
+    #
+    colorPreference.red   = colorPreference.red   >> 8
+    colorPreference.blue  = colorPreference.blue  >> 8
+    colorPreference.green = colorPreference.green >> 8
+    colorString = "0x%02X%02X%02X" \
+                  % (colorPreference.red,
+                     colorPreference.green,
+                     colorPreference.blue)
+
+    toChange = _zoomerPBag.getValue(magProperty)
+    _zoomerPBag.setValue(magProperty,
+                         ORBit.CORBA.Any(toChange.typecode(),
+                                         long(colorString, 0)))
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setMagnifierObjectColor(magProperty, colorSetting, updateScreen=True):
+    """Sets the specified magnifier property to the specified color.
+
+    Arguments:
+    - magProperty:  The property to set (as a string)
+    - colorSetting: The Orca color setting to apply
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    colorPreference = gtk.gdk.color_parse(colorSetting)
+
+    # Convert the colorPreference string to something we can use.
+    # The main issue here is that the color preferences are saved
+    # as 4 byte values per color.  We only need 2 bytes, so we
+    # get rid of the bottom 8 bits.
+    #
+    colorPreference.red   = colorPreference.red   >> 8
+    colorPreference.blue  = colorPreference.blue  >> 8
+    colorPreference.green = colorPreference.green >> 8
+    colorString = "0x%02X%02X%02X" \
+                  % (colorPreference.red,
+                     colorPreference.green,
+                     colorPreference.blue)
+
+    toChange = _magnifierPBag.getValue(magProperty)
+    _magnifierPBag.setValue(magProperty,
+                            ORBit.CORBA.Any(toChange.typecode(),
+                                            long(colorString, 0)))
+    if updateScreen:
+        _zoomer.updatePointer()
+        _zoomer.markDirty(_roi)
+
+def setZoomerMagFactor(x, y, updateScreen=True):
+    """Sets the magnification level.
+
+    Arguments:
+    - x: The horizontal magnification level
+    - y: The vertical magnification level
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    _zoomer.setMagFactor(x, y)
+
+    # [[[TODO: JD - I think the screen is blanking out due to how gnome-mag
+    # does its thing.  See bug 503075. There's a bit of "jumpiness" with
+    # each increase in magnification.  At least we're keeping things on
+    # screen now, but we need to eliminate this issue.]]]
+    #
+    if updateScreen:
+        __updateROIDimensions()
+        newROI = GNOME.Magnifier.RectBounds(_minROIX,
+                                            _minROIY,
+                                            _minROIX + _roiWidth,
+                                            _minROIY + _roiHeight)
+        __setROI(newROI)
+        magnifyAccessible(None, orca_state.locusOfFocus)
+
+def setZoomerSmoothingType(smoothingType, updateScreen=True):
+    """Sets the zoomer's smoothing type.
+
+    Arguments:
+    - smoothingType: The type of smoothing to use
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    if smoothingType == settings.MAG_SMOOTHING_MODE_BILINEAR:
+        string = "bilinear"
+    else:
+        string = "None"
+
+    try:
+        bonobo.pbclient_set_string(_zoomerPBag, "smoothing-type", string)
+    except:
+        pass
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def setZoomerColorFilter(colorFilter, updateScreen=True):
+    """Sets the zoomer's color filter.
+
+    Arguments:
+    - colorFilter: The color filter to apply
+    - updateScreen:  Whether or not to update the screen
+    """
+
+    if not _initialized:
+        return
+
+    if colorFilter == settings.MAG_COLOR_FILTERING_MODE_SATURATE_RED:
+        toApply = _zoomer.COLORBLIND_FILTER_T_SELECTIVE_SATURATE_RED
+    elif colorFilter == settings.MAG_COLOR_FILTERING_MODE_SATURATE_GREEN:
+        toApply = _zoomer.COLORBLIND_FILTER_T_SELECTIVE_SATURATE_GREEN
+    elif colorFilter == settings.MAG_COLOR_FILTERING_MODE_SATURATE_BLUE:
+        toApply = _zoomer.COLORBLIND_FILTER_T_SELECTIVE_SATURATE_BLUE
+    elif colorFilter == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_RED:
+        toApply = _zoomer.COLORBLIND_FILTER_T_SELECTIVE_DESSATURATE_RED
+    elif colorFilter == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_GREEN:
+        toApply = _zoomer.COLORBLIND_FILTER_T_SELECTIVE_DESSATURATE_GREEN
+    elif colorFilter == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_BLUE:
+        toApply = _zoomer.COLORBLIND_FILTER_T_SELECTIVE_DESSATURATE_BLUE
+    elif colorFilter == settings.MAG_COLOR_FILTERING_MODE_NEGATIVE_HUE_SHIFT:
+        toApply = _zoomer.COLORBLIND_FILTER_T_HUE_SHIFT_NEGATIVE
+    elif colorFilter == settings.MAG_COLOR_FILTERING_MODE_POSITIVE_HUE_SHIFT:
+        toApply = _zoomer.COLORBLIND_FILTER_T_HUE_SHIFT_POSITIVE
+    else:
+        toApply = _zoomer.COLORBLIND_FILTER_T_NO_FILTER
+
+    colorFilter = _zoomerPBag.getValue("color-blind-filter")
+    _zoomerPBag.setValue(
+         "color-blind-filter",
+         ORBit.CORBA.Any(
+             colorFilter.typecode(),
+             toApply))
+
+    if updateScreen:
+        _zoomer.markDirty(_roi)
+
+def updateMouseTracking(newMode):
+    """Updates the mouse tracking mode.
+
+    Arguments:
+    -newMode: The new mode to use.
+    """
+
+    global _mouseTracking
+    _mouseTracking = newMode
+
+def updateControlTracking(newMode):
+    """Updates the control tracking mode.
+
+    Arguments:
+    -newMode: The new mode to use.
+    """
+
+    global _controlTracking
+    _controlTracking = newMode
+
+def updateTextTracking(newMode):
+    """Updates the text tracking mode.
+
+    Arguments:
+    -newMode: The new mode to use.
+    """
+
+    global _textTracking
+    _textTracking = newMode
+
+def updateEdgeMargin(amount):
+    """Updates the edge margin
+
+    Arguments:
+    -newMode: The new margin to use, in pixels.
+    """
+
+    global _edgeMargin
+    _edgeMargin = amount
+
+def finishLiveUpdating():
+    """Restores things that were altered via a live update."""
+
+    global _liveUpdatingMagnifier
+    global _mouseTracking
+    global _controlTracking
+    global _textTracking
+    global _edgeMargin
+
+    _liveUpdatingMagnifier = False
+    _mouseTracking = settings.magMouseTrackingMode
+    _controlTracking = settings.magControlTrackingMode
+    _textTracking = settings.magTextTrackingMode
+    _edgeMargin = settings.magEdgeMargin
+
+    if settings.enableMagnifier:
+        setupMagnifier(settings.magZoomerType)
+        init()
+    else:
+        shutdown()
Index: src/orca/orca-setup.glade
===================================================================
--- src/orca/orca-setup.glade	(revision 3359)
+++ src/orca/orca-setup.glade	(working copy)
@@ -1,4778 +1,4015 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
-
-<widget class="GtkDialog" id="orcaSetupWindow">
-  <property name="title" translatable="yes">Orca Preferences</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <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>
-  <property name="has_separator">False</property>
-  <signal name="destroy" handler="windowDestroyed" last_modification_time="Tue, 12 Sep 2006 19:10:48 GMT"/>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">3</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="helpButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <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>
-	      <property name="response_id">-11</property>
-	      <signal name="clicked" handler="helpButtonClicked" last_modification_time="Fri, 05 May 2006 19:24:41 GMT"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="applyButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <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>
-	      <property name="response_id">-10</property>
-	      <signal name="clicked" handler="applyButtonClicked" last_modification_time="Thu, 07 Sep 2006 15:30:40 GMT"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="cancelButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <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>
-	      <property name="response_id">-6</property>
-	      <signal name="clicked" handler="cancelButtonClicked" last_modification_time="Thu, 07 Sep 2006 15:29:41 GMT"/>
-	    </widget>
-	  </child>
-
-	  <child>
-	    <widget class="GtkButton" id="okButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <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>
-	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="okButtonClicked" last_modification_time="Thu, 07 Sep 2006 15:28:21 GMT"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkVBox" id="mainvbox">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">12</property>
-
-	  <child>
-	    <widget class="GtkNotebook" id="notebook">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="show_tabs">True</property>
-	      <property name="show_border">True</property>
-	      <property name="tab_pos">GTK_POS_TOP</property>
-	      <property name="scrollable">False</property>
-	      <property name="enable_popup">False</property>
-
-	      <child>
-		<widget class="GtkVBox" id="generalVBox">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkFrame" id="frame9">
-		      <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="GtkAlignment" id="alignment47">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">12</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox22">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="generalDesktopButton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Desktop</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="keyboardLayoutChanged" last_modification_time="Mon, 13 Nov 2006 15:56:51 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="generalLaptopButton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Laptop</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">generalDesktopButton</property>
-				  <signal name="toggled" handler="keyboardLayoutChanged" last_modification_time="Mon, 13 Nov 2006 15:57:12 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="generalKeyboardLabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Keyboard Layout&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>
-			  <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>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="showMainWindowCheckButton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Show Orca _main window</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>
-		      <signal name="toggled" handler="showMainWindowChecked" last_modification_time="Mon, 02 Oct 2006 18:23:03 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="confirmQuitCheckButton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Quit Orca _without confirmation</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="confirmQuitChecked" last_modification_time="Mon, 02 Apr 2007 16:42:11 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="disableKeyGrabCheckButton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Disable gksu _keyboard grab</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="disableKeyGrabChecked" last_modification_time="Wed, 03 Jan 2007 16:37:07 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="presentTooltipsCheckButton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Present tooltips</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="presentTooltipsChecked" last_modification_time="Wed, 09 May 2007 00:18:20 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="generalTabLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">General</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox20">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="speechSupportCheckbutton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">_Enable speech</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>
-		      <signal name="toggled" handler="speechSupportChecked" last_modification_time="Thu, 04 May 2006 15:44:16 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="speechVbox">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">6</property>
-
-		      <child>
-			<widget class="GtkTable" id="speechTable">
-			  <property name="visible">True</property>
-			  <property name="n_rows">8</property>
-			  <property name="n_columns">2</property>
-			  <property name="homogeneous">False</property>
-			  <property name="row_spacing">3</property>
-			  <property name="column_spacing">3</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="speechSystemsLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Speech _system:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">speechSystems</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="speechSystems" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkComboBox" id="speechSystems">
-			      <property name="visible">True</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="focus_on_click">True</property>
-			      <accessibility>
-				<atkrelation target="speechSystemsLabel" type="labelled-by"/>
-			      </accessibility>
-			      <signal name="changed" handler="speechSystemsChanged" last_modification_time="Fri, 28 Apr 2006 18:47:56 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">0</property>
-			      <property name="bottom_attach">1</property>
-			      <property name="x_padding">3</property>
-			      <property name="y_padding">3</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="speechServersLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Speech synthesi_zer:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">speechServers</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="speechServers" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="voiceSettingsLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Voice settings:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">voiceTypes</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="voiceTypes" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="pitchLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Pi_tch:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">3</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">pitchScale</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="pitchScale" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHScale" id="pitchScale">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="draw_value">True</property>
-			      <property name="value_pos">GTK_POS_RIGHT</property>
-			      <property name="digits">1</property>
-			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			      <property name="inverted">False</property>
-			      <property name="adjustment">5 0 9 0.10000000149 0 0</property>
-			      <accessibility>
-				<atkrelation target="pitchLabel" type="labelled-by"/>
-			      </accessibility>
-			      <signal name="value_changed" handler="pitchValueChanged" last_modification_time="Wed, 26 Apr 2006 18:48:18 GMT"/>
-			      <accelerator key="t" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">5</property>
-			      <property name="bottom_attach">6</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="volumeLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Vo_lume:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.170000001788</property>
-			      <property name="xpad">3</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">volumeScale</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="volumeScale" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">6</property>
-			      <property name="bottom_attach">7</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkComboBox" id="speechServers">
-			      <property name="visible">True</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="focus_on_click">True</property>
-			      <accessibility>
-				<atkrelation target="speechServersLabel" type="labelled-by"/>
-			      </accessibility>
-			      <signal name="changed" handler="speechServersChanged" last_modification_time="Fri, 28 Apr 2006 18:50:26 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">1</property>
-			      <property name="bottom_attach">2</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkComboBox" id="voiceTypes">
-			      <property name="visible">True</property>
-			      <property name="items" translatable="yes">Default
+  <widget class="GtkDialog" id="orcaSetupWindow">
+    <property name="title" translatable="yes">Orca Preferences</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+    <property name="has_separator">False</property>
+    <signal name="destroy" handler="windowDestroyed"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox1">
+        <property name="visible">True</property>
+        <property name="spacing">3</property>
+        <child>
+          <widget class="GtkVBox" id="mainvbox">
+            <property name="visible">True</property>
+            <property name="border_width">6</property>
+            <property name="spacing">12</property>
+            <child>
+              <widget class="GtkNotebook" id="notebook">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <child>
+                  <widget class="GtkVBox" id="generalVBox">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <child>
+                      <widget class="GtkFrame" id="frame9">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment47">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox22">
+                                <property name="visible">True</property>
+                                <property name="border_width">3</property>
+                                <child>
+                                  <widget class="GtkRadioButton" id="generalDesktopButton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Desktop</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="keyboardLayoutChanged"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="generalLaptopButton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_Laptop</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">generalDesktopButton</property>
+                                    <signal name="toggled" handler="keyboardLayoutChanged"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="generalKeyboardLabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Keyboard Layout&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="showMainWindowCheckButton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Show Orca _main window</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="showMainWindowChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="confirmQuitCheckButton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Quit Orca _without confirmation</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="confirmQuitChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="disableKeyGrabCheckButton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Disable gksu _keyboard grab</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="disableKeyGrabChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="presentTooltipsCheckButton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">_Present tooltips</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="presentTooltipsChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="generalTabLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">General</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox20">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="speechSupportCheckbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">_Enable speech</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="speechSupportChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkVBox" id="speechVbox">
+                        <property name="visible">True</property>
+                        <property name="border_width">12</property>
+                        <property name="spacing">6</property>
+                        <child>
+                          <widget class="GtkTable" id="speechTable">
+                            <property name="visible">True</property>
+                            <property name="n_rows">8</property>
+                            <property name="n_columns">2</property>
+                            <property name="column_spacing">3</property>
+                            <property name="row_spacing">3</property>
+                            <child>
+                              <widget class="GtkLabel" id="rateLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="yalign">0.75</property>
+                                <property name="xpad">3</property>
+                                <property name="label" translatable="yes">_Rate:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="mnemonic_widget">rateScale</property>
+                                <accessibility>
+                                  <atkrelation target="rateScale" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                                <property name="x_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHScale" id="volumeScale">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">9 0 9 0.10000000149 0 0</property>
+                                <property name="value_pos">GTK_POS_RIGHT</property>
+                                <accessibility>
+                                  <atkrelation target="volumeLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="volumeValueChanged"/>
+                                <accelerator key="l" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">6</property>
+                                <property name="bottom_attach">7</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment48">
+                                <property name="visible">True</property>
+                                <property name="top_padding">12</property>
+                                <child>
+                                  <widget class="GtkHScale" id="rateScale">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="adjustment">50 0 99 1 0 0</property>
+                                    <property name="digits">0</property>
+                                    <property name="value_pos">GTK_POS_RIGHT</property>
+                                    <accessibility>
+                                      <atkrelation target="rateLabel" type="labelled-by"/>
+                                    </accessibility>
+                                    <signal name="value_changed" handler="rateValueChanged"/>
+                                    <accelerator key="r" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
+                                  </widget>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">4</property>
+                                <property name="bottom_attach">5</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="speechFamilies">
+                                <property name="visible">True</property>
+                                <accessibility>
+                                  <atkrelation target="familyLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="changed" handler="speechFamiliesChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="familyLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_Person:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="mnemonic_widget">speechFamilies</property>
+                                <accessibility>
+                                  <atkrelation target="speechFamilies" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">3</property>
+                                <property name="bottom_attach">4</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHBox" id="hbox35">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment34">
+                                    <property name="visible">True</property>
+                                    <property name="top_padding">12</property>
+                                    <child>
+                                      <widget class="GtkFrame" id="frame5">
+                                        <property name="visible">True</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment32">
+                                            <property name="visible">True</property>
+                                            <property name="left_padding">12</property>
+                                            <child>
+                                              <widget class="GtkVBox" id="vbox16">
+                                                <property name="visible">True</property>
+                                                <property name="border_width">3</property>
+                                                <child>
+                                                  <widget class="GtkRadioButton" id="noneButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">_None</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal name="toggled" handler="punctuationLevelChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkRadioButton" id="someButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">So_me</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <property name="group">noneButton</property>
+                                                    <signal name="toggled" handler="punctuationLevelChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkRadioButton" id="mostButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">M_ost</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <property name="group">noneButton</property>
+                                                    <signal name="toggled" handler="punctuationLevelChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">2</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkRadioButton" id="allButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">_All</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <property name="group">noneButton</property>
+                                                    <signal name="toggled" handler="punctuationLevelChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">3</property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="punctuationLabel">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Punctuation Level&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="type">label_item</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment35">
+                                    <property name="visible">True</property>
+                                    <property name="top_padding">12</property>
+                                    <child>
+                                      <widget class="GtkFrame" id="frame6">
+                                        <property name="visible">True</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment33">
+                                            <property name="visible">True</property>
+                                            <property name="left_padding">12</property>
+                                            <child>
+                                              <widget class="GtkVBox" id="vbox17">
+                                                <property name="visible">True</property>
+                                                <property name="border_width">3</property>
+                                                <child>
+                                                  <widget class="GtkRadioButton" id="speechBriefButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">Brie_f</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal name="toggled" handler="speechVerbosityChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkRadioButton" id="speechVerboseButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">Ver_bose</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <property name="group">speechBriefButton</property>
+                                                    <signal name="toggled" handler="speechVerbosityChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="speechVerbosityLabel">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Verbosity&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="type">label_item</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment45">
+                                    <property name="visible">True</property>
+                                    <property name="top_padding">12</property>
+                                    <child>
+                                      <widget class="GtkFrame" id="frame8">
+                                        <property name="visible">True</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment46">
+                                            <property name="visible">True</property>
+                                            <property name="left_padding">12</property>
+                                            <child>
+                                              <widget class="GtkVBox" id="vbox21">
+                                                <property name="visible">True</property>
+                                                <property name="border_width">3</property>
+                                                <child>
+                                                  <widget class="GtkRadioButton" id="cellSpeechButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">Speak current _cell</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal name="toggled" handler="tableSpeechChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkRadioButton" id="rowSpeechButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">Speak current ro_w</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="active">True</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <property name="group">cellSpeechButton</property>
+                                                    <signal name="toggled" handler="tableSpeechChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="label24">
+                                            <property name="visible">True</property>
+                                            <property name="label" translatable="yes">&lt;b&gt;Table Row Speech&lt;/b&gt;</property>
+                                            <property name="use_markup">True</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="type">label_item</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                              <packing>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">7</property>
+                                <property name="bottom_attach">8</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="voiceTypes">
+                                <property name="visible">True</property>
+                                <property name="items" translatable="yes">Default
 Uppercase
 Hyperlink</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="focus_on_click">True</property>
-			      <accessibility>
-				<atkrelation target="voiceSettingsLabel" type="labelled-by"/>
-			      </accessibility>
-			      <signal name="changed" handler="voiceTypesChanged" last_modification_time="Fri, 28 Apr 2006 18:55:04 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">2</property>
-			      <property name="bottom_attach">3</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="hbox35">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment34">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">12</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkFrame" id="frame5">
-				      <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="GtkAlignment" id="alignment32">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">12</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkVBox" id="vbox16">
-					      <property name="border_width">3</property>
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">0</property>
-
-					      <child>
-						<widget class="GtkRadioButton" id="noneButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">_None</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="punctuationLevelChanged" last_modification_time="Thu, 27 Apr 2006 14:59:34 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkRadioButton" id="someButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">So_me</property>
-						  <property name="use_underline">True</property>
-						  <property name="relief">GTK_RELIEF_NORMAL</property>
-						  <property name="focus_on_click">True</property>
-						  <property name="active">False</property>
-						  <property name="inconsistent">False</property>
-						  <property name="draw_indicator">True</property>
-						  <property name="group">noneButton</property>
-						  <signal name="toggled" handler="punctuationLevelChanged" last_modification_time="Thu, 27 Apr 2006 14:59:42 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkRadioButton" id="mostButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">M_ost</property>
-						  <property name="use_underline">True</property>
-						  <property name="relief">GTK_RELIEF_NORMAL</property>
-						  <property name="focus_on_click">True</property>
-						  <property name="active">False</property>
-						  <property name="inconsistent">False</property>
-						  <property name="draw_indicator">True</property>
-						  <property name="group">noneButton</property>
-						  <signal name="toggled" handler="punctuationLevelChanged" last_modification_time="Thu, 22 Jun 2006 14:15:29 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkRadioButton" id="allButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">_All</property>
-						  <property name="use_underline">True</property>
-						  <property name="relief">GTK_RELIEF_NORMAL</property>
-						  <property name="focus_on_click">True</property>
-						  <property name="active">False</property>
-						  <property name="inconsistent">False</property>
-						  <property name="draw_indicator">True</property>
-						  <property name="group">noneButton</property>
-						  <signal name="toggled" handler="punctuationLevelChanged" last_modification_time="Thu, 27 Apr 2006 14:59:51 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="punctuationLabel">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">&lt;b&gt;Punctuation Level&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>
-					  <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>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment35">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">12</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkFrame" id="frame6">
-				      <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="GtkAlignment" id="alignment33">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">12</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkVBox" id="vbox17">
-					      <property name="border_width">3</property>
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">0</property>
-
-					      <child>
-						<widget class="GtkRadioButton" id="speechBriefButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Brie_f</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="speechVerbosityChanged" last_modification_time="Thu, 27 Apr 2006 14:44:54 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkRadioButton" id="speechVerboseButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Ver_bose</property>
-						  <property name="use_underline">True</property>
-						  <property name="relief">GTK_RELIEF_NORMAL</property>
-						  <property name="focus_on_click">True</property>
-						  <property name="active">False</property>
-						  <property name="inconsistent">False</property>
-						  <property name="draw_indicator">True</property>
-						  <property name="group">speechBriefButton</property>
-						  <signal name="toggled" handler="speechVerbosityChanged" last_modification_time="Thu, 27 Apr 2006 14:45:04 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="speechVerbosityLabel">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">&lt;b&gt;Verbosity&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>
-					  <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>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkAlignment" id="alignment45">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">12</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">0</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkFrame" id="frame8">
-				      <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="GtkAlignment" id="alignment46">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">12</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkVBox" id="vbox21">
-					      <property name="border_width">3</property>
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">0</property>
-
-					      <child>
-						<widget class="GtkRadioButton" id="cellSpeechButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Speak current _cell</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="tableSpeechChanged" last_modification_time="Wed, 21 Jun 2006 20:44:01 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkRadioButton" id="rowSpeechButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="label" translatable="yes">Speak current ro_w</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>
-						  <property name="group">cellSpeechButton</property>
-						  <signal name="toggled" handler="tableSpeechChanged" last_modification_time="Wed, 21 Jun 2006 20:44:22 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
-
-				      <child>
-					<widget class="GtkLabel" id="label24">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">&lt;b&gt;Table Row Speech&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>
-					  <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>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">7</property>
-			      <property name="bottom_attach">8</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="familyLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Person:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">speechFamilies</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="speechFamilies" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options"></property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkComboBox" id="speechFamilies">
-			      <property name="visible">True</property>
-			      <property name="add_tearoffs">False</property>
-			      <property name="focus_on_click">True</property>
-			      <accessibility>
-				<atkrelation target="familyLabel" type="labelled-by"/>
-			      </accessibility>
-			      <signal name="changed" handler="speechFamiliesChanged" last_modification_time="Fri, 28 Apr 2006 18:55:50 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">3</property>
-			      <property name="bottom_attach">4</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkAlignment" id="alignment48">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">1</property>
-			      <property name="yscale">1</property>
-			      <property name="top_padding">12</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">0</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkHScale" id="rateScale">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="draw_value">True</property>
-				  <property name="value_pos">GTK_POS_RIGHT</property>
-				  <property name="digits">0</property>
-				  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-				  <property name="inverted">False</property>
-				  <property name="adjustment">50 0 99 1 0 0</property>
-				  <accessibility>
-				    <atkrelation target="rateLabel" type="labelled-by"/>
-				  </accessibility>
-				  <signal name="value_changed" handler="rateValueChanged" last_modification_time="Wed, 26 Apr 2006 18:48:00 GMT"/>
-				  <accelerator key="r" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
-				</widget>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">4</property>
-			      <property name="bottom_attach">5</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkHScale" id="volumeScale">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="draw_value">True</property>
-			      <property name="value_pos">GTK_POS_RIGHT</property>
-			      <property name="digits">1</property>
-			      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-			      <property name="inverted">False</property>
-			      <property name="adjustment">9 0 9 0.10000000149 0 0</property>
-			      <accessibility>
-				<atkrelation target="volumeLabel" type="labelled-by"/>
-			      </accessibility>
-			      <signal name="value_changed" handler="volumeValueChanged" last_modification_time="Wed, 26 Apr 2006 18:48:39 GMT"/>
-			      <accelerator key="l" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">1</property>
-			      <property name="right_attach">2</property>
-			      <property name="top_attach">6</property>
-			      <property name="bottom_attach">7</property>
-			      <property name="x_options">fill</property>
-			      <property name="y_options">fill</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="rateLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Rate:</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">1</property>
-			      <property name="yalign">0.75</property>
-			      <property name="xpad">3</property>
-			      <property name="ypad">0</property>
-			      <property name="mnemonic_widget">rateScale</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="rateScale" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="left_attach">0</property>
-			      <property name="right_attach">1</property>
-			      <property name="top_attach">4</property>
-			      <property name="bottom_attach">5</property>
-			      <property name="x_options">fill</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox43">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">80</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="speechProgressBarCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Speak progress bar _updates</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>
-			  <signal name="toggled" handler="speechProgressBarChecked" last_modification_time="Mon, 18 Jun 2007 16:59:36 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkHBox" id="speakUpdateIntervalHBox">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">3</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="speakProgressBarLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Update interval:</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">speakProgressBarSpinButton</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="speakProgressBarSpinButton" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkSpinButton" id="speakProgressBarSpinButton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="climb_rate">1</property>
-			      <property name="digits">0</property>
-			      <property name="numeric">True</property>
-			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-			      <property name="snap_to_ticks">False</property>
-			      <property name="wrap">False</property>
-			      <property name="adjustment">10 1 9999 1 10 10</property>
-			      <accessibility>
-				<atkrelation target="speakProgressBarUnitsLabel" type="labelled-by"/>
-				<atkrelation target="speakProgressBarLabel" type="labelled-by"/>
-			      </accessibility>
-			      <signal name="value_changed" handler="speakProgressBarValueChanged" last_modification_time="Thu, 14 Jun 2007 15:09:00 GMT"/>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="speakProgressBarUnitsLabel">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">seconds</property>
-			      <property name="use_underline">False</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			      <accessibility>
-				<atkrelation target="speakProgressBarSpinButton" type="label-for"/>
-			      </accessibility>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="speechIndentationCheckbutton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Speak _indentation and justification</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="speechIndentationChecked" last_modification_time="Mon, 19 Jun 2006 15:46:40 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="speakBlankLinesCheckButton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Speak blank lines</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>
-		      <signal name="toggled" handler="speakBlankLinesChecked" last_modification_time="Wed, 01 Nov 2006 01:09:29 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox39">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">3</property>
-
-		      <child>
-			<widget class="GtkLabel" id="sayAllLabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes" comments="Translators: Say all by refers to the way that Orca will say (speak) an amount of text -- in particular, where Orca where insert pauses. There are currently two choices (supplied by a combo box to the right of this label): say all by sentence and  say all by line.  If Orca were speaking a work of fiction, it's probably best to do say all by sentence so it sound more natural. If Orca were speaking something like a page of computer commands, doing a say all by line would work better.">Say All B_y:</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">sayAllStyle</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="sayAllStyle" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkComboBox" id="sayAllStyle">
-			  <property name="visible">True</property>
-			  <property name="items" translatable="yes">Line
+                                <accessibility>
+                                  <atkrelation target="voiceSettingsLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="changed" handler="voiceTypesChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="speechServers">
+                                <property name="visible">True</property>
+                                <accessibility>
+                                  <atkrelation target="speechServersLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="changed" handler="speechServersChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="volumeLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="yalign">0.17000000178813934</property>
+                                <property name="xpad">3</property>
+                                <property name="label" translatable="yes">Vo_lume:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="mnemonic_widget">volumeScale</property>
+                                <accessibility>
+                                  <atkrelation target="volumeScale" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">6</property>
+                                <property name="bottom_attach">7</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkHScale" id="pitchScale">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">5 0 9 0.10000000149 0 0</property>
+                                <property name="value_pos">GTK_POS_RIGHT</property>
+                                <accessibility>
+                                  <atkrelation target="pitchLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="pitchValueChanged"/>
+                                <accelerator key="t" modifiers="GDK_MOD1_MASK" signal="grab_focus"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options">GTK_FILL</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="pitchLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="xpad">3</property>
+                                <property name="label" translatable="yes">Pi_tch:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="mnemonic_widget">pitchScale</property>
+                                <accessibility>
+                                  <atkrelation target="pitchScale" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">5</property>
+                                <property name="bottom_attach">6</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="voiceSettingsLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">_Voice settings:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="mnemonic_widget">voiceTypes</property>
+                                <accessibility>
+                                  <atkrelation target="voiceTypes" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">2</property>
+                                <property name="bottom_attach">3</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="speechServersLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Speech synthesi_zer:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="mnemonic_widget">speechServers</property>
+                                <accessibility>
+                                  <atkrelation target="speechServers" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="top_attach">1</property>
+                                <property name="bottom_attach">2</property>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkComboBox" id="speechSystems">
+                                <property name="visible">True</property>
+                                <accessibility>
+                                  <atkrelation target="speechSystemsLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="changed" handler="speechSystemsChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="right_attach">2</property>
+                                <property name="y_options">GTK_FILL</property>
+                                <property name="x_padding">3</property>
+                                <property name="y_padding">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="speechSystemsLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Speech _system:</property>
+                                <property name="use_underline">True</property>
+                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                <property name="mnemonic_widget">speechSystems</property>
+                                <accessibility>
+                                  <atkrelation target="speechSystems" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="x_options">GTK_FILL</property>
+                                <property name="y_options"></property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox43">
+                        <property name="visible">True</property>
+                        <property name="spacing">80</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="speechProgressBarCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Speak progress bar _updates</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="speechProgressBarChecked"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="speakUpdateIntervalHBox">
+                            <property name="visible">True</property>
+                            <property name="spacing">3</property>
+                            <child>
+                              <widget class="GtkLabel" id="speakProgressBarLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Update interval:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">speakProgressBarSpinButton</property>
+                                <accessibility>
+                                  <atkrelation target="speakProgressBarSpinButton" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkSpinButton" id="speakProgressBarSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">10 1 9999 1 10 10</property>
+                                <property name="climb_rate">1</property>
+                                <property name="numeric">True</property>
+                                <accessibility>
+                                  <atkrelation target="speakProgressBarUnitsLabel" type="labelled-by"/>
+                                  <atkrelation target="speakProgressBarLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="speakProgressBarValueChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="speakProgressBarUnitsLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">seconds</property>
+                                <accessibility>
+                                  <atkrelation target="speakProgressBarSpinButton" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="speechIndentationCheckbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Speak _indentation and justification</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="speechIndentationChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="speakBlankLinesCheckButton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Speak blank lines</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="speakBlankLinesChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox39">
+                        <property name="visible">True</property>
+                        <property name="spacing">3</property>
+                        <child>
+                          <widget class="GtkLabel" id="sayAllLabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes" comments="Translators: Say all by refers to the way that Orca will say (speak) an amount of text -- in particular, where Orca where insert pauses. There are currently two choices (supplied by a combo box to the right of this label): say all by sentence and  say all by line.  If Orca were speaking a work of fiction, it's probably best to do say all by sentence so it sound more natural. If Orca were speaking something like a page of computer commands, doing a say all by line would work better.">Say All B_y:</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">sayAllStyle</property>
+                            <accessibility>
+                              <atkrelation target="sayAllStyle" type="label-for"/>
+                            </accessibility>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkComboBox" id="sayAllStyle">
+                            <property name="visible">True</property>
+                            <property name="items" translatable="yes">Line
 Sentence</property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="focus_on_click">True</property>
-			  <accessibility>
-			    <atkrelation target="sayAllLabel" type="labelled-by"/>
-			  </accessibility>
-			  <signal name="changed" handler="sayAllStyleChanged" last_modification_time="Mon, 16 Apr 2007 17:10:02 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">3</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">3</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="speechTabLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Speech</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="brailleVbox">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">12</property>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox23">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="brailleSupportCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable Braille _support</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>
-			  <signal name="toggled" handler="brailleSupportChecked" last_modification_time="Thu, 20 Apr 2006 15:27:27 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="brailleMonitorCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable Braille _monitor</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="brailleMonitorChecked" last_modification_time="Thu, 20 Apr 2006 15:27:39 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkCheckButton" id="abbrevRolenames">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Abbreviated role names</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="abbrevRolenamesChecked" last_modification_time="Thu, 27 Apr 2006 14:39:01 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkFrame" id="frame7">
-		      <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="GtkAlignment" id="alignment36">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">12</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox18">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="brailleBriefButton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Brie_f</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="brailleVerbosityChanged" last_modification_time="Thu, 27 Apr 2006 14:44:24 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="brailleVerboseButton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Ver_bose</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">brailleBriefButton</property>
-				  <signal name="toggled" handler="brailleVerbosityChanged" last_modification_time="Thu, 27 Apr 2006 14:44:41 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="brailleVerbosityLabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Verbosity&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>
-			  <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>
-			</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="brailleSelectionFrame">
-		      <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="GtkAlignment" id="alignment57">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">12</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox28">
-			      <property name="border_width">3</property>
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="brailleSelectionNoneButton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_None</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="brailleSelectionChanged" last_modification_time="Thu, 28 Jun 2007 20:00:47 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="brailleSelection7Button">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Dot _7</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">brailleSelectionNoneButton</property>
-				  <signal name="toggled" handler="brailleSelectionChanged" last_modification_time="Thu, 28 Jun 2007 20:01:03 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="brailleSelection8Button">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Dot _8</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">brailleSelectionNoneButton</property>
-				  <signal name="toggled" handler="brailleSelectionChanged" last_modification_time="Thu, 28 Jun 2007 20:01:28 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkRadioButton" id="brailleSelectionBothButton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Dots 7 an_d 8</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				  <property name="group">brailleSelectionNoneButton</property>
-				  <signal name="toggled" handler="brailleSelectionChanged" last_modification_time="Thu, 28 Jun 2007 20:01:43 GMT"/>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label28">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Selection Indicator&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>
-			  <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>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="brailleTabLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Braille</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="keyechoVbox">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="keyEchoCheckbutton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Enable _key echo</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="keyEchoChecked" last_modification_time="Thu, 20 Apr 2006 15:28:03 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment11">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="printableCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable _alphanumeric and punctuation keys</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="printableKeysChecked" last_modification_time="Fri, 21 Apr 2006 17:16:43 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment12">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="modifierCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable _modifier keys</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="modifierKeysChecked" last_modification_time="Thu, 20 Apr 2006 15:30:12 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment13">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="lockingCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable lockin_g keys</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="lockingKeysChecked" last_modification_time="Thu, 20 Apr 2006 15:30:19 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment14">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="functionCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable _function keys</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="functionKeysChecked" last_modification_time="Thu, 20 Apr 2006 15:30:26 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment15">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="actionCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable ac_tion keys</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="actionKeysChecked" last_modification_time="Thu, 20 Apr 2006 15:30:34 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment59">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">12</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="navigationCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable _navigation keys</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="navigationKeysChecked" last_modification_time="Tue, 30 Oct 2007 20:11:26 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment49">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">1</property>
-		      <property name="yscale">1</property>
-		      <property name="top_padding">12</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkCheckButton" id="echoByWordCheckbutton">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Enable echo by _word</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="echoByWordChecked" last_modification_time="Thu, 20 Apr 2006 15:29:51 GMT"/>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="keyEchoTabLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Key Echo</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox19">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="magnifierSupportCheckbutton">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Enable _magnifier</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="magnifierSupportChecked" last_modification_time="Thu, 04 May 2006 15:44:50 GMT"/>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkTable" id="magnifierTable">
-		      <property name="border_width">12</property>
-		      <property name="visible">True</property>
-		      <property name="n_rows">5</property>
-		      <property name="n_columns">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="row_spacing">3</property>
-		      <property name="column_spacing">24</property>
-
-		      <child>
-			<widget class="GtkAlignment" id="magCursorLabelAlignment">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">12</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkFrame" id="magCursorSettingsFrame">
-			      <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="GtkAlignment" id="alignment39">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">12</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkTable" id="table7">
-				      <property name="border_width">3</property>
-				      <property name="visible">True</property>
-				      <property name="n_rows">2</property>
-				      <property name="n_columns">2</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">0</property>
-				      <property name="column_spacing">0</property>
-
-				      <child>
-					<widget class="GtkCheckButton" id="magCursorOnOffCheckButton">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Enable c_ursor</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="magCursorOnOffChecked" last_modification_time="Wed, 03 May 2006 15:26:53 GMT"/>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="magCursorSizeCheckButton">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Custom siz_e</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="magCursorExplicitSizeChecked" last_modification_time="Wed, 03 May 2006 15:29:51 GMT"/>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment50">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">72</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox37">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">3</property>
-
-					      <child>
-						<widget class="GtkLabel" id="magCursorColorLabel">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Color:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_RIGHT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">1</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">magCursorColorButton</property>
-						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-						  <property name="width_chars">-1</property>
-						  <property name="single_line_mode">False</property>
-						  <property name="angle">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkColorButton" id="magCursorColorButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="use_alpha">False</property>
-						  <property name="focus_on_click">True</property>
-						  <signal name="color_set" handler="magCursorColorSet" last_modification_time="Wed, 03 May 2006 15:34:37 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<placeholder/>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment51">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">72</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox38">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">3</property>
-
-					      <child>
-						<widget class="GtkLabel" id="magCursorSizeLabel">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">_Width:</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">magCursorSizeSpinButton</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="magCursorSizeSpinButton" type="label-for"/>
-						  </accessibility>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkSpinButton" id="magCursorSizeSpinButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="climb_rate">1</property>
-						  <property name="digits">0</property>
-						  <property name="numeric">True</property>
-						  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						  <property name="snap_to_ticks">False</property>
-						  <property name="wrap">False</property>
-						  <property name="adjustment">1 1 256 1 10 10</property>
-						  <accessibility>
-						    <atkrelation target="magCursorSizeUnitsLabel" type="labelled-by"/>
-						    <atkrelation target="magCursorSizeLabel" type="labelled-by"/>
-						  </accessibility>
-						  <signal name="value_changed" handler="magCursorSizeValueChanged" last_modification_time="Wed, 03 May 2006 15:31:48 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="magCursorSizeUnitsLabel">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">pixels</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-						  <property name="width_chars">-1</property>
-						  <property name="single_line_mode">False</property>
-						  <property name="angle">0</property>
-						  <accessibility>
-						    <atkrelation target="magCursorSizeSpinButton" type="label-for"/>
-						  </accessibility>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label19">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">&lt;b&gt;Cursor Settings&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>
-				  <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>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">0</property>
-			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="magCrossHairLabelAlignment">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">12</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkFrame" id="magCrossHairSettingsFrame">
-			      <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="GtkAlignment" id="alignment40">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">12</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkTable" id="table8">
-				      <property name="border_width">3</property>
-				      <property name="visible">True</property>
-				      <property name="n_rows">2</property>
-				      <property name="n_columns">2</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">0</property>
-				      <property name="column_spacing">0</property>
-
-				      <child>
-					<widget class="GtkCheckButton" id="magCrossHairOnOffCheckButton">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Enable cross-h_air</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="magCrossHairOnOffChecked" last_modification_time="Wed, 03 May 2006 15:36:39 GMT"/>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="magCrossHairClipCheckButton">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">Enable cross-hair cli_p</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="magCrossHairClipOnOffChecked" last_modification_time="Wed, 03 May 2006 15:37:49 GMT"/>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment52">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">48</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox33">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">3</property>
-
-					      <child>
-						<widget class="GtkLabel" id="magCrossHairSizeLabel">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Si_ze:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">magCrossHairSizeSpinButton</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="magCrossHairSizeSpinButton" type="label-for"/>
-						  </accessibility>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkSpinButton" id="magCrossHairSizeSpinButton">
-						  <property name="visible">True</property>
-						  <property name="can_focus">True</property>
-						  <property name="climb_rate">1</property>
-						  <property name="digits">0</property>
-						  <property name="numeric">True</property>
-						  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						  <property name="snap_to_ticks">False</property>
-						  <property name="wrap">False</property>
-						  <property name="adjustment">1 1 256 1 10 10</property>
-						  <accessibility>
-						    <atkrelation target="magCrossHairSizeUnitsLabel" type="labelled-by"/>
-						    <atkrelation target="magCrossHairSizeLabel" type="labelled-by"/>
-						  </accessibility>
-						  <signal name="value_changed" handler="magCrossHairSizeValueChanged" last_modification_time="Wed, 03 May 2006 15:39:23 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">True</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkLabel" id="magCrossHairSizeUnitsLabel">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">pixels</property>
-						  <property name="use_underline">False</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0.5</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-						  <property name="width_chars">-1</property>
-						  <property name="single_line_mode">False</property>
-						  <property name="angle">0</property>
-						  <accessibility>
-						    <atkrelation target="magCrossHairSizeSpinButton" type="label-for"/>
-						  </accessibility>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label20">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">&lt;b&gt;Cross-hair Settings&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>
-				  <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>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">1</property>
-			  <property name="bottom_attach">2</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment23">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">12</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkFrame" id="magZoomerSettingsFrame">
-			      <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="GtkAlignment" id="alignment41">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">12</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkTable" id="table5">
-				      <property name="border_width">6</property>
-				      <property name="visible">True</property>
-				      <property name="n_rows">3</property>
-				      <property name="n_columns">4</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">3</property>
-				      <property name="column_spacing">3</property>
-
-				      <child>
-					<widget class="GtkLabel" id="magZoomFactorLabel">
-					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">Scale _factor:</property>
-					  <property name="use_underline">True</property>
-					  <property name="use_markup">False</property>
-					  <property name="justify">GTK_JUSTIFY_LEFT</property>
-					  <property name="wrap">False</property>
-					  <property name="selectable">False</property>
-					  <property name="xalign">0</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xpad">0</property>
-					  <property name="ypad">0</property>
-					  <property name="mnemonic_widget">magZoomFactorSpinButton</property>
-					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					  <property name="width_chars">-1</property>
-					  <property name="single_line_mode">False</property>
-					  <property name="angle">0</property>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkSpinButton" id="magZoomFactorSpinButton">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="climb_rate">1</property>
-					  <property name="digits">2</property>
-					  <property name="numeric">False</property>
-					  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-					  <property name="snap_to_ticks">False</property>
-					  <property name="wrap">False</property>
-					  <property name="adjustment">1 1 32 0.25 10 10</property>
-					  <signal name="value_changed" handler="magZoomFactorValueChanged" last_modification_time="Wed, 03 May 2006 15:49:39 GMT"/>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkCheckButton" id="magInvertColorsCheckBox">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="label" translatable="yes">In_vert colors</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="magInvertColorsChecked" last_modification_time="Wed, 03 May 2006 15:59:57 GMT"/>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">1</property>
-					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options"></property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment60">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">25</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkHBox" id="hbox46">
-					      <property name="visible">True</property>
-					      <property name="homogeneous">False</property>
-					      <property name="spacing">3</property>
-
-					      <child>
-						<widget class="GtkLabel" id="magZoomerPositionLabel">
-						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Pos_ition:</property>
-						  <property name="use_underline">True</property>
-						  <property name="use_markup">False</property>
-						  <property name="justify">GTK_JUSTIFY_LEFT</property>
-						  <property name="wrap">False</property>
-						  <property name="selectable">False</property>
-						  <property name="xalign">0</property>
-						  <property name="yalign">0.5</property>
-						  <property name="xpad">0</property>
-						  <property name="ypad">0</property>
-						  <property name="mnemonic_widget">magZoomerPositionComboBox</property>
-						  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-						  <property name="width_chars">-1</property>
-						  <property name="single_line_mode">False</property>
-						  <property name="angle">0</property>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">False</property>
-						  <property name="fill">False</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkComboBox" id="magZoomerPositionComboBox">
-						  <property name="visible">True</property>
-						  <property name="items" translatable="yes">Full Screen
-Top Half
-Bottom Half
-Left Half
-Right Half
-Custom</property>
-						  <property name="add_tearoffs">False</property>
-						  <property name="focus_on_click">True</property>
-						  <signal name="changed" handler="magZoomerPositionChanged" last_modification_time="Thu, 06 Dec 2007 03:25:44 GMT"/>
-						</widget>
-						<packing>
-						  <property name="padding">0</property>
-						  <property name="expand">True</property>
-						  <property name="fill">True</property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">2</property>
-					  <property name="right_attach">3</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment61">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">0</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">10</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkTable" id="magZoomerCustomPositionTable">
-					      <property name="border_width">3</property>
-					      <property name="visible">True</property>
-					      <property name="n_rows">3</property>
-					      <property name="n_columns">2</property>
-					      <property name="homogeneous">False</property>
-					      <property name="row_spacing">3</property>
-					      <property name="column_spacing">3</property>
-
-					      <child>
-						<widget class="GtkHBox" id="hbox23">
-						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">0</property>
-
-						  <child>
-						    <widget class="GtkLabel" id="magZoomerTopLabel">
-						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">_Top:</property>
-						      <property name="use_underline">True</property>
-						      <property name="use_markup">False</property>
-						      <property name="justify">GTK_JUSTIFY_LEFT</property>
-						      <property name="wrap">False</property>
-						      <property name="selectable">False</property>
-						      <property name="xalign">0.5</property>
-						      <property name="yalign">0.5</property>
-						      <property name="xpad">0</property>
-						      <property name="ypad">0</property>
-						      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-						      <property name="width_chars">-1</property>
-						      <property name="single_line_mode">False</property>
-						      <property name="angle">0</property>
-						    </widget>
-						    <packing>
-						      <property name="padding">3</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						    </packing>
-						  </child>
-
-						  <child>
-						    <widget class="GtkSpinButton" id="magZoomerTopSpinButton">
-						      <property name="visible">True</property>
-						      <property name="can_focus">True</property>
-						      <property name="climb_rate">1</property>
-						      <property name="digits">0</property>
-						      <property name="numeric">False</property>
-						      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						      <property name="snap_to_ticks">False</property>
-						      <property name="wrap">False</property>
-						      <property name="adjustment">1 1 9999 1 10 10</property>
-						      <signal name="value_changed" handler="magZoomerTopValueChanged" last_modification_time="Wed, 03 May 2006 15:41:20 GMT"/>
-						    </widget>
-						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						      <property name="pack_type">GTK_PACK_END</property>
-						    </packing>
-						  </child>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">0</property>
-						  <property name="bottom_attach">1</property>
-						  <property name="x_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkHBox" id="hbox24">
-						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">0</property>
-
-						  <child>
-						    <widget class="GtkLabel" id="magZoomerBottomLabel">
-						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">_Bottom:</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">magZoomerBottomSpinButton</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">3</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						    </packing>
-						  </child>
-
-						  <child>
-						    <widget class="GtkSpinButton" id="magZoomerBottomSpinButton">
-						      <property name="visible">True</property>
-						      <property name="can_focus">True</property>
-						      <property name="climb_rate">1</property>
-						      <property name="digits">0</property>
-						      <property name="numeric">False</property>
-						      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						      <property name="snap_to_ticks">False</property>
-						      <property name="wrap">False</property>
-						      <property name="adjustment">1 1 9999 1 10 10</property>
-						      <signal name="value_changed" handler="magZoomerBottomValueChanged" last_modification_time="Wed, 03 May 2006 15:42:28 GMT"/>
-						    </widget>
-						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						    </packing>
-						  </child>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">2</property>
-						  <property name="bottom_attach">3</property>
-						  <property name="x_options"></property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkHBox" id="hbox25">
-						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">0</property>
-
-						  <child>
-						    <widget class="GtkLabel" id="magZoomerRightLabel">
-						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">_Right:</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">magZoomerRightSpinButton</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">4</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						    </packing>
-						  </child>
-
-						  <child>
-						    <widget class="GtkSpinButton" id="magZoomerRightSpinButton">
-						      <property name="visible">True</property>
-						      <property name="can_focus">True</property>
-						      <property name="climb_rate">1</property>
-						      <property name="digits">0</property>
-						      <property name="numeric">False</property>
-						      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						      <property name="snap_to_ticks">False</property>
-						      <property name="wrap">False</property>
-						      <property name="adjustment">1 1 9999 1 10 10</property>
-						      <signal name="value_changed" handler="magZoomerRightValueChanged" last_modification_time="Wed, 03 May 2006 15:44:33 GMT"/>
-						    </widget>
-						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						    </packing>
-						  </child>
-
-						  <child>
-						    <widget class="GtkFixed" id="fixed2">
-						      <property name="visible">True</property>
-						    </widget>
-						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">True</property>
-						      <property name="fill">True</property>
-						      <property name="pack_type">GTK_PACK_END</property>
-						    </packing>
-						  </child>
-						</widget>
-						<packing>
-						  <property name="left_attach">1</property>
-						  <property name="right_attach">2</property>
-						  <property name="top_attach">1</property>
-						  <property name="bottom_attach">2</property>
-						  <property name="x_options"></property>
-						  <property name="y_options">fill</property>
-						</packing>
-					      </child>
-
-					      <child>
-						<widget class="GtkHBox" id="hbox22">
-						  <property name="visible">True</property>
-						  <property name="homogeneous">False</property>
-						  <property name="spacing">0</property>
-
-						  <child>
-						    <widget class="GtkFixed" id="fixed1">
-						      <property name="visible">True</property>
-						    </widget>
-						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">True</property>
-						      <property name="fill">True</property>
-						    </packing>
-						  </child>
-
-						  <child>
-						    <widget class="GtkLabel" id="magZoomerLeftLabel">
-						      <property name="visible">True</property>
-						      <property name="label" translatable="yes">_Left:</property>
-						      <property name="use_underline">True</property>
-						      <property name="use_markup">False</property>
-						      <property name="justify">GTK_JUSTIFY_RIGHT</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">magZoomerLeftSpinButton</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">3</property>
-						      <property name="expand">False</property>
-						      <property name="fill">True</property>
-						    </packing>
-						  </child>
-
-						  <child>
-						    <widget class="GtkSpinButton" id="magZoomerLeftSpinButton">
-						      <property name="visible">True</property>
-						      <property name="can_focus">True</property>
-						      <property name="climb_rate">1</property>
-						      <property name="digits">0</property>
-						      <property name="numeric">False</property>
-						      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-						      <property name="snap_to_ticks">False</property>
-						      <property name="wrap">False</property>
-						      <property name="adjustment">1 1 9999 1 10 10</property>
-						      <signal name="value_changed" handler="magZoomerLeftValueChanged" last_modification_time="Wed, 03 May 2006 15:43:41 GMT"/>
-						    </widget>
-						    <packing>
-						      <property name="padding">0</property>
-						      <property name="expand">False</property>
-						      <property name="fill">False</property>
-						    </packing>
-						  </child>
-						</widget>
-						<packing>
-						  <property name="left_attach">0</property>
-						  <property name="right_attach">1</property>
-						  <property name="top_attach">1</property>
-						  <property name="bottom_attach">2</property>
-						  <property name="x_options"></property>
-						</packing>
-					      </child>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">3</property>
-					  <property name="right_attach">4</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment31">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">12</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">0</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="magSmoothingLabel">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">_Smoothing:</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">1</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>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkAlignment" id="alignment30">
-					  <property name="visible">True</property>
-					  <property name="xalign">0.5</property>
-					  <property name="yalign">0.5</property>
-					  <property name="xscale">1</property>
-					  <property name="yscale">1</property>
-					  <property name="top_padding">12</property>
-					  <property name="bottom_padding">0</property>
-					  <property name="left_padding">0</property>
-					  <property name="right_padding">0</property>
-
-					  <child>
-					    <widget class="GtkComboBox" id="magSmoothingComboBox">
-					      <property name="visible">True</property>
-					      <property name="items" translatable="yes">None
-Bilinear</property>
-					      <property name="add_tearoffs">False</property>
-					      <property name="focus_on_click">True</property>
-					      <signal name="changed" handler="magSmoothingChanged" last_modification_time="Wed, 03 May 2006 15:54:49 GMT"/>
-					    </widget>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="x_options">fill</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label21">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">&lt;b&gt;Zoomer Settings&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>
-				  <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>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">2</property>
-			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment64">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">12</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkFrame" id="magTrackingAndAlignmentFrame">
-			      <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="GtkAlignment" id="alignment62">
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">12</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkTable" id="table12">
-				      <property name="visible">True</property>
-				      <property name="n_rows">3</property>
-				      <property name="n_columns">2</property>
-				      <property name="homogeneous">True</property>
-				      <property name="row_spacing">0</property>
-				      <property name="column_spacing">0</property>
-
-				      <child>
-					<widget class="GtkTable" id="table13">
-					  <property name="visible">True</property>
-					  <property name="n_rows">3</property>
-					  <property name="n_columns">2</property>
-					  <property name="homogeneous">False</property>
-					  <property name="row_spacing">3</property>
-					  <property name="column_spacing">3</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="magMouseTrackingLabel">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Mouse poi_nter:</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">1</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="mnemonic_widget">magMouseTrackingComboBox</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="magMouseTrackingComboBox" type="label-for"/>
-					      </accessibility>
-					    </widget>
-					    <packing>
-					      <property name="left_attach">0</property>
-					      <property name="right_attach">1</property>
-					      <property name="top_attach">0</property>
-					      <property name="bottom_attach">1</property>
-					      <property name="x_options">fill</property>
-					      <property name="y_options"></property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkComboBox" id="magMouseTrackingComboBox">
-					      <property name="visible">True</property>
-					      <property name="items" translatable="yes">Centered
+                            <accessibility>
+                              <atkrelation target="sayAllLabel" type="labelled-by"/>
+                            </accessibility>
+                            <signal name="changed" handler="sayAllStyleChanged"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="padding">3</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="padding">3</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="speechTabLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Speech</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="position">1</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="brailleVbox">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <property name="spacing">12</property>
+                    <child>
+                      <widget class="GtkVBox" id="vbox23">
+                        <property name="visible">True</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="brailleSupportCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable Braille _support</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="brailleSupportChecked"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="brailleMonitorCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable Braille _monitor</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="brailleMonitorChecked"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkCheckButton" id="abbrevRolenames">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">_Abbreviated role names</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="abbrevRolenamesChecked"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkFrame" id="frame7">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment36">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox18">
+                                <property name="visible">True</property>
+                                <property name="border_width">3</property>
+                                <child>
+                                  <widget class="GtkRadioButton" id="brailleBriefButton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Brie_f</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="brailleVerbosityChanged"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="brailleVerboseButton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Ver_bose</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">brailleBriefButton</property>
+                                    <signal name="toggled" handler="brailleVerbosityChanged"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="brailleVerbosityLabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Verbosity&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkFrame" id="brailleSelectionFrame">
+                        <property name="visible">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment57">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox28">
+                                <property name="visible">True</property>
+                                <property name="border_width">3</property>
+                                <child>
+                                  <widget class="GtkRadioButton" id="brailleSelectionNoneButton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">_None</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <signal name="toggled" handler="brailleSelectionChanged"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="brailleSelection7Button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Dot _7</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">brailleSelectionNoneButton</property>
+                                    <signal name="toggled" handler="brailleSelectionChanged"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="brailleSelection8Button">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Dot _8</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">brailleSelectionNoneButton</property>
+                                    <signal name="toggled" handler="brailleSelectionChanged"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkRadioButton" id="brailleSelectionBothButton">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="label" translatable="yes">Dots 7 an_d 8</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="response_id">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">brailleSelectionNoneButton</property>
+                                    <signal name="toggled" handler="brailleSelectionChanged"/>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="label28">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Selection Indicator&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">2</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="brailleTabLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Braille</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="position">2</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="keyechoVbox">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="keyEchoCheckbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Enable _key echo</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="keyEchoChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment11">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="printableCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable _alphanumeric and punctuation keys</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="printableKeysChecked"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment12">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="modifierCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable _modifier keys</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="modifierKeysChecked"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment13">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="lockingCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable lockin_g keys</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="lockingKeysChecked"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment14">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="functionCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable _function keys</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="functionKeysChecked"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment15">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="actionCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable ac_tion keys</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="actionKeysChecked"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment59">
+                        <property name="visible">True</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="navigationCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable _navigation keys</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="navigationKeysChecked"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">6</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkAlignment" id="alignment49">
+                        <property name="visible">True</property>
+                        <property name="top_padding">12</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="echoByWordCheckbutton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Enable echo by _word</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <property name="draw_indicator">True</property>
+                            <signal name="toggled" handler="echoByWordChecked"/>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">7</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">3</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="keyEchoTabLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Key Echo</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="position">3</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox19">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <child>
+                      <widget class="GtkCheckButton" id="magnifierSupportCheckbutton">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="label" translatable="yes">Enable _magnifier</property>
+                        <property name="use_underline">True</property>
+                        <property name="response_id">0</property>
+                        <property name="draw_indicator">True</property>
+                        <signal name="toggled" handler="magnifierSupportChecked"/>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkTable" id="magnifierTable">
+                        <property name="visible">True</property>
+                        <property name="border_width">12</property>
+                        <property name="n_rows">5</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">24</property>
+                        <property name="row_spacing">3</property>
+                        <child>
+                          <placeholder/>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="magAdvancedButton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="label" translatable="yes">Advanced _Settings...</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" handler="magAdvancedButtonClicked"/>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">4</property>
+                            <property name="bottom_attach">5</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment64">
+                            <property name="visible">True</property>
+                            <property name="top_padding">12</property>
+                            <child>
+                              <widget class="GtkFrame" id="magTrackingAndAlignmentFrame">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment62">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <widget class="GtkTable" id="table12">
+                                        <property name="visible">True</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">2</property>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkTable" id="table13">
+                                            <property name="visible">True</property>
+                                            <property name="n_rows">3</property>
+                                            <property name="n_columns">2</property>
+                                            <property name="column_spacing">3</property>
+                                            <property name="row_spacing">3</property>
+                                            <child>
+                                              <widget class="GtkComboBox" id="magMouseTrackingComboBox">
+                                                <property name="visible">True</property>
+                                                <property name="items" translatable="yes">Centered
 Proportional
 Push
 None</property>
-					      <property name="add_tearoffs">False</property>
-					      <property name="focus_on_click">True</property>
-					      <accessibility>
-						<atkrelation target="magMouseTrackingLabel" type="labelled-by"/>
-					      </accessibility>
-					      <signal name="changed" handler="magMouseTrackingChanged" last_modification_time="Wed, 03 May 2006 15:55:53 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="left_attach">1</property>
-					      <property name="right_attach">2</property>
-					      <property name="top_attach">0</property>
-					      <property name="bottom_attach">1</property>
-					      <property name="y_options">fill</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="magControlTrackingLabel">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">_Control and menu item:</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">1</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="mnemonic_widget">magControlTrackingComboBox</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="magControlTrackingComboBox" type="label-for"/>
-					      </accessibility>
-					    </widget>
-					    <packing>
-					      <property name="left_attach">0</property>
-					      <property name="right_attach">1</property>
-					      <property name="top_attach">1</property>
-					      <property name="bottom_attach">2</property>
-					      <property name="x_options">fill</property>
-					      <property name="y_options"></property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkComboBox" id="magControlTrackingComboBox">
-					      <property name="visible">True</property>
-					      <property name="items" translatable="yes">Centered
+                                                <accessibility>
+                                                  <atkrelation target="magMouseTrackingLabel" type="labelled-by"/>
+                                                </accessibility>
+                                                <signal name="changed" handler="magMouseTrackingChanged"/>
+                                              </widget>
+                                              <packing>
+                                                <property name="left_attach">1</property>
+                                                <property name="right_attach">2</property>
+                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="y_options">GTK_FILL</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkComboBox" id="magTextCursorTrackingComboBox">
+                                                <property name="visible">True</property>
+                                                <property name="items" translatable="yes">Centered
 Push
 None</property>
-					      <property name="add_tearoffs">False</property>
-					      <property name="focus_on_click">True</property>
-					      <accessibility>
-						<atkrelation target="magControlTrackingLabel" type="labelled-by"/>
-					      </accessibility>
-					      <signal name="changed" handler="magControlTrackingChanged" last_modification_time="Thu, 06 Dec 2007 22:56:53 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="left_attach">1</property>
-					      <property name="right_attach">2</property>
-					      <property name="top_attach">1</property>
-					      <property name="bottom_attach">2</property>
-					      <property name="x_options">fill</property>
-					      <property name="y_options">fill</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="magTextCursorTrackingLabel">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Te_xt cursor:</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_RIGHT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">1</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="mnemonic_widget">magTextCursorTrackingComboBox</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="magTextCursorTrackingComboBox" type="label-for"/>
-					      </accessibility>
-					    </widget>
-					    <packing>
-					      <property name="left_attach">0</property>
-					      <property name="right_attach">1</property>
-					      <property name="top_attach">2</property>
-					      <property name="bottom_attach">3</property>
-					      <property name="x_options">fill</property>
-					      <property name="y_options"></property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkComboBox" id="magTextCursorTrackingComboBox">
-					      <property name="visible">True</property>
-					      <property name="items" translatable="yes">Centered
+                                                <accessibility>
+                                                  <atkrelation target="magTextCursorTrackingLabel" type="labelled-by"/>
+                                                </accessibility>
+                                                <signal name="changed" handler="magTextTrackingChanged"/>
+                                              </widget>
+                                              <packing>
+                                                <property name="left_attach">1</property>
+                                                <property name="right_attach">2</property>
+                                                <property name="top_attach">2</property>
+                                                <property name="bottom_attach">3</property>
+                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="y_options">GTK_FILL</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="magTextCursorTrackingLabel">
+                                                <property name="visible">True</property>
+                                                <property name="xalign">1</property>
+                                                <property name="label" translatable="yes">Te_xt cursor:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                                <property name="mnemonic_widget">magTextCursorTrackingComboBox</property>
+                                                <accessibility>
+                                                  <atkrelation target="magTextCursorTrackingComboBox" type="label-for"/>
+                                                </accessibility>
+                                              </widget>
+                                              <packing>
+                                                <property name="top_attach">2</property>
+                                                <property name="bottom_attach">3</property>
+                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="y_options"></property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkComboBox" id="magControlTrackingComboBox">
+                                                <property name="visible">True</property>
+                                                <property name="items" translatable="yes">Centered
 Push
 None</property>
-					      <property name="add_tearoffs">False</property>
-					      <property name="focus_on_click">True</property>
-					      <accessibility>
-						<atkrelation target="magTextCursorTrackingLabel" type="labelled-by"/>
-					      </accessibility>
-					      <signal name="changed" handler="magTextTrackingChanged" last_modification_time="Thu, 06 Dec 2007 22:57:13 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="left_attach">1</property>
-					      <property name="right_attach">2</property>
-					      <property name="top_attach">2</property>
-					      <property name="bottom_attach">3</property>
-					      <property name="x_options">fill</property>
-					      <property name="y_options">fill</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">3</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkHBox" id="magEdgeMarginHBox">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">3</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="magEdgeMarginLabel">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes" comments="Translators: When a user chooses a tracking alignment of &quot;push&quot;, Orca moves the magnified view just enough to fit the object of interest at the very edge of the screen.  The &quot;edge margin&quot; allows the user to specify a margin so that objects are not displayed too close to the edge.">Edge mar_gin:</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_RIGHT</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">magEdgeMarginSpinButton</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="magEdgeMarginSpinButton" type="label-for"/>
-					      </accessibility>
-					    </widget>
-					    <packing>
-					      <property name="padding">17</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkSpinButton" id="magEdgeMarginSpinButton">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="climb_rate">1</property>
-					      <property name="digits">0</property>
-					      <property name="numeric">True</property>
-					      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-					      <property name="snap_to_ticks">False</property>
-					      <property name="wrap">False</property>
-					      <property name="adjustment">1 0 100 1 10 10</property>
-					      <accessibility>
-						<atkrelation target="magEdgeMarginLabel" type="labelled-by"/>
-						<atkrelation target="magEdgeMarginUnitsLabel" type="labelled-by"/>
-					      </accessibility>
-					      <signal name="value_changed" handler="magEdgeMarginValueChanged" last_modification_time="Thu, 06 Dec 2007 22:57:50 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkLabel" id="magEdgeMarginUnitsLabel">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">%</property>
-					      <property name="use_underline">False</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">0.5</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					      <property name="width_chars">-1</property>
-					      <property name="single_line_mode">False</property>
-					      <property name="angle">0</property>
-					      <accessibility>
-						<atkrelation target="magEdgeMarginSpinButton" type="label-for"/>
-					      </accessibility>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">2</property>
-					  <property name="bottom_attach">3</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label30">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes" comments="Translators:  In the context of magnifying the contents of the screen, &quot;tracking&quot; refers to whether or not an object (mouse pointer, the caret, or the widget with focus) is of interest.  Objects of interest must always be displayed.  &quot;Alignment&quot; refers to where on the screen objects of interest should be displayed.">&lt;b&gt;Tracking and Alignment Settings&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>
-				  <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>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">3</property>
-			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkAlignment" id="alignment65">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">12</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">0</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkFrame" id="magMultiMonitorFrame">
-			      <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="GtkAlignment" id="alignment63">
-				  <property name="border_width">6</property>
-				  <property name="visible">True</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xscale">1</property>
-				  <property name="yscale">1</property>
-				  <property name="top_padding">0</property>
-				  <property name="bottom_padding">0</property>
-				  <property name="left_padding">12</property>
-				  <property name="right_padding">0</property>
-
-				  <child>
-				    <widget class="GtkTable" id="table11">
-				      <property name="visible">True</property>
-				      <property name="n_rows">1</property>
-				      <property name="n_columns">2</property>
-				      <property name="homogeneous">False</property>
-				      <property name="row_spacing">0</property>
-				      <property name="column_spacing">20</property>
-
-				      <child>
-					<widget class="GtkHBox" id="hbox51">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">3</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="magSourceDisplayLabel">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">S_ource display:</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">1</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="mnemonic_widget">magSourceDisplayEntry</property>
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					      <property name="width_chars">-1</property>
-					      <property name="single_line_mode">False</property>
-					      <property name="angle">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkEntry" id="magSourceDisplayEntry">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="editable">True</property>
-					      <property name="visibility">True</property>
-					      <property name="max_length">0</property>
-					      <property name="text"></property>
-					      <property name="has_frame">True</property>
-					      <property name="invisible_char">*</property>
-					      <property name="activates_default">False</property>
-					      <signal name="changed" handler="magSourceDisplayChanged" last_modification_time="Tue, 19 Sep 2006 19:53:43 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">0</property>
-					  <property name="right_attach">1</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					</packing>
-				      </child>
-
-				      <child>
-					<widget class="GtkHBox" id="hbox52">
-					  <property name="visible">True</property>
-					  <property name="homogeneous">False</property>
-					  <property name="spacing">3</property>
-
-					  <child>
-					    <widget class="GtkLabel" id="magTargetDisplayLabel">
-					      <property name="visible">True</property>
-					      <property name="label" translatable="yes">Target displa_y:</property>
-					      <property name="use_underline">True</property>
-					      <property name="use_markup">False</property>
-					      <property name="justify">GTK_JUSTIFY_LEFT</property>
-					      <property name="wrap">False</property>
-					      <property name="selectable">False</property>
-					      <property name="xalign">1</property>
-					      <property name="yalign">0.5</property>
-					      <property name="xpad">0</property>
-					      <property name="ypad">0</property>
-					      <property name="mnemonic_widget">magTargetDisplayEntry</property>
-					      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-					      <property name="width_chars">-1</property>
-					      <property name="single_line_mode">False</property>
-					      <property name="angle">0</property>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">False</property>
-					      <property name="fill">False</property>
-					    </packing>
-					  </child>
-
-					  <child>
-					    <widget class="GtkEntry" id="magTargetDisplayEntry">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="editable">True</property>
-					      <property name="visibility">True</property>
-					      <property name="max_length">0</property>
-					      <property name="text"></property>
-					      <property name="has_frame">True</property>
-					      <property name="invisible_char">*</property>
-					      <property name="activates_default">False</property>
-					      <signal name="changed" handler="magTargetDisplayChanged" last_modification_time="Tue, 19 Sep 2006 19:54:09 GMT"/>
-					    </widget>
-					    <packing>
-					      <property name="padding">0</property>
-					      <property name="expand">True</property>
-					      <property name="fill">True</property>
-					    </packing>
-					  </child>
-					</widget>
-					<packing>
-					  <property name="left_attach">1</property>
-					  <property name="right_attach">2</property>
-					  <property name="top_attach">0</property>
-					  <property name="bottom_attach">1</property>
-					  <property name="y_options">fill</property>
-					</packing>
-				      </child>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label35">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">&lt;b&gt;Multi-monitor Settings&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>
-				  <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>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="left_attach">0</property>
-			  <property name="right_attach">2</property>
-			  <property name="top_attach">4</property>
-			  <property name="bottom_attach">5</property>
-			  <property name="x_options">fill</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="magnifierTabLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Magnifier</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="keyBindingsVBox">
-		  <property name="border_width">12</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox36">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">3</property>
-
-		      <child>
-			<widget class="GtkLabel" id="orcaModKeyLabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Orca _Modifier Key(s):</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">orcaModKeyEntry</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="orcaModKeyEntry" type="label-for"/>
-			  </accessibility>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="orcaModKeyEntry">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Orca Modifier Keys</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>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkScrolledWindow" id="scrolledwindow1">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		      <child>
-			<widget class="GtkTreeView" id="keyBindingsTreeview">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="headers_visible">True</property>
-			  <property name="rules_hint">True</property>
-			  <property name="reorderable">True</property>
-			  <property name="enable_search">True</property>
-			  <property name="fixed_height_mode">False</property>
-			  <property name="hover_selection">False</property>
-			  <property name="hover_expand">False</property>
-			</widget>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		  <property name="menu_label" translatable="yes">Key Binding List</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="keyBindingsTabLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Key Bindings</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox29">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkFrame" id="pronunciationFrame">
-		      <property name="border_width">5</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="GtkAlignment" id="alignment58">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">12</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkScrolledWindow" id="scrolledwindow3">
-			      <property name="border_width">5</property>
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-			      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-			      <property name="shadow_type">GTK_SHADOW_IN</property>
-			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			      <child>
-				<widget class="GtkTreeView" id="pronunciationTreeView">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="headers_visible">True</property>
-				  <property name="rules_hint">False</property>
-				  <property name="reorderable">True</property>
-				  <property name="enable_search">True</property>
-				  <property name="fixed_height_mode">False</property>
-				  <property name="hover_selection">False</property>
-				  <property name="hover_expand">False</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="pronunciationDictFrameLabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Pronunciation Dictionary&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>
-			  <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>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox44">
-		      <property name="border_width">5</property>
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkButton" id="pronunciationAddButton">
-			  <property name="border_width">5</property>
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_New entry</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="pronunciationAddButtonClicked" last_modification_time="Thu, 26 Jul 2007 14:29:42 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="pronunciationDeleteButton">
-			  <property name="border_width">5</property>
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <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>
-			  <signal name="clicked" handler="pronunciationDeleteButtonClicked" last_modification_time="Thu, 26 Jul 2007 14:29:58 GMT"/>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">True</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="pronunciationTabLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Pronunciation</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkHBox" id="textAttributesHBox">
-		  <property name="border_width">5</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">0</property>
-
-		  <child>
-		    <widget class="GtkFrame" id="textAttributesFrame">
-		      <property name="border_width">5</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="GtkAlignment" id="alignment53">
-			  <property name="visible">True</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xscale">1</property>
-			  <property name="yscale">1</property>
-			  <property name="top_padding">0</property>
-			  <property name="bottom_padding">0</property>
-			  <property name="left_padding">12</property>
-			  <property name="right_padding">0</property>
-
-			  <child>
-			    <widget class="GtkVBox" id="vbox24">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">0</property>
-
-			      <child>
-				<widget class="GtkScrolledWindow" id="scrolledwindow2">
-				  <property name="border_width">5</property>
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-				  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-				  <property name="shadow_type">GTK_SHADOW_IN</property>
-				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-				  <child>
-				    <widget class="GtkTreeView" id="textAttributesTreeView">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="headers_visible">True</property>
-				      <property name="rules_hint">False</property>
-				      <property name="reorderable">True</property>
-				      <property name="enable_search">True</property>
-				      <property name="fixed_height_mode">False</property>
-				      <property name="hover_selection">False</property>
-				      <property name="hover_expand">False</property>
-				    </widget>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">True</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkHBox" id="hbox41">
-				  <property name="border_width">5</property>
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkButton" id="textSelectAllButton">
-				      <property name="border_width">5</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">_Speak all</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="textSelectAllButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:59 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="textUnselectAllButton">
-				      <property name="border_width">5</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Speak _none</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="textUnselectAllButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:31:06 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="textResetButton">
-				      <property name="border_width">5</property>
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">_Reset</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="textResetButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:31:13 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="textAttributesFrameLabel">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Text attributes&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>
-			  <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>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkVBox" id="vbox26">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">True</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkFrame" id="adjustAttributesFrame">
-			  <property name="border_width">5</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="GtkAlignment" id="alignment55">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">1</property>
-			      <property name="yscale">1</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">12</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox25">
-				  <property name="border_width">5</property>
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkButton" id="textMoveToTopButton">
-				      <property name="border_width">5</property>
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes" comments="Translators:  This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _top button, move that attribute to the top of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move to _top</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="textMoveToTopButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:14 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="textMoveUpOneButton">
-				      <property name="border_width">5</property>
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _up one button, move that attribute up one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move _up one</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="textMoveUpOneButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:22 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="textMoveDownOneButton">
-				      <property name="border_width">5</property>
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _down one button, move that attribute down one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move _down one</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="textMoveDownOneButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:28 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkButton" id="textMoveToBottomButton">
-				      <property name="border_width">5</property>
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _bottom button, move that attribute to the bottom of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move to _bottom</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="textMoveToBottomButtonClicked" last_modification_time="Fri, 08 Jun 2007 17:30:36 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label26">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Adjust selected
+                                                <accessibility>
+                                                  <atkrelation target="magControlTrackingLabel" type="labelled-by"/>
+                                                </accessibility>
+                                                <signal name="changed" handler="magControlTrackingChanged"/>
+                                              </widget>
+                                              <packing>
+                                                <property name="left_attach">1</property>
+                                                <property name="right_attach">2</property>
+                                                <property name="top_attach">1</property>
+                                                <property name="bottom_attach">2</property>
+                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="y_options">GTK_FILL</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="magControlTrackingLabel">
+                                                <property name="visible">True</property>
+                                                <property name="xalign">1</property>
+                                                <property name="label" translatable="yes">_Control and menu item:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                                <property name="mnemonic_widget">magControlTrackingComboBox</property>
+                                                <accessibility>
+                                                  <atkrelation target="magControlTrackingComboBox" type="label-for"/>
+                                                </accessibility>
+                                              </widget>
+                                              <packing>
+                                                <property name="top_attach">1</property>
+                                                <property name="bottom_attach">2</property>
+                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="y_options"></property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="magMouseTrackingLabel">
+                                                <property name="visible">True</property>
+                                                <property name="xalign">1</property>
+                                                <property name="label" translatable="yes">Mouse poi_nter:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                                <property name="mnemonic_widget">magMouseTrackingComboBox</property>
+                                                <accessibility>
+                                                  <atkrelation target="magMouseTrackingComboBox" type="label-for"/>
+                                                </accessibility>
+                                              </widget>
+                                              <packing>
+                                                <property name="x_options">GTK_FILL</property>
+                                                <property name="y_options"></property>
+                                              </packing>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkHBox" id="magEdgeMarginHBox">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">3</property>
+                                            <child>
+                                              <widget class="GtkLabel" id="magEdgeMarginLabel">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes" comments="Translators: When a user chooses a tracking alignment of &quot;push&quot;, Orca moves the magnified view just enough to fit the object of interest at the very edge of the screen.  The &quot;edge margin&quot; allows the user to specify a margin so that objects are not displayed too close to the edge.">Edge mar_gin:</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                                <property name="mnemonic_widget">magEdgeMarginSpinButton</property>
+                                                <accessibility>
+                                                  <atkrelation target="magEdgeMarginSpinButton" type="label-for"/>
+                                                </accessibility>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="padding">17</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkSpinButton" id="magEdgeMarginSpinButton">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="adjustment">1 0 100 1 10 10</property>
+                                                <property name="climb_rate">1</property>
+                                                <property name="numeric">True</property>
+                                                <accessibility>
+                                                  <atkrelation target="magEdgeMarginLabel" type="labelled-by"/>
+                                                  <atkrelation target="magEdgeMarginUnitsLabel" type="labelled-by"/>
+                                                </accessibility>
+                                                <signal name="value_changed" handler="magEdgeMarginValueChanged"/>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">1</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <widget class="GtkLabel" id="magEdgeMarginUnitsLabel">
+                                                <property name="visible">True</property>
+                                                <property name="label" translatable="yes">%</property>
+                                                <accessibility>
+                                                  <atkrelation target="magEdgeMarginSpinButton" type="label-for"/>
+                                                </accessibility>
+                                              </widget>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">False</property>
+                                                <property name="position">2</property>
+                                              </packing>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label30">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes" comments="Translators:  In the context of magnifying the contents of the screen, &quot;tracking&quot; refers to whether or not an object (mouse pointer, the caret, or the widget with focus) is of interest.  Objects of interest must always be displayed.  &quot;Alignment&quot; refers to where on the screen objects of interest should be displayed.">&lt;b&gt;Tracking and Alignment Settings&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="type">label_item</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">3</property>
+                            <property name="bottom_attach">4</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="magCursorLabelAlignment">
+                            <property name="visible">True</property>
+                            <property name="top_padding">12</property>
+                            <child>
+                              <widget class="GtkFrame" id="magCursorSettingsFrame">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment39">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <widget class="GtkVBox" id="vbox32">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment81">
+                                            <property name="visible">True</property>
+                                            <property name="left_padding">3</property>
+                                            <child>
+                                              <widget class="GtkCheckButton" id="magCursorOnOffCheckButton">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="label" translatable="yes">Enable c_ursor</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="response_id">0</property>
+                                                <property name="draw_indicator">True</property>
+                                                <signal name="toggled" handler="magCursorOnOffChecked"/>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment80">
+                                            <property name="visible">True</property>
+                                            <child>
+                                              <widget class="GtkTable" id="magCursorTable">
+                                                <property name="visible">True</property>
+                                                <property name="border_width">3</property>
+                                                <property name="n_rows">3</property>
+                                                <property name="n_columns">1</property>
+                                                <property name="column_spacing">3</property>
+                                                <property name="row_spacing">3</property>
+                                                <child>
+                                                  <widget class="GtkAlignment" id="alignment50">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <widget class="GtkHBox" id="hbox37">
+                                                        <property name="visible">True</property>
+                                                        <property name="spacing">3</property>
+                                                        <child>
+                                                          <widget class="GtkLabel" id="magCursorColorLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">1</property>
+                                                            <property name="label" translatable="yes">Cursor color:</property>
+                                                            <property name="use_underline">True</property>
+                                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                                            <property name="mnemonic_widget">magCursorColorButton</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCursorColorButton" type="label-for"/>
+                                                            </accessibility>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <widget class="GtkColorButton" id="magCursorColorButton">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="response_id">0</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCursorColorLabel" type="labelled-by"/>
+                                                            </accessibility>
+                                                            <signal name="color_set" handler="magCursorColorSet"/>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <placeholder/>
+                                                        </child>
+                                                      </widget>
+                                                    </child>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkAlignment" id="alignment51">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <widget class="GtkHBox" id="hbox38">
+                                                        <property name="visible">True</property>
+                                                        <property name="spacing">3</property>
+                                                        <child>
+                                                          <widget class="GtkLabel" id="magCursorSizeLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="label" translatable="yes">Cursor size:</property>
+                                                            <property name="use_underline">True</property>
+                                                            <property name="mnemonic_widget">magCursorSizeSpinButton</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCursorSizeSpinButton" type="label-for"/>
+                                                            </accessibility>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <widget class="GtkSpinButton" id="magCursorSizeSpinButton">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="adjustment">1 1 256 1 10 10</property>
+                                                            <property name="climb_rate">1</property>
+                                                            <property name="numeric">True</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCursorSizeUnitsLabel" type="labelled-by"/>
+                                                              <atkrelation target="magCursorSizeLabel" type="labelled-by"/>
+                                                            </accessibility>
+                                                            <signal name="value_changed" handler="magCursorSizeValueChanged"/>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <widget class="GtkLabel" id="magCursorSizeUnitsLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="label" translatable="yes">pixels</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCursorSizeSpinButton" type="label-for"/>
+                                                            </accessibility>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">2</property>
+                                                          </packing>
+                                                        </child>
+                                                      </widget>
+                                                    </child>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkCheckButton" id="magCursorSizeCheckButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">Custom siz_e</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal name="toggled" handler="magCursorExplicitSizeChecked"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label19">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Cursor Settings&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="type">label_item</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="magCrossHairLabelAlignment">
+                            <property name="visible">True</property>
+                            <property name="top_padding">12</property>
+                            <property name="left_padding">80</property>
+                            <child>
+                              <widget class="GtkFrame" id="magCrossHairSettingsFrame">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment40">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <widget class="GtkVBox" id="vbox33">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment83">
+                                            <property name="visible">True</property>
+                                            <property name="left_padding">3</property>
+                                            <child>
+                                              <widget class="GtkCheckButton" id="magCrossHairOnOffCheckButton">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="label" translatable="yes">Enable cross-h_air</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="response_id">0</property>
+                                                <property name="draw_indicator">True</property>
+                                                <signal name="toggled" handler="magCrossHairOnOffChecked"/>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">False</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment82">
+                                            <property name="visible">True</property>
+                                            <child>
+                                              <widget class="GtkTable" id="magCrossHairTable">
+                                                <property name="visible">True</property>
+                                                <property name="border_width">3</property>
+                                                <property name="n_rows">3</property>
+                                                <property name="n_columns">1</property>
+                                                <property name="column_spacing">3</property>
+                                                <property name="row_spacing">3</property>
+                                                <child>
+                                                  <widget class="GtkAlignment" id="alignment75">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <widget class="GtkHBox" id="hbox54">
+                                                        <property name="visible">True</property>
+                                                        <property name="spacing">3</property>
+                                                        <child>
+                                                          <widget class="GtkLabel" id="magCrossHairColorLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="label" translatable="yes">Cross-hair color:</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCrossHairColorButton" type="label-for"/>
+                                                            </accessibility>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <widget class="GtkColorButton" id="magCrossHairColorButton">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="response_id">0</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCrossHairColorLabel" type="labelled-by"/>
+                                                            </accessibility>
+                                                            <signal name="color_set" handler="magCrossHairColorSet"/>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
+                                                      </widget>
+                                                    </child>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkAlignment" id="alignment52">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <widget class="GtkHBox" id="hbox33">
+                                                        <property name="visible">True</property>
+                                                        <property name="spacing">3</property>
+                                                        <child>
+                                                          <widget class="GtkLabel" id="magCrossHairSizeLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="xalign">0</property>
+                                                            <property name="label" translatable="yes">Cross-hair si_ze:</property>
+                                                            <property name="use_underline">True</property>
+                                                            <property name="mnemonic_widget">magCrossHairSizeSpinButton</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCrossHairSizeSpinButton" type="label-for"/>
+                                                            </accessibility>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <widget class="GtkSpinButton" id="magCrossHairSizeSpinButton">
+                                                            <property name="visible">True</property>
+                                                            <property name="can_focus">True</property>
+                                                            <property name="adjustment">1 1 256 1 10 10</property>
+                                                            <property name="climb_rate">1</property>
+                                                            <property name="numeric">True</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCrossHairSizeUnitsLabel" type="labelled-by"/>
+                                                              <atkrelation target="magCrossHairSizeLabel" type="labelled-by"/>
+                                                            </accessibility>
+                                                            <signal name="value_changed" handler="magCrossHairSizeValueChanged"/>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="position">1</property>
+                                                          </packing>
+                                                        </child>
+                                                        <child>
+                                                          <widget class="GtkLabel" id="magCrossHairSizeUnitsLabel">
+                                                            <property name="visible">True</property>
+                                                            <property name="label" translatable="yes">pixels</property>
+                                                            <accessibility>
+                                                              <atkrelation target="magCrossHairSizeSpinButton" type="label-for"/>
+                                                            </accessibility>
+                                                          </widget>
+                                                          <packing>
+                                                            <property name="expand">False</property>
+                                                            <property name="fill">False</property>
+                                                            <property name="position">2</property>
+                                                          </packing>
+                                                        </child>
+                                                      </widget>
+                                                    </child>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options">GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkCheckButton" id="magCrossHairClipCheckButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="label" translatable="yes">Enable cr_oss-hair clip</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <signal name="toggled" handler="magCrossHairClipOnOffChecked"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label20">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Cross-hair Settings&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="type">label_item</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment71">
+                            <property name="visible">True</property>
+                            <property name="left_padding">80</property>
+                            <child>
+                              <widget class="GtkFrame" id="frame11">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment73">
+                                    <property name="visible">True</property>
+                                    <property name="top_padding">5</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <widget class="GtkTable" id="table14">
+                                        <property name="visible">True</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">2</property>
+                                        <property name="column_spacing">3</property>
+                                        <property name="row_spacing">3</property>
+                                        <child>
+                                          <widget class="GtkSpinButton" id="magColorContrastSpinButton">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="adjustment">0 -1 1 0.050000000745099998 0.25 0.25</property>
+                                            <property name="climb_rate">1</property>
+                                            <property name="digits">2</property>
+                                            <property name="numeric">True</property>
+                                            <accessibility>
+                                              <atkrelation target="magColorContrastLabel" type="labelled-by"/>
+                                            </accessibility>
+                                            <signal name="value_changed" handler="magColorContrastValueChanged"/>
+                                            <signal name="value_changed" handler="magColorContrastValueChanged"/>
+                                          </widget>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkSpinButton" id="magColorBrightnessSpinButton">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="adjustment">0 -1 1 0.050000000745099998 0.25 0.25</property>
+                                            <property name="climb_rate">1</property>
+                                            <property name="digits">2</property>
+                                            <property name="numeric">True</property>
+                                            <accessibility>
+                                              <atkrelation target="magColorBrightnessLabel" type="labelled-by"/>
+                                            </accessibility>
+                                            <signal name="value_changed" handler="magColorBrightnessValueChanged"/>
+                                          </widget>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="magColorContrastLabel">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Contrast:</property>
+                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                            <accessibility>
+                                              <atkrelation target="magColorContrastSpinButton" type="label-for"/>
+                                            </accessibility>
+                                          </widget>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="magColorBrightnessLabel">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Brightness:</property>
+                                            <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                            <accessibility>
+                                              <atkrelation target="magColorBrightnessSpinButton" type="label-for"/>
+                                            </accessibility>
+                                          </widget>
+                                          <packing>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkCheckButton" id="magInvertColorsCheckBox">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="label" translatable="yes">In_vert colors</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="response_id">0</property>
+                                            <property name="draw_indicator">True</property>
+                                            <signal name="toggled" handler="magInvertColorsChecked"/>
+                                          </widget>
+                                          <packing>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label37">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Color Settings&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="type">label_item</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment70">
+                            <property name="visible">True</property>
+                            <child>
+                              <widget class="GtkFrame" id="frame10">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment72">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <widget class="GtkVBox" id="vbox31">
+                                        <property name="visible">True</property>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment78">
+                                            <property name="visible">True</property>
+                                            <property name="top_padding">5</property>
+                                            <child>
+                                              <widget class="GtkCheckButton" id="magBorderCheckButton">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="label" translatable="yes">Enable bor_der</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="response_id">0</property>
+                                                <property name="draw_indicator">True</property>
+                                                <signal name="toggled" handler="magBorderChecked"/>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment79">
+                                            <property name="visible">True</property>
+                                            <child>
+                                              <widget class="GtkTable" id="magBorderTable">
+                                                <property name="visible">True</property>
+                                                <property name="n_rows">2</property>
+                                                <property name="n_columns">2</property>
+                                                <property name="column_spacing">3</property>
+                                                <property name="row_spacing">3</property>
+                                                <child>
+                                                  <widget class="GtkColorButton" id="magBorderColorButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="response_id">0</property>
+                                                    <accessibility>
+                                                      <atkrelation target="magBorderColorLabel" type="labelled-by"/>
+                                                    </accessibility>
+                                                    <signal name="color_set" handler="magBorderColorSet"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkLabel" id="magBorderColorLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Border color:</property>
+                                                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                                    <accessibility>
+                                                      <atkrelation target="magBorderColorButton" type="label-for"/>
+                                                    </accessibility>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkSpinButton" id="magBorderSizeSpinButton">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="adjustment">1 0 20 1 10 10</property>
+                                                    <property name="climb_rate">1</property>
+                                                    <accessibility>
+                                                      <atkrelation target="magBorderSizeLabel" type="labelled-by"/>
+                                                    </accessibility>
+                                                    <signal name="value_changed" handler="magBorderSizeValueChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkLabel" id="magBorderSizeLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Border size:</property>
+                                                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                                    <accessibility>
+                                                      <atkrelation target="magBorderSizeSpinButton" type="label-for"/>
+                                                    </accessibility>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="x_options">GTK_FILL</property>
+                                                    <property name="y_options"></property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label36">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Border Settings&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="type">label_item</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="top_attach">1</property>
+                            <property name="bottom_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment23">
+                            <property name="visible">True</property>
+                            <property name="top_padding">12</property>
+                            <child>
+                              <widget class="GtkFrame" id="magZoomerSettingsFrame">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment41">
+                                    <property name="visible">True</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <widget class="GtkTable" id="table5">
+                                        <property name="visible">True</property>
+                                        <property name="border_width">6</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">3</property>
+                                        <property name="row_spacing">3</property>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment60">
+                                            <property name="visible">True</property>
+                                            <property name="left_padding">25</property>
+                                            <child>
+                                              <widget class="GtkHBox" id="hbox46">
+                                                <property name="visible">True</property>
+                                                <property name="spacing">3</property>
+                                                <child>
+                                                  <widget class="GtkLabel" id="magZoomerPositionLabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">_Position:</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="mnemonic_widget">magZoomerPositionComboBox</property>
+                                                    <accessibility>
+                                                      <atkrelation target="magZoomerPositionComboBox" type="label-for"/>
+                                                    </accessibility>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkComboBox" id="magZoomerPositionComboBox">
+                                                    <property name="visible">True</property>
+                                                    <property name="items" translatable="yes">Full Screen
+Top Half
+Bottom Half
+Left Half
+Right Half
+Custom</property>
+                                                    <accessibility>
+                                                      <atkrelation target="magZoomerPositionLabel" type="labelled-by"/>
+                                                    </accessibility>
+                                                    <signal name="changed" handler="magZoomerPositionChanged"/>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="fill">False</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment61">
+                                            <property name="visible">True</property>
+                                            <property name="left_padding">10</property>
+                                            <child>
+                                              <widget class="GtkTable" id="magZoomerCustomPositionTable">
+                                                <property name="visible">True</property>
+                                                <property name="border_width">3</property>
+                                                <property name="n_rows">3</property>
+                                                <property name="n_columns">2</property>
+                                                <property name="column_spacing">3</property>
+                                                <property name="row_spacing">3</property>
+                                                <child>
+                                                  <widget class="GtkHBox" id="hbox22">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <widget class="GtkFixed" id="fixed1">
+                                                        <property name="visible">True</property>
+                                                      </widget>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="magZoomerLeftLabel">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">_Left:</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                                                        <property name="mnemonic_widget">magZoomerLeftSpinButton</property>
+                                                        <accessibility>
+                                                          <atkrelation target="magZoomerLeftSpinButton" type="label-for"/>
+                                                        </accessibility>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="padding">3</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkSpinButton" id="magZoomerLeftSpinButton">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="adjustment">1 1 9999 1 10 10</property>
+                                                        <property name="climb_rate">1</property>
+                                                        <accessibility>
+                                                          <atkrelation target="magZoomerLeftLabel" type="labelled-by"/>
+                                                        </accessibility>
+                                                        <signal name="value_changed" handler="magZoomerLeftValueChanged"/>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="position">2</property>
+                                                      </packing>
+                                                    </child>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkHBox" id="hbox25">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="magZoomerRightLabel">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">_Right:</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="mnemonic_widget">magZoomerRightSpinButton</property>
+                                                        <accessibility>
+                                                          <atkrelation target="magZoomerRightSpinButton" type="label-for"/>
+                                                        </accessibility>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="padding">4</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkSpinButton" id="magZoomerRightSpinButton">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="adjustment">1 1 9999 1 10 10</property>
+                                                        <property name="climb_rate">1</property>
+                                                        <accessibility>
+                                                          <atkrelation target="magZoomerRightLabel" type="labelled-by"/>
+                                                        </accessibility>
+                                                        <signal name="value_changed" handler="magZoomerRightValueChanged"/>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkFixed" id="fixed2">
+                                                        <property name="visible">True</property>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="pack_type">GTK_PACK_END</property>
+                                                        <property name="position">2</property>
+                                                      </packing>
+                                                    </child>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="bottom_attach">2</property>
+                                                    <property name="x_options"></property>
+                                                    <property name="y_options">GTK_FILL</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkHBox" id="hbox24">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="magZoomerBottomLabel">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">_Bottom:</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="mnemonic_widget">magZoomerBottomSpinButton</property>
+                                                        <accessibility>
+                                                          <atkrelation target="magZoomerBottomSpinButton" type="label-for"/>
+                                                        </accessibility>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="padding">3</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkSpinButton" id="magZoomerBottomSpinButton">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="adjustment">1 1 9999 1 10 10</property>
+                                                        <property name="climb_rate">1</property>
+                                                        <accessibility>
+                                                          <atkrelation target="magZoomerBottomLabel" type="labelled-by"/>
+                                                        </accessibility>
+                                                        <signal name="value_changed" handler="magZoomerBottomValueChanged"/>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="bottom_attach">3</property>
+                                                    <property name="x_options"></property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkHBox" id="hbox23">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <widget class="GtkLabel" id="magZoomerTopLabel">
+                                                        <property name="visible">True</property>
+                                                        <property name="label" translatable="yes">_Top:</property>
+                                                        <property name="use_underline">True</property>
+                                                        <property name="mnemonic_widget">magZoomerTopSpinButton</property>
+                                                        <accessibility>
+                                                          <atkrelation target="magZoomerTopSpinButton" type="label-for"/>
+                                                        </accessibility>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="padding">3</property>
+                                                      </packing>
+                                                    </child>
+                                                    <child>
+                                                      <widget class="GtkSpinButton" id="magZoomerTopSpinButton">
+                                                        <property name="visible">True</property>
+                                                        <property name="can_focus">True</property>
+                                                        <property name="adjustment">1 1 9999 1 10 10</property>
+                                                        <property name="climb_rate">1</property>
+                                                        <accessibility>
+                                                          <atkrelation target="magZoomerTopLabel" type="labelled-by"/>
+                                                        </accessibility>
+                                                        <signal name="value_changed" handler="magZoomerTopValueChanged"/>
+                                                      </widget>
+                                                      <packing>
+                                                        <property name="expand">False</property>
+                                                        <property name="fill">False</property>
+                                                        <property name="pack_type">GTK_PACK_END</property>
+                                                        <property name="position">1</property>
+                                                      </packing>
+                                                    </child>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="right_attach">2</property>
+                                                    <property name="x_options"></property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkSpinButton" id="magZoomFactorSpinButton">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="adjustment">1 1 16 0.25 10 10</property>
+                                            <property name="climb_rate">1</property>
+                                            <property name="digits">2</property>
+                                            <accessibility>
+                                              <atkrelation target="magZoomFactorLabel" type="labelled-by"/>
+                                            </accessibility>
+                                            <signal name="value_changed" handler="magZoomFactorValueChanged"/>
+                                          </widget>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment30">
+                                            <property name="visible">True</property>
+                                            <property name="top_padding">12</property>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment31">
+                                            <property name="visible">True</property>
+                                            <property name="top_padding">12</property>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkLabel" id="magZoomFactorLabel">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Scale _factor:</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="mnemonic_widget">magZoomFactorSpinButton</property>
+                                            <accessibility>
+                                              <atkrelation target="magZoomFactorSpinButton" type="label-for"/>
+                                            </accessibility>
+                                          </widget>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkLabel" id="label21">
+                                    <property name="visible">True</property>
+                                    <property name="label" translatable="yes">&lt;b&gt;Zoomer Settings&lt;/b&gt;</property>
+                                    <property name="use_markup">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="type">label_item</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="right_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">4</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="magnifierTabLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Magnifier</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="position">4</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="keyBindingsVBox">
+                    <property name="visible">True</property>
+                    <property name="border_width">12</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox36">
+                        <property name="visible">True</property>
+                        <property name="spacing">3</property>
+                        <child>
+                          <widget class="GtkLabel" id="orcaModKeyLabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">Orca _Modifier Key(s):</property>
+                            <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">orcaModKeyEntry</property>
+                            <accessibility>
+                              <atkrelation target="orcaModKeyEntry" type="label-for"/>
+                            </accessibility>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="orcaModKeyEntry">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip" translatable="yes">Orca Modifier Keys</property>
+                            <property name="editable">False</property>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkScrolledWindow" id="scrolledwindow1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                        <property name="shadow_type">GTK_SHADOW_IN</property>
+                        <child>
+                          <widget class="GtkTreeView" id="keyBindingsTreeview">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="reorderable">True</property>
+                            <property name="rules_hint">True</property>
+                          </widget>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="menu_label">Key Binding List</property>
+                    <property name="position">5</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="keyBindingsTabLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Key Bindings</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="position">5</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkVBox" id="vbox29">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkFrame" id="pronunciationFrame">
+                        <property name="visible">True</property>
+                        <property name="border_width">5</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment58">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkScrolledWindow" id="scrolledwindow3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="border_width">5</property>
+                                <property name="shadow_type">GTK_SHADOW_IN</property>
+                                <child>
+                                  <widget class="GtkTreeView" id="pronunciationTreeView">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="reorderable">True</property>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="pronunciationDictFrameLabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Pronunciation Dictionary&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox44">
+                        <property name="visible">True</property>
+                        <property name="border_width">5</property>
+                        <child>
+                          <widget class="GtkButton" id="pronunciationAddButton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="border_width">5</property>
+                            <property name="label" translatable="yes">_New entry</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" handler="pronunciationAddButtonClicked"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkButton" id="pronunciationDeleteButton">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="border_width">5</property>
+                            <property name="label" translatable="yes">_Delete</property>
+                            <property name="use_underline">True</property>
+                            <property name="response_id">0</property>
+                            <signal name="clicked" handler="pronunciationDeleteButtonClicked"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">6</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="pronunciationTabLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Pronunciation</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="position">6</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkHBox" id="textAttributesHBox">
+                    <property name="visible">True</property>
+                    <property name="border_width">5</property>
+                    <child>
+                      <widget class="GtkFrame" id="textAttributesFrame">
+                        <property name="visible">True</property>
+                        <property name="border_width">5</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">GTK_SHADOW_NONE</property>
+                        <child>
+                          <widget class="GtkAlignment" id="alignment53">
+                            <property name="visible">True</property>
+                            <property name="left_padding">12</property>
+                            <child>
+                              <widget class="GtkVBox" id="vbox24">
+                                <property name="visible">True</property>
+                                <child>
+                                  <widget class="GtkScrolledWindow" id="scrolledwindow2">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="border_width">5</property>
+                                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                                    <child>
+                                      <widget class="GtkTreeView" id="textAttributesTreeView">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="reorderable">True</property>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="hbox41">
+                                    <property name="visible">True</property>
+                                    <property name="border_width">5</property>
+                                    <child>
+                                      <widget class="GtkButton" id="textSelectAllButton">
+                                        <property name="can_focus">True</property>
+                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes">_Speak all</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="textSelectAllButtonClicked"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="textUnselectAllButton">
+                                        <property name="can_focus">True</property>
+                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes">Speak _none</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="textUnselectAllButtonClicked"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="textResetButton">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes">_Reset</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="textResetButtonClicked"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                        </child>
+                        <child>
+                          <widget class="GtkLabel" id="textAttributesFrameLabel">
+                            <property name="visible">True</property>
+                            <property name="label" translatable="yes">&lt;b&gt;Text attributes&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </widget>
+                          <packing>
+                            <property name="type">label_item</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
+                      <widget class="GtkVBox" id="vbox26">
+                        <property name="visible">True</property>
+                        <property name="homogeneous">True</property>
+                        <child>
+                          <widget class="GtkFrame" id="adjustAttributesFrame">
+                            <property name="visible">True</property>
+                            <property name="border_width">5</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment55">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <widget class="GtkVBox" id="vbox25">
+                                    <property name="visible">True</property>
+                                    <property name="border_width">5</property>
+                                    <child>
+                                      <widget class="GtkButton" id="textMoveToTopButton">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes" comments="Translators:  This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _top button, move that attribute to the top of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move to _top</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="textMoveToTopButtonClicked"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="textMoveUpOneButton">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _up one button, move that attribute up one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move _up one</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="textMoveUpOneButtonClicked"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="textMoveDownOneButton">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move _down one button, move that attribute down one line in the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move _down one</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="textMoveDownOneButtonClicked"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkButton" id="textMoveToBottomButton">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="border_width">5</property>
+                                        <property name="label" translatable="yes" comments="Translators: This label is on a button on the Text Attributes pane of the Orca Preferences dialog. On that pane there is a long list of possible text attributes. The user can select one and then, by using the Move to _bottom button, move that attribute to the bottom of the list. The ordering in the list is important as Orca will speak the selected text attributes in the given order.">Move to _bottom</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <signal name="clicked" handler="textMoveToBottomButtonClicked"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label26">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Adjust selected
 attributes&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>
-			      <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>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="type">label_item</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkFrame" id="brailleIndicatorFrame">
+                            <property name="visible">True</property>
+                            <property name="border_width">5</property>
+                            <property name="label_xalign">0</property>
+                            <property name="shadow_type">GTK_SHADOW_NONE</property>
+                            <child>
+                              <widget class="GtkAlignment" id="alignment56">
+                                <property name="visible">True</property>
+                                <property name="left_padding">12</property>
+                                <child>
+                                  <widget class="GtkVBox" id="vbox27">
+                                    <property name="visible">True</property>
+                                    <property name="border_width">3</property>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="textBrailleNoneButton">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">_None</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <signal name="toggled" handler="brailleIndicatorChanged"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="textBraille7Button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Dot _7</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">textBrailleNoneButton</property>
+                                        <signal name="toggled" handler="brailleIndicatorChanged"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="textBraille8Button">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Dot _8</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">textBrailleNoneButton</property>
+                                        <signal name="toggled" handler="brailleIndicatorChanged"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">2</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkRadioButton" id="textBrailleBothButton">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="label" translatable="yes">Dots 7 an_d 8</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="response_id">0</property>
+                                        <property name="draw_indicator">True</property>
+                                        <property name="group">textBrailleNoneButton</property>
+                                        <signal name="toggled" handler="brailleIndicatorChanged"/>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">3</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                </child>
+                              </widget>
+                            </child>
+                            <child>
+                              <widget class="GtkLabel" id="label27">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Braille Indicator&lt;/b&gt;</property>
+                                <property name="use_markup">True</property>
+                              </widget>
+                              <packing>
+                                <property name="type">label_item</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </widget>
+                  <packing>
+                    <property name="position">7</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="textAttributesTabLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">Text Attributes</property>
+                  </widget>
+                  <packing>
+                    <property name="type">tab</property>
+                    <property name="position">7</property>
+                    <property name="tab_fill">False</property>
+                  </packing>
+                </child>
+              </widget>
+              <packing>
+                <property name="padding">3</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area1">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="helpButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-11</property>
+                <signal name="clicked" handler="helpButtonClicked"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="applyButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-apply</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-10</property>
+                <signal name="clicked" handler="applyButtonClicked"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="cancelButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-6</property>
+                <signal name="clicked" handler="cancelButtonClicked"/>
+              </widget>
+              <packing>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="okButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+                <signal name="clicked" handler="okButtonClicked"/>
+              </widget>
+              <packing>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkDialog" id="orcaPrefsWarningDialog">
+    <property name="visible">True</property>
+    <property name="title" translatable="yes">Warning</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <property name="has_separator">False</property>
+    <signal name="destroy" handler="orcaPrefsWarningDialogDestroyed"/>
+    <child internal-child="vbox">
+      <widget class="GtkVBox" id="dialog-vbox2">
+        <property name="visible">True</property>
+        <child>
+          <widget class="GtkHBox" id="hbox45">
+            <property name="visible">True</property>
+            <property name="border_width">12</property>
+            <child>
+              <widget class="GtkImage" id="image1">
+                <property name="visible">True</property>
+                <property name="stock">gtk-info</property>
+                <property name="icon_size">6</property>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label29">
+                <property name="visible">True</property>
+                <property name="yalign">0</property>
+                <property name="label" translatable="yes">You already have an instance of an Orca preferences dialog open.
 
-		      <child>
-			<widget class="GtkFrame" id="brailleIndicatorFrame">
-			  <property name="border_width">5</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="GtkAlignment" id="alignment56">
-			      <property name="visible">True</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xscale">1</property>
-			      <property name="yscale">1</property>
-			      <property name="top_padding">0</property>
-			      <property name="bottom_padding">0</property>
-			      <property name="left_padding">12</property>
-			      <property name="right_padding">0</property>
-
-			      <child>
-				<widget class="GtkVBox" id="vbox27">
-				  <property name="border_width">3</property>
-				  <property name="visible">True</property>
-				  <property name="homogeneous">False</property>
-				  <property name="spacing">0</property>
-
-				  <child>
-				    <widget class="GtkRadioButton" id="textBrailleNoneButton">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">_None</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="brailleIndicatorChanged" last_modification_time="Wed, 20 Jun 2007 15:35:15 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkRadioButton" id="textBraille7Button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Dot _7</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <property name="active">False</property>
-				      <property name="inconsistent">False</property>
-				      <property name="draw_indicator">True</property>
-				      <property name="group">textBrailleNoneButton</property>
-				      <signal name="toggled" handler="brailleIndicatorChanged" last_modification_time="Wed, 20 Jun 2007 15:35:33 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkRadioButton" id="textBraille8Button">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Dot _8</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <property name="active">False</property>
-				      <property name="inconsistent">False</property>
-				      <property name="draw_indicator">True</property>
-				      <property name="group">textBrailleNoneButton</property>
-				      <signal name="toggled" handler="brailleIndicatorChanged" last_modification_time="Wed, 20 Jun 2007 15:35:46 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-
-				  <child>
-				    <widget class="GtkRadioButton" id="textBrailleBothButton">
-				      <property name="visible">True</property>
-				      <property name="can_focus">True</property>
-				      <property name="label" translatable="yes">Dots 7 an_d 8</property>
-				      <property name="use_underline">True</property>
-				      <property name="relief">GTK_RELIEF_NORMAL</property>
-				      <property name="focus_on_click">True</property>
-				      <property name="active">False</property>
-				      <property name="inconsistent">False</property>
-				      <property name="draw_indicator">True</property>
-				      <property name="group">textBrailleNoneButton</property>
-				      <signal name="toggled" handler="brailleIndicatorChanged" last_modification_time="Wed, 20 Jun 2007 15:35:57 GMT"/>
-				    </widget>
-				    <packing>
-				      <property name="padding">0</property>
-				      <property name="expand">False</property>
-				      <property name="fill">False</property>
-				    </packing>
-				  </child>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label27">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">&lt;b&gt;Braille Indicator&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>
-			      <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>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="tab_expand">False</property>
-		  <property name="tab_fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="textAttributesTabLabel">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Text Attributes</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0.5</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="type">tab</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">3</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="orcaPrefsWarningDialog">
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">Warning</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">True</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_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">False</property>
-  <signal name="destroy" handler="orcaPrefsWarningDialogDestroyed" last_modification_time="Fri, 02 Nov 2007 19:52:34 GMT"/>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="orcaAppPrefsDialogOKButton">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <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>
-	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="orcaPrefsWarningDialogOKButtonClicked" last_modification_time="Mon, 08 Oct 2007 18:58:36 GMT"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">2</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHBox" id="hbox45">
-	  <property name="border_width">12</property>
-	  <property name="visible">True</property>
-	  <property name="homogeneous">False</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkImage" id="image1">
-	      <property name="visible">True</property>
-	      <property name="stock">gtk-info</property>
-	      <property name="icon_size">6</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label29">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">You already have an instance of an Orca preferences dialog open.
-
 Please close it before opening a new one.</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">True</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">5</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
+                <property name="use_markup">True</property>
+                <property name="wrap">True</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="padding">5</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child internal-child="action_area">
+          <widget class="GtkHButtonBox" id="dialog-action_area2">
+            <property name="visible">True</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="orcaAppPrefsDialogOKButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">-5</property>
+                <signal name="clicked" handler="orcaPrefsWarningDialogOKButtonClicked"/>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="padding">2</property>
+            <property name="pack_type">GTK_PACK_END</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
+  <widget class="GtkWindow" id="orcaMagAdvancedDialog">
+    <property name="title" translatable="yes">Advanced Settings</property>
+    <property name="modal">True</property>
+    <property name="window_position">GTK_WIN_POS_MOUSE</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+    <signal name="destroy" handler="magAdvancedDialogDestroyed"/>
+    <child>
+      <widget class="GtkVBox" id="vbox30">
+        <property name="visible">True</property>
+        <property name="border_width">5</property>
+        <child>
+          <widget class="GtkAlignment" id="alignment66">
+            <property name="visible">True</property>
+            <property name="top_padding">5</property>
+            <child>
+              <widget class="GtkHBox" id="hbox53">
+                <property name="visible">True</property>
+                <property name="border_width">5</property>
+                <property name="spacing">5</property>
+                <child>
+                  <widget class="GtkLabel" id="magSmoothingLabel">
+                    <property name="visible">True</property>
+                    <property name="xalign">1</property>
+                    <property name="label" translatable="yes">_Smoothing:</property>
+                    <property name="use_underline">True</property>
+                    <property name="justify">GTK_JUSTIFY_RIGHT</property>
+                    <property name="mnemonic_widget">magSmoothingComboBox</property>
+                    <accessibility>
+                      <atkrelation target="magSmoothingComboBox" type="label-for"/>
+                    </accessibility>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkComboBox" id="magSmoothingComboBox">
+                    <property name="visible">True</property>
+                    <property name="items" translatable="yes">None
+Bilinear</property>
+                    <accessibility>
+                      <atkrelation target="magSmoothingLabel" type="labelled-by"/>
+                    </accessibility>
+                    <signal name="changed" handler="magSmoothingChanged"/>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkAlignment" id="alignment67">
+            <property name="visible">True</property>
+            <property name="top_padding">12</property>
+            <child>
+              <widget class="GtkFrame" id="frame12">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment76">
+                    <property name="visible">True</property>
+                    <property name="top_padding">5</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkTable" id="table17">
+                        <property name="visible">True</property>
+                        <property name="n_rows">1</property>
+                        <property name="n_columns">3</property>
+                        <property name="column_spacing">25</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox58">
+                            <property name="visible">True</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <widget class="GtkLabel" id="magBrightnessBlueLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Blue:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">magBrightnessBlueSpinButton</property>
+                                <accessibility>
+                                  <atkrelation target="magBrightnessBlueSpinButton" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkSpinButton" id="magBrightnessBlueSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">0 -1 1 0.050000000745099998 0.25 0.25</property>
+                                <property name="climb_rate">1</property>
+                                <property name="digits">2</property>
+                                <property name="numeric">True</property>
+                                <accessibility>
+                                  <atkrelation target="magBrightnessBlueLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="magBrightnessBlueValueChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox57">
+                            <property name="visible">True</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <widget class="GtkLabel" id="magBrightnessGreenLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Green:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">magBrightnessGreenSpinButton</property>
+                                <accessibility>
+                                  <atkrelation target="magBrightnessGreenSpinButton" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkSpinButton" id="magBrightnessGreenSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">0 -1 1 0.050000000745099998 0.25 0.25</property>
+                                <property name="climb_rate">1</property>
+                                <property name="digits">2</property>
+                                <property name="numeric">True</property>
+                                <accessibility>
+                                  <atkrelation target="magBrightnessGreenLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="magBrightnessGreenValueChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox56">
+                            <property name="visible">True</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <widget class="GtkLabel" id="magBrightnessRedLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">_Red:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">magBrightnessRedSpinButton</property>
+                                <accessibility>
+                                  <atkrelation target="magBrightnessRedSpinButton" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkSpinButton" id="magBrightnessRedSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">0 -1 1 0.050000000745099998 0.25 0.25</property>
+                                <property name="climb_rate">1</property>
+                                <property name="digits">2</property>
+                                <property name="numeric">True</property>
+                                <accessibility>
+                                  <atkrelation target="magBrightnessRedLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="magBrightnessRedValueChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label43">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Brightness&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkAlignment" id="alignment68">
+            <property name="visible">True</property>
+            <property name="top_padding">12</property>
+            <child>
+              <widget class="GtkFrame" id="frame13">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment77">
+                    <property name="visible">True</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkTable" id="table18">
+                        <property name="visible">True</property>
+                        <property name="n_rows">1</property>
+                        <property name="n_columns">3</property>
+                        <property name="column_spacing">25</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox61">
+                            <property name="visible">True</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <widget class="GtkLabel" id="magContrastBlueLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">B_lue:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">magContrastBlueSpinButton</property>
+                                <accessibility>
+                                  <atkrelation target="magContrastBlueSpinButton" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkSpinButton" id="magContrastBlueSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">0 -1 1 0.050000000745099998 0.25 0.25</property>
+                                <property name="climb_rate">1</property>
+                                <property name="digits">2</property>
+                                <property name="numeric">True</property>
+                                <accessibility>
+                                  <atkrelation target="magContrastBlueLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="magContrastBlueValueChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox60">
+                            <property name="visible">True</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <widget class="GtkLabel" id="magContrastGreenLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">Gree_n:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">magContrastGreenSpinButton</property>
+                                <accessibility>
+                                  <atkrelation target="magContrastGreenSpinButton" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkSpinButton" id="magContrastGreenSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">0 -1 1 0.050000000745099998 0.25 0.25</property>
+                                <property name="climb_rate">1</property>
+                                <property name="digits">2</property>
+                                <property name="numeric">True</property>
+                                <accessibility>
+                                  <atkrelation target="magContrastGreenLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="magContrastGreenValueChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox59">
+                            <property name="visible">True</property>
+                            <property name="spacing">5</property>
+                            <child>
+                              <widget class="GtkLabel" id="magContrastRedLabel">
+                                <property name="visible">True</property>
+                                <property name="label" translatable="yes">R_ed:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">magContrastRedSpinButton</property>
+                                <accessibility>
+                                  <atkrelation target="magBrightnessRedSpinButton" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkSpinButton" id="magContrastRedSpinButton">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="adjustment">0 -1 1 0.050000000745099998 0.25 0.25</property>
+                                <property name="climb_rate">1</property>
+                                <property name="digits">2</property>
+                                <accessibility>
+                                  <atkrelation target="magContrastRedLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="value_changed" handler="magContrastRedValueChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="x_options">GTK_FILL</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label47">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Contrast&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkAlignment" id="alignment69">
+            <property name="visible">True</property>
+            <property name="top_padding">12</property>
+            <property name="left_padding">5</property>
+            <child>
+              <widget class="GtkHBox" id="hbox62">
+                <property name="visible">True</property>
+                <property name="spacing">5</property>
+                <child>
+                  <widget class="GtkLabel" id="magColorFilteringLabel">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">_Color Filtering:</property>
+                    <property name="use_underline">True</property>
+                    <property name="mnemonic_widget">magColorFilteringComboBox</property>
+                    <accessibility>
+                      <atkrelation target="magColorFilteringComboBox" type="label-for"/>
+                    </accessibility>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkComboBox" id="magColorFilteringComboBox">
+                    <property name="visible">True</property>
+                    <property name="items" translatable="yes">None
+Saturate red
+Saturate green
+Saturate blue
+Desaturate red
+Desaturate green
+Desaturate blue
+Positive hue shift
+Negative hue shift</property>
+                    <accessibility>
+                      <atkrelation target="magColorFilteringLabel" type="labelled-by"/>
+                    </accessibility>
+                    <signal name="changed" handler="magColorFilteringChanged"/>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkAlignment" id="alignment65">
+            <property name="visible">True</property>
+            <property name="top_padding">12</property>
+            <child>
+              <widget class="GtkFrame" id="magMultiMonitorFrame">
+                <property name="visible">True</property>
+                <property name="label_xalign">0</property>
+                <property name="shadow_type">GTK_SHADOW_NONE</property>
+                <child>
+                  <widget class="GtkAlignment" id="alignment63">
+                    <property name="visible">True</property>
+                    <property name="border_width">6</property>
+                    <property name="left_padding">12</property>
+                    <child>
+                      <widget class="GtkTable" id="table11">
+                        <property name="visible">True</property>
+                        <property name="n_rows">1</property>
+                        <property name="n_columns">2</property>
+                        <property name="column_spacing">20</property>
+                        <child>
+                          <widget class="GtkHBox" id="hbox52">
+                            <property name="visible">True</property>
+                            <property name="spacing">3</property>
+                            <child>
+                              <widget class="GtkLabel" id="magTargetDisplayLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Target displa_y:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">magTargetDisplayEntry</property>
+                                <accessibility>
+                                  <atkrelation target="magTargetDisplayEntry" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="magTargetDisplayEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">*</property>
+                                <accessibility>
+                                  <atkrelation target="magTargetDisplayLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="changed" handler="magTargetDisplayChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
+                            <property name="y_options">GTK_FILL</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkHBox" id="hbox51">
+                            <property name="visible">True</property>
+                            <property name="spacing">3</property>
+                            <child>
+                              <widget class="GtkLabel" id="magSourceDisplayLabel">
+                                <property name="visible">True</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">S_ource display:</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">magSourceDisplayEntry</property>
+                                <accessibility>
+                                  <atkrelation target="magSourceDisplayEntry" type="label-for"/>
+                                </accessibility>
+                              </widget>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <widget class="GtkEntry" id="magSourceDisplayEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">*</property>
+                                <accessibility>
+                                  <atkrelation target="magSourceDisplayLabel" type="labelled-by"/>
+                                </accessibility>
+                                <signal name="changed" handler="magSourceDisplayChanged"/>
+                              </widget>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+                <child>
+                  <widget class="GtkLabel" id="label35">
+                    <property name="visible">True</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Multi-monitor Settings&lt;/b&gt;</property>
+                    <property name="use_markup">True</property>
+                  </widget>
+                  <packing>
+                    <property name="type">label_item</property>
+                  </packing>
+                </child>
+              </widget>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">4</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="border_width">5</property>
+            <property name="spacing">5</property>
+            <property name="layout_style">GTK_BUTTONBOX_END</property>
+            <child>
+              <widget class="GtkButton" id="magAdvancedCancelButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-cancel</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="magAdvancedCancelButtonClicked"/>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkButton" id="magAdvancedOkButton">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="label">gtk-ok</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="magAdvancedOkButtonClicked"/>
+              </widget>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="position">5</property>
+          </packing>
+        </child>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>
Index: src/orca/orca_prefs.py
===================================================================
--- src/orca/orca_prefs.py	(revision 3359)
+++ src/orca/orca_prefs.py	(working copy)
@@ -318,12 +318,12 @@
         elif sayAllStyle == settings.SAYALL_STYLE_SENTENCE:
             return "orca.settings.SAYALL_STYLE_SENTENCE"
 
-    def _getMagCursorColorString(self, cursorColor):
-        """Returns a string that represents the magnification cursor color
+    def _getMagColorString(self, cursorColor):
+        """Returns a string that represents the magnification object's color
         passed in.
 
         Arguments:
-        - cursorColor: magnification cursor color
+        - cursorColor: magnification object's color
 
         Returns a string suitable for the preferences file.
         """
@@ -409,6 +409,37 @@
         else:
             return "orca.settings.MAG_TRACKING_MODE_PUSH"
 
+    def _getMagColorFilteringModeString(self, mode):
+        """Returns a string that represents the magnification color filtering
+        mode passed in.
+
+        Arguments:
+        - mode: magnification color filtering mode.
+
+        Returns a string suitable for the preferences file.
+        """
+
+        if mode == settings.MAG_COLOR_FILTERING_MODE_NONE:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_NONE"
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_SATURATE_RED:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_SATURATE_RED"
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_SATURATE_GREEN:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_SATURATE_GREEN"
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_SATURATE_BLUE:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_SATURATE_BLUE"
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_RED:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_DESATURATE_RED"
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_GREEN:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_DESATURATE_GREEN"
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_BLUE:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_DESATURATE_BLUE"
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_POSITIVE_HUE_SHIFT:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_POSITIVE_HUE_SHIFT"
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_NEGATIVE_HUE_SHIFT:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_NEGATIVE_HUE_SHIFT"
+        else:
+            return "orca.settings.MAG_COLOR_FILTERING_MODE_NONE"
+
     def _getMagZoomerTypeString(self, magZoomerType):
         """Returns a string that represents the magnification zoomer position
         type passed in.
@@ -627,8 +658,10 @@
                 value = self._getVerbalizePunctuationStyleString(prefsDict[key])
             elif key == "sayAllStyle":
                 value = self._getSayAllStyleString(prefsDict[key])
-            elif key == "magCursorColor":
-                value = self._getMagCursorColorString(prefsDict[key])
+            elif key in ["magCursorColor",
+                         "magCrossHairColor",
+                         "magZoomerBorderColor"]:
+                value = self._getMagColorString(prefsDict[key])
             elif key == "magSmoothingMode":
                 value = self._getMagSmoothingModeString(prefsDict[key])
             elif key == "magMouseTrackingMode":
@@ -639,6 +672,8 @@
                 value = self._getMagTextTrackingModeString(prefsDict[key])
             elif key == "magZoomerType":
                 value = self._getMagZoomerTypeString(prefsDict[key])
+            elif key == "magColorFilteringMode":
+                value = self._getMagColorFilteringModeString(prefsDict[key])
             elif key == "magSourceDisplay" or key == "magTargetDisplay":
                 value = self._getDisplayString(prefsDict[key])
             elif key == "keyboardLayout":
Index: src/orca/orca_state.py
===================================================================
--- src/orca/orca_state.py	(revision 3359)
+++ src/orca/orca_state.py	(working copy)
@@ -105,6 +105,6 @@
 #
 orcaWD = None
 
-# Handle to the Orca Preferenvces Glade file.
+# Handle to the Orca Preferences Glade file.
 #
 prefsGladeFile = None
Index: src/orca/orca_gui_prefs.py
===================================================================
--- src/orca/orca_gui_prefs.py	(revision 3359)
+++ src/orca/orca_gui_prefs.py	(working copy)
@@ -34,6 +34,7 @@
 import locale
 
 import acss
+import mag
 import orca
 import orca_glade
 import orca_prefs
@@ -57,6 +58,11 @@
 
 (ACTUAL, REPLACEMENT) = range(2)
 
+# Handles to the magnification Advanced Settings Glade GUI object and dialog.
+#
+advancedMag = None
+advancedMagDialog = None
+
 class OrcaSetupGUI(orca_glade.GladeWrapper):
 
     # Translators: this is an algorithm for tracking an object
@@ -89,7 +95,7 @@
     #
     magTrackingPushStr = _("Push")
 
-    def __init__(self, fileName, windowName):
+    def __init__(self, fileName, windowName, prefsDict = None):
         """Initialize the Orca configuration GUI.
 
         Arguments:
@@ -99,6 +105,8 @@
 
         orca_glade.GladeWrapper.__init__(self, fileName, windowName)
 
+        self.prefsDict = prefsDict
+
         # Initialize variables to None to keep pylint happy.
         #
         self.bbindings = None
@@ -114,7 +122,6 @@
         self.newBinding = None
         self.orcaModKeyEntry = None
         self.pendingKeyBindings = None
-        self.prefsDict = None
         self.pronunciationModel = None
         self.pronunciationView = None
         self.screenHeight = None
@@ -139,8 +146,6 @@
         accordingly.
         """
 
-        self.prefsDict = orca_prefs.readPreferences()
-
         # ***** Key Bindings treeview initialization *****
 
         self.keyBindView = self.widgets.get_widget("keyBindingsTreeview")
@@ -1261,7 +1266,8 @@
         display = gtk.gdk.display_get_default()
         nScreens = display.get_n_screens()
         targetScreen = display.get_default_screen()
-        targetDisplay = self.get_widget("magTargetDisplayEntry").get_text()
+        targetDisplay = \
+                     advancedMag.get_widget("magTargetDisplayEntry").get_text()
         if targetDisplay:
             t = targetDisplay.split(".")
             try:
@@ -1442,9 +1448,12 @@
         self.get_widget("magnifierTable").set_sensitive(enable)
 
         # Get the 'Cursor on/off' preference and set the checkbox accordingly.
+        # Set the sensitivity of the other cursor items depending upon this
+        # value.
         #
         value = prefs["enableMagCursor"]
         self.get_widget("magCursorOnOffCheckButton").set_active(value)
+        self.get_widget("magCursorTable").set_sensitive(value)
 
         # Get the 'Explicit cursor size' preference and set the checkbox
         # accordingly. If the value is not checked, then the cursor size
@@ -1472,10 +1481,12 @@
         self.get_widget("magCursorColorButton").set_color(color)
 
         # Get the 'Cross-hair on/off' preference and set the checkbox
-        # accordingly.
+        # accordingly. Set the sensitivity of the other cross-hair items
+        # depending upon this value.
         #
         value = prefs["enableMagCrossHair"]
         self.get_widget("magCrossHairOnOffCheckButton").set_active(value)
+        self.get_widget("magCrossHairTable").set_sensitive(value)
 
         # Get the 'Cross-hair clip on/off' preference and set the checkbox
         # accordingly.
@@ -1489,20 +1500,54 @@
         crosshairSize = prefs["magCrossHairSize"]
         self.get_widget("magCrossHairSizeSpinButton").set_value(crosshairSize)
 
-        # Get the magnification source and target displays.
+        # Get the cross-hair color preference and set the cross-hair color
+        # button accordingly.
         #
-        sourceDisplay = prefs["magSourceDisplay"]
-        self.get_widget("magSourceDisplayEntry").set_text(sourceDisplay)
+        crosshairColor = prefs["magCrossHairColor"]
+        color = gtk.gdk.color_parse(crosshairColor)
+        self.get_widget("magCrossHairColorButton").set_color(color)
 
-        targetDisplay = prefs["magTargetDisplay"]
-        self.get_widget("magTargetDisplayEntry").set_text(targetDisplay)
+        # Get the "Enable border" preference and set the checkbox
+        # accordingly. Set the sensitivity of the other items in the 
+        # border settings frame, depending upon whether this checkbox
+        # is checked.
+        #
+        value = prefs["enableMagZoomerBorder"]
+        self.get_widget("magBorderCheckButton").set_active(value)
+        self.get_widget("magBorderTable").set_sensitive(value)
 
+        # Get the border size preference and set the border size spin
+        # button value accordingly.
+        #
+        borderSize = prefs["magZoomerBorderSize"]
+        self.get_widget("magBorderSizeSpinButton").set_value(borderSize)
+
+        # Get the border color preference and set the border color button
+        # accordingly.
+        #
+        borderColor = prefs["magZoomerBorderColor"]
+        color = gtk.gdk.color_parse(borderColor)
+        self.get_widget("magBorderColorButton").set_color(color)
+
+        # Get the Brightness level and set its spin button value
+        # accordingly.
+        #
+        level = prefs["magBrightnessLevel"]
+        self.get_widget("magColorBrightnessSpinButton").set_value(level)
+
+        # Get the Contrast level and set its spin button value accordingly.
+        #
+        level = prefs["magContrastLevel"]
+        self.get_widget("magColorContrastSpinButton").set_value(level)
+
         # Get the width and the height of the source screen. If there is
         # no source screen set, use the default.
         #
         display = gtk.gdk.display_get_default()
         nScreens = display.get_n_screens()
         sourceScreen = display.get_default_screen()
+        sourceDisplay = \
+                     advancedMag.get_widget("magSourceDisplayEntry").get_text()
         if sourceDisplay:
             s = sourceDisplay.split(".")
             try:
@@ -1551,7 +1596,7 @@
             zoomerType = _("Full Screen")
 
         magZoomerPositionComboBox = self.get_widget("magZoomerPositionComboBox")
-        index = self._getComboBoxIndex(magZoomerPositionComboBox, zoomerType)
+        index = self.getComboBoxIndex(magZoomerPositionComboBox, zoomerType)
         magZoomerPositionComboBox.set_active(index)
 
         # Set the magnifier zoomer position items [in]sensensitive,
@@ -1576,30 +1621,6 @@
         value = prefs["enableMagZoomerColorInversion"]
         self.get_widget("magInvertColorsCheckBox").set_active(value)
 
-        # Get the smoothing preference and set the active value for the
-        # smoothing combobox accordingly.
-        #
-        smoothingMode = prefs["magSmoothingMode"]
-        if smoothingMode == settings.MAG_SMOOTHING_MODE_BILINEAR:
-            # Translators: this is an algorithm for magnifying pixels
-            # on the screen.
-            #
-            mode = _("Bilinear")
-        elif smoothingMode == settings.MAG_SMOOTHING_MODE_NONE:
-            # Translators: this is an algorithm for tracking the mouse
-            # with the magnifier.  None means that Orca does nothing to
-            # track the mouse.
-            #
-            mode = _("None")
-        else:
-            # Translators: this is an algorithm for magnifying pixels
-            # on the screen.
-            #
-            mode = _("Bilinear")
-        magSmoothingComboBox = self.get_widget("magSmoothingComboBox")
-        index = self._getComboBoxIndex(magSmoothingComboBox, mode)
-        magSmoothingComboBox.set_active(index)
-
         # Get the mouse tracking preference and set the active value for
         # the mouse tracking combobox accordingly.
         #
@@ -1615,7 +1636,7 @@
         else:
             mode = self.magTrackingCenteredStr
         magMouseTrackingComboBox = self.get_widget("magMouseTrackingComboBox")
-        index = self._getComboBoxIndex(magMouseTrackingComboBox, mode)
+        index = self.getComboBoxIndex(magMouseTrackingComboBox, mode)
         magMouseTrackingComboBox.set_active(index)
 
         # Get the control and menu item tracking preference and set the 
@@ -1633,7 +1654,7 @@
             mode = self.magTrackingPushStr
         magControlTrackingComboBox = \
                          self.get_widget("magControlTrackingComboBox")
-        index = self._getComboBoxIndex(magControlTrackingComboBox, mode)
+        index = self.getComboBoxIndex(magControlTrackingComboBox, mode)
         magControlTrackingComboBox.set_active(index)
 
         # Get the text cursor tracking preference and set the active value
@@ -1650,7 +1671,7 @@
             mode = self.magTrackingPushStr
         magTextCursorTrackingComboBox = \
                          self.get_widget("magTextCursorTrackingComboBox")
-        index = self._getComboBoxIndex(magTextCursorTrackingComboBox, mode)
+        index = self.getComboBoxIndex(magTextCursorTrackingComboBox, mode)
         magTextCursorTrackingComboBox.set_active(index)
         self.get_widget("magEdgeMarginHBox").\
             set_sensitive(textCursorTrackingMode == \
@@ -1700,7 +1721,7 @@
         else:
             self.get_widget("generalLaptopButton").set_active(True)
 
-    def _getComboBoxIndex(self, combobox, searchStr):
+    def getComboBoxIndex(self, combobox, searchStr):
         """ For each of the entries in the given combo box, look for searchStr.
             Return the index of the entry if searchStr is found.
 
@@ -2321,7 +2342,7 @@
     def navigationKeysChecked(self, widget):
         """Signal handler for the "toggled" signal for the
            navigationCheckbutton GtkCheckButton widget. The user has
-           [un]checked the 'Enable navigation keys" checkbox. Set the
+           [un]checked the 'Enable navigation keys' checkbox. Set the
            'enableNavigationKeys' preference to the new value.
 
         Arguments:
@@ -2608,6 +2629,11 @@
         """
 
         enable = widget.get_active()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            if enable:
+                mag.init()
+            else:
+                mag.shutdown()
         self.prefsDict["enableMagnifier"] = enable
         self.get_widget("magnifierTable").set_sensitive(enable)
 
@@ -2616,13 +2642,21 @@
            magCursorOnOffCheckButton GtkCheckButton widget.
            The user has [un]checked the magnification cursor settings
            'Cursor on/off' checkbox. Set the 'enableMagCursor' preference
-           to the new value.
+           to the new value. Set the sensitivity of the other cursor items
+           depending upon this new value.
 
         Arguments:
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["enableMagCursor"] = widget.get_active()
+        enableCursor = widget.get_active()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            custom = self.get_widget("magCursorSizeCheckButton").get_active()
+            size = \
+                 self.get_widget("magCursorSizeSpinButton").get_value_as_int()
+            mag.setMagnifierCursor(enableCursor, custom, size)
+        self.prefsDict["enableMagCursor"] = enableCursor
+        self.get_widget("magCursorTable").set_sensitive(enableCursor)
 
     def magCursorExplicitSizeChecked(self, widget):
         """Signal handler for the "toggled" signal for the
@@ -2638,6 +2672,10 @@
         """
 
         enable = widget.get_active()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            size = \
+                 self.get_widget("magCursorSizeSpinButton").get_value_as_int()
+            mag.setMagnifierCursor(True, enable, size)
         self.prefsDict["enableMagCursorExplicitSize"] = enable
         self.get_widget("magCursorSizeSpinButton").set_sensitive(enable)
         self.get_widget("magCursorSizeLabel").set_sensitive(enable)
@@ -2653,7 +2691,10 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["magCursorSize"] = widget.get_value_as_int()
+        size = widget.get_value_as_int()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setMagnifierCursor(True, True, size)
+        self.prefsDict["magCursorSize"] = size
 
     def magCursorColorSet(self, widget):
         """Signal handler for the "color_set" signal for the
@@ -2668,6 +2709,18 @@
 
         color = widget.get_color()
         cursorColor = "#%04X%04X%04X" % (color.red, color.green, color.blue)
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setMagnifierObjectColor("cursor-color", cursorColor)
+
+            # For some reason, live updating of the cursor color is not
+            # working. Toggling the visibility with setMagnifierCursor()
+            # seems to force the updating we want.
+            #
+            size = \
+                 self.get_widget("magCursorSizeSpinButton").get_value_as_int()
+            mag.setMagnifierCursor(False, False, 0)
+            mag.setMagnifierCursor(True, True, size)
+
         self.prefsDict["magCursorColor"] = cursorColor
 
     def magCrossHairOnOffChecked(self, widget):
@@ -2675,13 +2728,18 @@
            magCrossHairOnOffCheckButton GtkCheckButton widget.
            The user has [un]checked the magnification cross-hair settings
            'Cross-hair on/off' checkbox. Set the 'enableMagCrossHair'
-           preference to the new value.
+           preference to the new value. Set the sensitivity of the other
+           cross-hair items depending upon this new value.
 
         Arguments:
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["enableMagCrossHair"] = widget.get_active()
+        value = widget.get_active()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setMagnifierCrossHair(value)
+        self.prefsDict["enableMagCrossHair"] = value
+        self.get_widget("magCrossHairTable").set_sensitive(value)
 
     def magCrossHairClipOnOffChecked(self, widget):
         """Signal handler for the "toggled" signal for the
@@ -2694,7 +2752,10 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["enableMagCrossHairClip"] = widget.get_active()
+        value = widget.get_active()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setMagnifierCrossHairClip(value)
+        self.prefsDict["enableMagCrossHairClip"] = value
 
     def magCrossHairSizeValueChanged(self, widget):
         """Signal handler for the "value_changed" signal for the
@@ -2707,8 +2768,28 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["magCrossHairSize"] = widget.get_value_as_int()
+        value = widget.get_value_as_int()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setMagnifierObjectSize("crosswire-size", value)
+        self.prefsDict["magCrossHairSize"] = value
 
+    def magCrossHairColorSet(self, widget):
+        """Signal handler for the "color_set" signal for the
+           magCrossHairColorButton GtkColorButton widget.
+           The user has changed the value of the magnification
+           cross-hair settings cross-hair color button. Set the 
+           'magCrossHairColor' preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        color = widget.get_color()
+        crossHairColor = "#%04X%04X%04X" % (color.red, color.green, color.blue)
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setMagnifierObjectColor("crosswire-color", crossHairColor)
+        self.prefsDict["magCrossHairColor"] = crossHairColor
+
     def magZoomerPositionChanged(self, widget):
         """Signal handler for the "changed" signal for the
            magZoomerPositionComboBox GtkComboBox widget.
@@ -2727,6 +2808,36 @@
         self.get_widget("magZoomerCustomPositionTable").\
                 set_sensitive(zoomerType == settings.MAG_ZOOMER_TYPE_CUSTOM)
 
+        enableBorder = (zoomerType != settings.MAG_ZOOMER_TYPE_FULL_SCREEN)
+        checkButton = self.get_widget("magBorderCheckButton")
+        checkButton.set_sensitive(enableBorder)
+
+        checked = checkButton.get_active()
+        size = 0
+        if checked and enableBorder:
+            self.get_widget("magBorderTable").set_sensitive(enableBorder)
+            size = \
+                 self.get_widget("magBorderSizeSpinButton").get_value_as_int()
+
+        if not settings.enableMagLiveUpdating:
+            return
+
+        if zoomerType == settings.MAG_ZOOMER_TYPE_CUSTOM:
+            top = \
+                self.get_widget("magZoomerTopSpinButton").get_value_as_int()
+            left = \
+                 self.get_widget("magZoomerLeftSpinButton").get_value_as_int()
+            right = \
+                  self.get_widget("magZoomerRightSpinButton").get_value_as_int()
+            bottom = \
+               self.get_widget("magZoomerBottomSpinButton").get_value_as_int()
+            if not (top == bottom == left == right):
+                mag.setupMagnifier(zoomerType, left, top, right, bottom,
+                                   self.prefsDict)
+        else:
+            mag.setupMagnifier(zoomerType, restore=self.prefsDict)
+        mag.setZoomerObjectSize("border-size", size)
+
     def magZoomerTopValueChanged(self, widget):
         """Signal handler for the "value_changed" signal for the
            magZoomerTopSpinButton GtkSpinButton widget.
@@ -2738,8 +2849,18 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["magZoomerTop"] = widget.get_value_as_int()
+        top = widget.get_value_as_int()
+        self.prefsDict["magZoomerTop"] = top
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
 
+        left = self.get_widget("magZoomerLeftSpinButton").get_value_as_int()
+        right = self.get_widget("magZoomerRightSpinButton").get_value_as_int()
+        bottom = \
+               self.get_widget("magZoomerBottomSpinButton").get_value_as_int()
+        mag.setupMagnifier(settings.MAG_ZOOMER_TYPE_CUSTOM,
+                           left, top, right, bottom, self.prefsDict)
+
     def magZoomerBottomValueChanged(self, widget):
         """Signal handler for the "value_changed" signal for the
            magZoomerBottomSpinButton GtkSpinButton widget.
@@ -2751,8 +2872,17 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["magZoomerBottom"] = widget.get_value_as_int()
+        bottom = widget.get_value_as_int()
+        self.prefsDict["magZoomerBottom"] = bottom
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
 
+        left = self.get_widget("magZoomerLeftSpinButton").get_value_as_int()
+        top = self.get_widget("magZoomerTopSpinButton").get_value_as_int()
+        right = self.get_widget("magZoomerRightSpinButton").get_value_as_int()
+        mag.setupMagnifier(settings.MAG_ZOOMER_TYPE_CUSTOM,
+                           left, top, right, bottom, self.prefsDict)
+
     def magZoomerLeftValueChanged(self, widget):
         """Signal handler for the "value_changed" signal for the
            magZoomerLeftSpinButton GtkSpinButton widget.
@@ -2764,8 +2894,18 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["magZoomerLeft"] = widget.get_value_as_int()
+        left = widget.get_value_as_int()
+        self.prefsDict["magZoomerLeft"] = left
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
 
+        top = self.get_widget("magZoomerTopSpinButton").get_value_as_int()
+        right = self.get_widget("magZoomerRightSpinButton").get_value_as_int()
+        bottom = \
+               self.get_widget("magZoomerBottomSpinButton").get_value_as_int()
+        mag.setupMagnifier(settings.MAG_ZOOMER_TYPE_CUSTOM,
+                           left, top, right, bottom, self.prefsDict)
+
     def magZoomerRightValueChanged(self, widget):
         """Signal handler for the "value_changed" signal for the
            magZoomerRightSpinButton GtkSpinButton widget.
@@ -2777,8 +2917,18 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["magZoomerRight"] = widget.get_value_as_int()
+        right = widget.get_value_as_int()
+        self.prefsDict["magZoomerRight"] = right
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
 
+        left = self.get_widget("magZoomerLeftSpinButton").get_value_as_int()
+        top = self.get_widget("magZoomerTopSpinButton").get_value_as_int()
+        bottom = \
+               self.get_widget("magZoomerBottomSpinButton").get_value_as_int()
+        mag.setupMagnifier(settings.MAG_ZOOMER_TYPE_CUSTOM,
+                           left, top, right, bottom, self.prefsDict)
+
     def magZoomFactorValueChanged(self, widget):
         """Signal handler for the "value_changed" signal for the
            magZoomFactorSpinButton GtkSpinButton widget.
@@ -2790,30 +2940,122 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["magZoomFactor"] = widget.get_value_as_int()
+        value = widget.get_value()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setZoomerMagFactor(value, value)
+        self.prefsDict["magZoomFactor"] = value
 
-    def magSmoothingChanged(self, widget):
-        """Signal handler for the "changed" signal for the
-           magSmoothingComboBox GtkComboBox widget. The user has
-           selected a different magnification smoothing style.
-           Set the 'magSmoothingMode' preference to the new value.
+    def magBorderChecked(self, widget):
+        """Signal handler for the "toggled" signal for the
+           magBorderCheckButton GtkCheckButton widget.
+           The user has [un]checked the magnification border settings
+           'Enable border' checkbox. Set the 'enableMagZoomerBorder'
+           preference to the new value and set the sensitivity of the
+           other magnification border items depending upon this new value.
 
         Arguments:
         - widget: the component that generated the signal.
         """
 
-        smoothingMode = widget.get_active_text()
-        # Translators: this is an algorithm for magnifying pixels
-        # on the screen.
-        #
-        if smoothingMode ==  _("Bilinear"):
-            mode = settings.MAG_SMOOTHING_MODE_BILINEAR
-        elif smoothingMode == _("None"):
-            mode = settings.MAG_SMOOTHING_MODE_NONE
-        else:
-            mode = settings.MAG_SMOOTHING_MODE_BILINEAR
-        self.prefsDict["magSmoothingMode"] = mode
+        value = widget.get_active()
+        self.prefsDict["enableMagZoomerBorder"] = value
+        self.get_widget("magBorderTable").set_sensitive(value)
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
 
+        size = self.get_widget("magBorderSizeSpinButton").get_value_as_int()
+        if not value:
+            size = 0
+        mag.setZoomerObjectSize("border-size", size)
+
+    def magBorderSizeValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magBorderSizeSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           border settings border size spin button. Set the
+           'magZoomerBorderSize' preference to the new integer value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        value = widget.get_value_as_int()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setZoomerObjectSize("border-size", value)
+        self.prefsDict["magZoomerBorderSize"] = value
+
+    def magBorderColorSet(self, widget):
+        """Signal handler for the "color_set" signal for the
+           magBorderColorButton GtkColorButton widget.
+           The user has changed the value of the magnification
+           cursor settings cursor color button. Set the 'magZoomerBorderColor'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        color = widget.get_color()
+        borderColor = "#%04X%04X%04X" % (color.red, color.green, color.blue)
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setZoomerObjectColor("border-color", borderColor)
+        self.prefsDict["magZoomerBorderColor"] = borderColor
+
+    def magColorBrightnessValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magColorBrightnessSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           color settings brightness spin button. Set the 'magBrightnessLevel'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        value = round(widget.get_value(), 2)
+        self.prefsDict["magBrightnessLevel"] = value
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
+
+        r = self.prefsDict["magBrightnessLevelRed"] + value
+        g = self.prefsDict["magBrightnessLevelGreen"] + value
+        b = self.prefsDict["magBrightnessLevelBlue"] + value
+        mag.setZoomerBrightness(r, g, b)
+
+    def magColorContrastValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magColorContrastSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           color settings contrast spin button. Set the 'magContrastLevel'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        value = round(widget.get_value(), 2)
+        self.prefsDict["magContrastLevel"] = value
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
+
+        r = self.prefsDict["magContrastLevelRed"] + value
+        g = self.prefsDict["magContrastLevelGreen"] + value
+        b = self.prefsDict["magContrastLevelBlue"] + value
+        mag.setZoomerContrast(r, g, b)
+
+    def magAdvancedButtonClicked(self, widget):
+        """Signal handler for the "clicked" signal for the magAdvancedButton
+           GtkButton widget. The user has clicked the Advanced Settings
+           button.  Save the current state of the preferences for the settings
+           on the dialog, and show it.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        advancedMag.saveAdvancedSettings(self.prefsDict)
+        advancedMagDialog.show()
+
     def magMouseTrackingChanged(self, widget):
         """Signal handler for the "changed" signal for the
            magMouseTrackingComboBox GtkComboBox widget. The user has
@@ -2841,6 +3083,7 @@
             mode = settings.MAG_TRACKING_MODE_CENTERED
 
         self.prefsDict["magMouseTrackingMode"] = mode
+        mag.updateMouseTracking(mode)
 
     def magControlTrackingChanged(self, widget):
         """Signal handler for the "changed" signal for the
@@ -2867,6 +3110,7 @@
             mode = settings.MAG_TRACKING_MODE_PUSH
 
         self.prefsDict["magControlTrackingMode"] = mode
+        mag.updateControlTracking(mode)
 
     def magTextTrackingChanged(self, widget):
         """Signal handler for the "changed" signal for the
@@ -2896,6 +3140,8 @@
         self.get_widget("magEdgeMarginHBox").\
                 set_sensitive(mode == settings.MAG_TRACKING_MODE_PUSH)
 
+        mag.updateTextTracking(mode)
+
     def magEdgeMarginValueChanged(self, widget):
         """Signal handler for the "value_changed" signal for the
            magEdgeMarginSpinButton GtkSpinButton widget.
@@ -2907,7 +3153,9 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["magEdgeMargin"] = widget.get_value_as_int()
+        value = widget.get_value_as_int()
+        self.prefsDict["magEdgeMargin"] = value
+        mag.updateEdgeMargin(value)
 
     def magInvertColorsChecked(self, widget):
         """Signal handler for the "toggled" signal for the
@@ -2920,7 +3168,10 @@
         - widget: the component that generated the signal.
         """
 
-        self.prefsDict["enableMagZoomerColorInversion"] = widget.get_active()
+        value = widget.get_active()
+        if settings.enableMagLiveUpdating and widget.is_focus():
+            mag.setZoomerColorInversion(value)
+        self.prefsDict["enableMagZoomerColorInversion"] = value
 
     def keyModifiedToggle(self, cell, path, model, col):
         """When the user changes a checkbox field (boolean field)"""
@@ -3043,33 +3294,6 @@
 
         return
 
-    def magSourceDisplayChanged(self, widget):
-        """Signal handler for the "changed" signal for the
-           magSourceDisplayDisplayEntry GtkEntry widget.
-           The user has changed the value of the magnification source
-           display. Set the 'magSourceDisplay' preference
-           to the new value.
-
-        Arguments:
-        - widget: the component that generated the signal.
-        """
-
-        self.prefsDict["magSourceDisplay"] = widget.get_text()
-
-    def magTargetDisplayChanged(self, widget):
-        """Signal handler for the "changed" signal for the
-           magTargetDisplayEntry GtkEntry widget.
-           The user has changed the value of the magnification target
-           display. Set the 'magTargetDisplay' preference
-           to the new value.
-
-        Arguments:
-        - widget: the component that generated the signal.
-        """
-
-        self.prefsDict["magTargetDisplay"] = widget.get_text()
-        self._setZoomerSpinButtons()
-
     def showMainWindowChecked(self, widget):
         """Signal handler for the "toggled" signal for the
            showMainWindowCheckButton GtkCheckButton widget.
@@ -3380,6 +3604,7 @@
         - widget: the component that generated the signal.
         """
 
+        mag.finishLiveUpdating()
         self._cleanupSpeechServers()
         self.get_widget("orcaSetupWindow").destroy()
 
@@ -3410,8 +3635,572 @@
         - widget: the component that generated the signal.
         """
 
+        mag.finishLiveUpdating()
         orca_state.orcaOS = None
 
+    def getAdvancedMagDialog(self):
+        """Return a handle to the Orca Preferences advanced magnification
+        settings dialog.
+        """
+
+        return self.orcaMagAdvancedDialog
+
+class OrcaAdvancedMagGUI(OrcaSetupGUI):
+
+    def __init__(self, fileName, windowName, prefsDict = None):
+        """Initialize the Orca configuration GUI.
+
+        Arguments:
+        - fileName: name of the Glade file.
+        - windowName: name of the component to get from the Glade file.
+        """
+
+        OrcaSetupGUI.__init__(self, fileName, windowName)
+
+        self.prefsDict = prefsDict
+
+        # To make pylint happy.
+        #
+        self.savedSettings = None
+
+    def init(self):
+        """Initialize the magnification Advanced Settings dialog GUI.
+        Read the users current set of preferences and set the GUI state 
+        to match. 
+        """
+
+        self._initGUIState()
+
+    def _initGUIState(self):
+        """Adjust the settings of the various components on the
+        configuration GUI depending upon the users preferences.
+        """
+
+        prefs = self.prefsDict
+
+        # Get the smoothing preference and set the active value for the
+        # smoothing combobox accordingly.
+        #
+        self.setSmoothingMode(prefs["magSmoothingMode"])
+
+        # Get the Brightness RGB levels and set their spin button values
+        # accordingly.
+        #
+        self.setRGBBrightnessValues(prefs["magBrightnessLevelRed"],
+                                           prefs["magBrightnessLevelGreen"],
+                                           prefs["magBrightnessLevelBlue"])
+
+        # Get the Contrast RGB levels and set their spin button values
+        # accordingly.
+        #
+        self.setRGBContrastValues(prefs["magContrastLevelRed"],
+                                         prefs["magContrastLevelGreen"],
+                                         prefs["magContrastLevelBlue"])
+
+        # Get the color filtering mode preference and set the active value
+        # for the color filtering combobox accordingly.
+        #
+        self.setColorFilteringMode(prefs["magColorFilteringMode"])
+
+        # Get the magnification source and target displays.
+        #
+        sourceDisplay = prefs["magSourceDisplay"]
+        self.get_widget("magSourceDisplayEntry").set_text(sourceDisplay)
+
+        targetDisplay = prefs["magTargetDisplay"]
+        self.get_widget("magTargetDisplayEntry").set_text(targetDisplay)
+
+    def setSmoothingMode(self, smoothingMode):
+        """Get the smoothing preference and set the active value for the
+           smoothing combobox accordingly.
+
+        Arguments:
+        - smoothingMode: the smoothing mode.
+        """
+
+        if smoothingMode == settings.MAG_SMOOTHING_MODE_BILINEAR:
+            # Translators: this is an algorithm for magnifying pixels
+            # on the screen.
+            #
+            mode = _("Bilinear")
+        elif smoothingMode == settings.MAG_SMOOTHING_MODE_NONE:
+            # Translators: this is an algorithm for tracking the mouse
+            # with the magnifier.  None means that Orca does nothing to
+            # track the mouse.
+            #
+            mode = _("None")
+        else:
+            # Translators: this is an algorithm for magnifying pixels
+            # on the screen.
+            #
+            mode = _("Bilinear")
+        magSmoothingComboBox = self.get_widget("magSmoothingComboBox")
+        index = self.getComboBoxIndex(magSmoothingComboBox, mode)
+        magSmoothingComboBox.set_active(index)
+
+    def magSmoothingChanged(self, widget):
+        """Signal handler for the "changed" signal for the
+           magSmoothingComboBox GtkComboBox widget. The user has
+           selected a different magnification smoothing style.
+           Set the 'magSmoothingMode' preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        smoothingMode = widget.get_active_text()
+        # Translators: this is an algorithm for magnifying pixels
+        # on the screen.
+        #
+        if smoothingMode ==  _("Bilinear"):
+            mode = settings.MAG_SMOOTHING_MODE_BILINEAR
+        elif smoothingMode == _("None"):
+            mode = settings.MAG_SMOOTHING_MODE_NONE
+        else:
+            mode = settings.MAG_SMOOTHING_MODE_BILINEAR
+
+        if settings.enableMagLiveUpdating:
+            mag.setZoomerSmoothingType(mode)
+
+        self.prefsDict["magSmoothingMode"] = mode
+
+    def setRGBBrightnessValues(self, red, green, blue):
+        """Set the spin button values for the Brightness RGB levels.
+
+        Arguments:
+        - red:   the red brightness value.
+        - green: the green brightness value.
+        - blue:  the blue brightness value.
+        """
+
+        self.get_widget("magBrightnessRedSpinButton").set_value(red)
+        self.get_widget("magBrightnessGreenSpinButton").set_value(green)
+        self.get_widget("magBrightnessBlueSpinButton").set_value(blue)
+
+    def magBrightnessRedValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magBrightnessRedSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           brightness Red spin button. Set the 'magBrightnessLevelRed'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        r = round(widget.get_value(), 2)
+        self.prefsDict["magBrightnessLevelRed"] = r
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
+
+        g = self.get_widget("magBrightnessGreenSpinButton").get_value()
+        b = self.get_widget("magBrightnessBlueSpinButton").get_value()
+
+        brightness = self.prefsDict["magBrightnessLevel"]
+        r += brightness
+        g = round(g + brightness, 2)
+        b = round(b + brightness, 2)
+
+        mag.setZoomerBrightness(r, g, b)
+
+    def magBrightnessGreenValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magBrightnessGreenSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           brightness Green spin button. Set the 'magBrightnessLevelGreen'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        g = round(widget.get_value(), 2)
+        self.prefsDict["magBrightnessLevelGreen"] = g
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
+
+        r = self.get_widget("magBrightnessRedSpinButton").get_value()
+        b = self.get_widget("magBrightnessBlueSpinButton").get_value()
+
+        brightness = self.prefsDict["magBrightnessLevel"]
+        g += brightness
+        r = round(r + brightness, 2)
+        b = round(b + brightness, 2)
+
+        mag.setZoomerBrightness(r, g, b)
+
+    def magBrightnessBlueValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magBrightnessBlueSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           brightness Blue spin button. Set the 'magBrightnessLevelBlue'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        b = round(widget.get_value(), 2)
+        self.prefsDict["magBrightnessLevelBlue"] = b
+        if not settings.enableMagLiveUpdating:
+            return
+
+        r = self.get_widget("magBrightnessRedSpinButton").get_value()
+        g = self.get_widget("magBrightnessGreenSpinButton").get_value()
+
+        brightness = self.prefsDict["magBrightnessLevel"]
+        b += brightness
+        r = round(r + brightness, 2)
+        g = round(g + brightness, 2)
+
+        mag.setZoomerBrightness(r, g, b)
+
+    def setRGBContrastValues(self, red, green, blue):
+        """Set the spin button values for the Contrast RGB levels.
+
+        Arguments:
+        - red:   the red contrast value.
+        - green: the green contrast value.
+        - blue:  the blue contrast value.
+        """
+
+        self.get_widget("magContrastRedSpinButton").set_value(red)
+        self.get_widget("magContrastGreenSpinButton").set_value(green)
+        self.get_widget("magContrastBlueSpinButton").set_value(blue)
+
+    def magContrastRedValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magContrastRedSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           contrast Red spin button. Set the 'magContrastLevelRed'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        r = round(widget.get_value(), 2)
+        self.prefsDict["magContrastLevelRed"] = r
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
+
+        g = self.get_widget("magContrastGreenSpinButton").get_value()
+        b = self.get_widget("magContrastBlueSpinButton").get_value()
+
+        contrast = self.prefsDict["magContrastLevel"]
+        r += contrast
+        g = round(g + contrast, 2)
+        b = round(b + contrast, 2)
+
+        mag.setZoomerContrast(r, g, b)
+
+    def magContrastGreenValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magContrastGreenSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           contrast Green spin button. Set the 'magContrastLevelGreen'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        g = round(widget.get_value(), 2)
+        self.prefsDict["magContrastLevelGreen"] = g
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
+
+        r = self.get_widget("magContrastRedSpinButton").get_value()
+        b = self.get_widget("magContrastBlueSpinButton").get_value()
+
+        contrast = self.prefsDict["magContrastLevel"]
+        g += contrast
+        r = round(r + contrast, 2)
+        b = round(b + contrast, 2)
+
+        mag.setZoomerContrast(r, g, b)
+
+    def magContrastBlueValueChanged(self, widget):
+        """Signal handler for the "value_changed" signal for the
+           magContrastBlueSpinButton GtkSpinButton widget.
+           The user has changed the value of the magnification
+           contrast Blue spin button. Set the 'magContrastLevelBlue'
+           preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        b = round(widget.get_value(), 2)
+        self.prefsDict["magContrastLevelBlue"] = b
+        if not (settings.enableMagLiveUpdating and widget.is_focus()):
+            return
+
+        r = self.get_widget("magContrastRedSpinButton").get_value()
+        g = self.get_widget("magContrastGreenSpinButton").get_value()
+
+        contrast = self.prefsDict["magContrastLevel"]
+        b += contrast
+        r = round(r + contrast, 2)
+        g = round(g + contrast, 2)
+
+        mag.setZoomerContrast(r, g, b)
+
+    def setColorFilteringMode(self, mode):
+        """Set the active value for the color filtering mode combobox
+           preference.
+
+        Arguments:
+        - mode: the color filtering mode.
+        """
+
+        if mode == settings.MAG_COLOR_FILTERING_MODE_NONE:
+            filteringMode = _("None")
+
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_SATURATE_RED:
+            # Translators: this refers to a color filter for people with
+            # color blindness. It will maximize the red value for all
+            # pixels on the screen. For example, an RGB value of
+            # (75, 100, 125) would be become (255, 100, 125).
+            #
+            filteringMode = _("Saturate red")
+
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_SATURATE_GREEN:
+            # Translators: this refers to a color filter for people with
+            # color blindness. It will maximize the green value for all
+            # pixels on the screen.  For example, an RGB value of
+            # (75, 100, 125) would become (75, 255, 125).
+            #
+            filteringMode = _("Saturate green")
+
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_SATURATE_BLUE:
+            # Translators: this refers to a color filter for people with
+            # color blindness. It will maximize the blue value for all
+            # pixels on the screen. For example, an RGB value of
+            # (75, 100, 125) would become (75, 100, 255).
+            #
+            filteringMode = _("Saturate blue")
+
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_RED:
+            # Translators: this refers to a color filter for people with
+            # color blindness. It will eliminate the red value for all
+            # pixels on the screen. For example, an RGB value of
+            # (75, 100, 125) would be become (0, 100, 125).
+            #
+            filteringMode = _("Desaturate red")
+
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_GREEN:
+            # Translators: this refers to a color filter for people with
+            # color blindness. It will eliminate the green value for all
+            # pixels on the screen. For example, an RGB value of
+            # (75, 100, 125) would become (75, 0, 125).
+            #
+            filteringMode = _("Desaturate green")
+
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_DESATURATE_BLUE:
+            # Translators: this refers to a color filter for people with
+            # color blindness. It will eliminate the blue value for all
+            # pixels on the screen. For example, an RGB value of
+            # (75, 100, 125) would become (75, 100, 0).
+            #
+            filteringMode = _("Desaturate blue")
+
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_POSITIVE_HUE_SHIFT:
+            # Translators: this refers to a color filter for people with
+            # color blindness. It shifts RGB values to the right. For
+            # example, an RGB value of (75, 100, 125) would become
+            # (125, 75, 100).
+            #
+            filteringMode = _("Positive hue shift")
+
+        elif mode == settings.MAG_COLOR_FILTERING_MODE_NEGATIVE_HUE_SHIFT:
+            # Translators: this refers to a color filter for people with
+            # color blindness. It shifts RGB values to the left. For
+            # example, an RGB value of (75, 100, 125) would become
+            # (100, 125, 75).
+            #
+            filteringMode = _("Negative hue shift")
+
+        else:
+            filteringMode = _("None")
+
+        comboBox = self.get_widget("magColorFilteringComboBox")
+        index = self.getComboBoxIndex(comboBox, filteringMode)
+        comboBox.set_active(index)
+
+    def magColorFilteringChanged(self, widget):
+        """Signal handler for the "changed" signal for the
+           magColorFilteringComboBox GtkComboBox widget. The user has
+           selected a different magnification color filtering mode.
+           Set the 'magColorFilteringMode' preference to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        filteringMode = widget.get_active_text()
+        if filteringMode ==  _("None"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_NONE
+
+        # Translators: this refers to a color filter for people with
+        # color blindness. It will maximize the red value for all
+        # pixels on the screen. For example, an RGB value of
+        # (75, 100, 125) would be become (255, 100, 125).
+        #
+        elif filteringMode == _("Saturate red"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_SATURATE_RED
+
+        # Translators: this refers to a color filter for people with
+        # color blindness. It will maximize the green value for all
+        # pixels on the screen.  For example, an RGB value of
+        # (75, 100, 125) would become (75, 255, 125).
+        #
+        elif filteringMode == _("Saturate green"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_SATURATE_GREEN
+
+        # Translators: this refers to a color filter for people with
+        # color blindness. It will maximize the blue value for all
+        # pixels on the screen. For example, an RGB value of
+        # (75, 100, 125) would become (75, 100, 255).
+        #
+        elif filteringMode == _("Saturate blue"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_SATURATE_BLUE
+
+        # Translators: this refers to a color filter for people with
+        # color blindness. It will eliminate the red value for all
+        # pixels on the screen. For example, an RGB value of
+        # (75, 100, 125) would be become (0, 100, 125).
+        #
+        elif filteringMode == _("Desaturate red"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_DESATURATE_RED
+
+        # Translators: this refers to a color filter for people with
+        # color blindness. It will eliminate the green value for all
+        # pixels on the screen. For example, an RGB value of
+        # (75, 100, 125) would become (75, 0, 125).
+        #
+        elif filteringMode == _("Desaturate green"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_DESATURATE_GREEN
+
+        # Translators: this refers to a color filter for people with
+        # color blindness. It will eliminate the blue value for all
+        # pixels on the screen. For example, an RGB value of
+        # (75, 100, 125) would become (75, 100, 0).
+        #
+        elif filteringMode == _("Desaturate blue"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_DESATURATE_BLUE
+
+        # Translators: this refers to a color filter for people with
+        # color blindness. It shifts RGB values to the right. For
+        # example, an RGB value of (75, 100, 125) would become
+        # (125, 75, 100).
+        #
+        elif filteringMode == _("Positive hue shift"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_POSITIVE_HUE_SHIFT
+
+        # Translators: this refers to a color filter for people with
+        # color blindness. It shifts RGB values to the left. For
+        # example, an RGB value of (75, 100, 125) would become
+        # (100, 125, 75).
+        #
+        elif filteringMode == _("Negative hue shift"):
+            mode = settings.MAG_COLOR_FILTERING_MODE_NEGATIVE_HUE_SHIFT
+
+        else:
+            mode = settings.MAG_COLOR_FILTERING_MODE_NONE
+
+        if settings.enableMagLiveUpdating:
+            mag.setZoomerColorFilter(mode)
+
+        self.prefsDict["magColorFilteringMode"] = mode
+
+    def magSourceDisplayChanged(self, widget):
+        """Signal handler for the "changed" signal for the
+           magSourceDisplayDisplayEntry GtkEntry widget.
+           The user has changed the value of the magnification source
+           display. Set the 'magSourceDisplay' preference
+           to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        self.prefsDict["magSourceDisplay"] = widget.get_text()
+
+    def magTargetDisplayChanged(self, widget):
+        """Signal handler for the "changed" signal for the
+           magTargetDisplayEntry GtkEntry widget.
+           The user has changed the value of the magnification target
+           display. Set the 'magTargetDisplay' preference
+           to the new value.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        self.prefsDict["magTargetDisplay"] = widget.get_text()
+        self._setZoomerSpinButtons()
+
+    def restoreAdvancedSettings(self):
+        """Returns the saved values of the settings on the magnification
+        advanced settings dialog.
+        """
+
+        return self.savedSettings
+
+    def saveAdvancedSettings(self, prefsDict):
+        """Save the current values of the settings on the magnification
+        advanced settings dialog.
+
+        Arguments:
+        - prefsDict: the preferences dictionary containing the current state.
+        """
+
+        self.savedSettings = prefsDict.copy()
+
+    def magAdvancedCancelButtonClicked(self, widget):
+        """Signal handler for the "clicked" signal for the
+           magAdvancedCancelButton GtkButton widget. The user has clicked
+           the Cancel button. We restore the preferences for the settings
+           on the Advanced Settings dialog, back to what they we when it
+           was initially displayed and hide it.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        self.prefsDict = self.restoreAdvancedSettings()
+        self.init()
+        advancedMagDialog.hide()
+
+    def magAdvancedOkButtonClicked(self, widget):
+        """Signal handler for the "clicked" signal for the magAdvancedOKButton
+           GtkButton widget. The user has clicked the OK button.  We don't
+           want to write out any preferences until the main window's apply
+           or OK button has been clicked. Just hide the advanced window.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        advancedMagDialog.hide()
+
+    def magAdvancedDialogDestroyed(self, widget):
+        """Signal handler for the "destroyed" signal for the
+        orcaMagAdvancedDialog GtkWindow widget. Instead of destroying
+        the dialog, rebuild it, reinitialize it and hide it.
+
+        Arguments:
+        - widget: the component that generated the signal.
+        """
+
+        global advancedMag, advancedMagDialog
+
+        advancedMag = OrcaAdvancedMagGUI(orca_state.prefsGladeFile,
+                                   "orcaMagAdvancedDialog", self.prefsDict)
+        advancedMag.init()
+        advancedMagDialog = advancedMag.getAdvancedMagDialog()
+
 class WarningDialogGUI(orca_glade.GladeWrapper):
 
     def getPrefsWarningDialog(self):
@@ -3446,8 +4235,9 @@
 
         self.orcaPrefsWarningDialog.destroy()
 
+def showPreferencesUI():
+    global advancedMag, advancedMagDialog
 
-def showPreferencesUI():
     if not orca_state.appOS and not orca_state.orcaOS:
         # Translators: Orca Preferences is the configuration GUI for Orca.
         #
@@ -3455,13 +4245,19 @@
         braille.displayMessage(line)
         speech.speak(line)
 
+        prefsDict = orca_prefs.readPreferences()
         orca_state.prefsGladeFile = os.path.join(platform.prefix,
                                                  platform.datadirname,
                                                  platform.package,
                                                  "glade",
                                                  "orca-setup.glade")
+        advancedMag = OrcaAdvancedMagGUI(orca_state.prefsGladeFile,
+                                   "orcaMagAdvancedDialog", prefsDict)
+        advancedMag.init()
+        advancedMagDialog = advancedMag.getAdvancedMagDialog()
+
         orca_state.orcaOS = OrcaSetupGUI(orca_state.prefsGladeFile,
-                                         "orcaSetupWindow")
+                                         "orcaSetupWindow", prefsDict)
         orca_state.orcaOS.init()
     else:
         if not orca_state.orcaWD:
