--- ezoom.xml.in	2007-11-06 17:09:34.000000000 -0800
+++ ezoom.xml.in_fyda	2007-11-06 23:11:25.000000000 -0800
@@ -10,14 +10,14 @@
 	    </relation>
 	</deps>
 	<_short>Enhanced Zoom Desktop</_short>
-	<_long>Enhanced zoom functions for visually imparied and others</_long>
+	<_long>Enhanced zoom functions for the visually impaired and other users</_long>
 	<category>Accessibility</category>
 	<display>
 	    <group>
-		<_short>Zoom Movement</_short>
+		<_short>Zoom In/Out</_short>
 		<option type="button" name="initiate">
 		    <_short>Initiate</_short>
-		    <_long>Zoom In</_long>
+		    <_long>This doesn't appear to do anything at the moment.</_long>
 		    <default>&lt;Super&gt;Button3</default>
 		</option>
 		<option type="button" name="zoom_in">
@@ -28,57 +28,31 @@
 		<option type="key" name="zoom_in_key">
 		    <_short>Zoom In</_short>
 		    <_long>Zoom In</_long>
-		    <default>&lt;Super&gt;Button4</default>
-		</option>
-		<option type="key" name="lock_zoom">
-		    <_short>Toggle zoom area lock</_short>
-		    <_long>Toggles a lock on the zoom area so it doesn't change on various events</_long>
-		    <default>&lt;Super&gt;l</default>
-		</option>
-		<option type="key" name="zoom_specific_1">
-		    <_short>Zoom Specific Level 1</_short>
-		    <_long>Zoom to the specific zoom level 1</_long>
-		    <default>&lt;Super&gt;1</default>
-		</option>
-		<option type="key" name="zoom_specific_2">
-		    <_short>Zoom Specific Level 2</_short>
-		    <_long>Zoom to the specific zoom level 2</_long>
-		    <default>&lt;Super&gt;2</default>
 		</option>
-		<option type="key" name="zoom_specific_3">
-		    <_short>Zoom Specific Level 3</_short>
-		    <_long>Zoom to the specific zoom level 3</_long>
-		    <default>&lt;Super&gt;3</default>
-		</option>
-		<option type="key" name="fit_to_window">
-		    <_short>Fit zoomed area to window</_short>
-		    <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long>
-		    <default>&lt;Super&gt;r</default>
-		</option>
-		<option type="key" name="pan_left">
-		    <_short>Pan Zoom Left</_short>
-		    <_long>Pan (move) the zoom area left</_long>
-		</option>
-		<option type="key" name="pan_right">
-		    <_short>Pan Zoom Right</_short>
-		    <_long>Pan (move) the zoom area right</_long>
-		</option>
-		<option type="key" name="pan_up">
-		    <_short>Pan Zoom Up</_short>
-		    <_long>Pan (move) the zoom area up</_long>
-		</option>
-		<option type="key" name="pan_down">
-		    <_short>Pan Zoom Down</_short>
-		    <_long>Pan (move) the zoom area down</_long>
-		</option>
-		<option type="key" name="zoom_out_key">
+		<option type="button" name="zoom_out">
 		    <_short>Zoom Out</_short>
 		    <_long>Zoom Out</_long>
+		    <default>&lt;Super&gt;Button5</default>
 		</option>
-		<option type="button" name="zoom_out">
+		<option type="key" name="zoom_out_key">
 		    <_short>Zoom Out</_short>
 		    <_long>Zoom Out</_long>
-		    <default>&lt;Super&gt;Button5</default>
+		</option>
+		<option type="float" name="zoom_factor">
+		    <_short>Zoom factor</_short>
+		    <_long>Zoom in/out by this factor. Higher value means quicker zooming.</_long>
+		    <default>1.150</default>
+		    <min>1.01</min>
+		    <max>3</max>
+		    <precision>0.01</precision>
+		</option>
+	    </group>
+	    <group>
+		<_short>Specific Zoom</_short>
+		<option type="key" name="zoom_specific_1">
+		    <_short>Zoom Specific Level 1</_short>
+		    <_long>Zoom to the specific zoom level 1</_long>
+		    <default>&lt;Super&gt;1</default>
 		</option>
 		<option type="float" name="zoom_spec1">
 		    <_short>Specific zoom factor 1</_short>
@@ -88,6 +62,11 @@
 		    <max>1.0</max>
 		    <precision>0.01</precision>
 		</option>
+		<option type="key" name="zoom_specific_2">
+		    <_short>Zoom Specific Level 2</_short>
+		    <_long>Zoom to the specific zoom level 2</_long>
+		    <default>&lt;Super&gt;2</default>
+		</option>
 		<option type="float" name="zoom_spec2">
 		    <_short>Specific zoom factor 2</_short>
 		    <_long>Zoom level to go to when triggering hotkey 2</_long>
@@ -96,6 +75,11 @@
 		    <max>1.0</max>
 		    <precision>0.01</precision>
 		</option>
+		<option type="key" name="zoom_specific_3">
+		    <_short>Zoom Specific Level 3</_short>
+		    <_long>Zoom to the specific zoom level 3</_long>
+		    <default>&lt;Super&gt;3</default>
+		</option>
 		<option type="float" name="zoom_spec3">
 		    <_short>Specific zoom factor 3</_short>
 		    <_long>Zoom level to go to when triggering hotkey 3</_long>
@@ -110,67 +94,13 @@
 		    <default>true</default>
 		</option>
 	    </group>
-	    <option type="key" name="fit_to_zoom">
-		<_short>Fit the window to the zoom level</_short>
-		<_long>Resize the window so it matches the current zoom level.  </_long>
-		<default>&lt;Super&gt;v</default>
-	    </option>
 	    <group>
-		<_short>Mouse Behavior</_short>
+		<_short>Mouse Behaviour</_short>
 		<option type="key" name="center_mouse">
 		    <_short>Center the mouse</_short>
 		    <_long>Puts the mouse in the middle of the screen (Regardless of zoom level)</_long>
 		    <default>&lt;Super&gt;c</default>
 		</option>
-	    </group>
-	</display>
-	<screen>
-	    <group>
-		<_short>Zoom Movement</_short>
-		<option type="float" name="pan_factor">
-		    <_short>Pan Factor</_short>
-		    <_long>Move the zoomed area this much whenever you pan the zoomed area with keys.</_long>
-		    <default>0.1</default>
-		    <min>0.001</min>
-		    <max>1.0</max>
-		    <precision>0.001</precision>
-		</option>
-		<option type="float" name="zoom_factor">
-		    <_short>Zoom factor</_short>
-		    <_long>Zoom in/out by this factor. Higher value means quicker zooming.</_long>
-		    <default>1.150</default>
-		    <min>1.01</min>
-		    <max>3</max>
-		    <precision>0.01</precision>
-		</option>
-	    </group>
-	    <group>
-		<_short>Focus Tracking</_short>
-		<option type="bool" name="follow_focus">
-		    <_short>Enable focus tracking</_short>
-		    <_long>Move the zoom area when focus changes.</_long>
-		    <default>true</default>
-		</option>
-		<option type="bool" name="focus_fit_window">
-		    <_short>Fit zoom level to window on focus change</_short>
-		    <_long>Fit the zoomed area to the window when the zoomed area moves as a result of focus tracking.</_long>
-		    <default>false</default>
-		</option>
-		<option type="bool" name="always_focus_fit_window">
-		    <_short>Always fit to window on focus track</_short>
-		    <_long>Fit the zoomed area to the window when the zoomed area moves as a result of focus tracking. Even when not initially zoomed in. </_long>
-		    <default>false</default>
-		</option>
-		<option type="int" name="follow_focus_delay">
-		    <_short>Follow Focus Delay</_short>
-		    <_long>Only attempt to center newly focused windows if the mouse hasn't moved in this amount of seconds. Use this to avoid jumping when using sloppy focus.</_long>
-		    <default>1</default>
-		    <min>0</min>
-		    <max>15</max>
-		</option>
-	    </group>
-	    <group>
-		<_short>Mouse Behavior</_short>
 		<option type="bool" name="sync_mouse">
 		    <_short>Sync Mouse</_short>
 		    <_long>Always keep the zoomed area in sync with where the mouse is, and vice versa. Use this if you don't intend to draw a scaled pointer or hide the original pointer. The zoomed area will move as you move your mouse.</_long>
@@ -212,6 +142,82 @@
 		</option>
 	    </group>
 	    <group>
+		<_short>Zoom Area Movement</_short>
+		<option type="key" name="lock_zoom">
+
+		    <_short>Toggle zoom area lock</_short>
+		    <_long>Toggles a lock on the zoom area so it doesn't change on various events</_long>
+		    <default>&lt;Super&gt;l</default>
+		</option>
+			<subgroup>
+				<_short>Panning</_short>
+				<option type="key" name="pan_left">
+			    	    <_short>Pan Zoom Left</_short>
+				    <_long>Pan (move) the zoom area left</_long>
+				</option>
+				<option type="key" name="pan_right">
+				    <_short>Pan Zoom Right</_short>
+				    <_long>Pan (move) the zoom area right</_long>
+				</option>
+				<option type="key" name="pan_up">
+				    <_short>Pan Zoom Up</_short>
+				    <_long>Pan (move) the zoom area up</_long>
+				</option>
+				<option type="key" name="pan_down">
+				    <_short>Pan Zoom Down</_short>
+				    <_long>Pan (move) the zoom area down</_long>
+				</option>
+				<option type="float" name="pan_factor">
+				    <_short>Pan Factor</_short>
+				    <_long>Move the zoomed area this much whenever you pan the zoomed area with keys.</_long>
+				    <default>0.1</default>
+				    <min>0.001</min>
+				    <max>1.0</max>
+				    <precision>0.001</precision>
+				</option>
+			</subgroup>
+			<subgroup>
+				<_short>Fitting</_short>
+				<option type="key" name="fit_to_window">
+				    <_short>Fit zoomed area to window</_short>
+				    <_long>Zooms in/out so the focused window is zoomed to the maximum while still being fully visible.</_long>
+				    <default>&lt;Super&gt;r</default>
+				</option>
+				<option type="key" name="fit_to_zoom">
+				    <_short>Fit the window to the zoom level</_short>
+				    <_long>Resize the window so it matches the current zoom level.  </_long>
+				    <default>&lt;Super&gt;v</default>
+				</option>
+			</subgroup>
+	    </group>
+	</display>
+	<screen>
+	    <group>
+		<_short>Focus Tracking</_short>
+		<option type="bool" name="follow_focus">
+		    <_short>Enable focus tracking</_short>
+		    <_long>Move the zoom area when focus changes.</_long>
+		    <default>true</default>
+		</option>
+		<option type="bool" name="focus_fit_window">
+		    <_short>Fit zoom level to window on focus change</_short>
+		    <_long>Fit the zoomed area to the window when the zoomed area moves as a result of focus tracking.</_long>
+		    <default>false</default>
+		</option>
+		<option type="bool" name="always_focus_fit_window">
+		    <_short>Always fit to window on focus track</_short>
+		    <_long>Fit the zoomed area to the window when the zoomed area moves as a result of focus tracking. Even when not initially zoomed in. </_long>
+		    <default>false</default>
+		</option>
+		<option type="int" name="follow_focus_delay">
+		    <_short>Follow Focus Delay</_short>
+		    <_long>Only attempt to center newly focused windows if the mouse hasn't moved in this amount of seconds. Use this to avoid jumping when using sloppy focus.</_long>
+		    <default>1</default>
+		    <min>0</min>
+		    <max>15</max>
+		</option>
+	    </group>
+	    <group>
 		<_short>Animation</_short>
 		<option type="float" name="speed">
 		    <_short>Speed</_short>