diff --git a/plugins/ezoom/ezoom.xml.in b/plugins/ezoom/ezoom.xml.in
index 3eb3de693d087735c321ca721f0d3e123d812f61..be7ecd818686974f207c5c07230adbe155111c4f 100755
--- a/plugins/ezoom/ezoom.xml.in
+++ b/plugins/ezoom/ezoom.xml.in
@@ -111,214 +111,45 @@
 		    <_long>Check this to target the focused window when jumping to a specific zoom level. Uncheck this to target the mouse.</_long>
 		    <default>false</default>
 		</option>
-		<option type="float" name="zoom_specific_1">
+		<option type="float" name="zoom_spec1">
 		    <_short>Specific Zoom 1</_short>
 		    <_long>Zoom level to go to when triggering hotkey 1</_long>
 		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
+		    <min>0.1</min>
+		    <max>1.0</max>
+		    <precision>0.01</precision>
 		</option>
 		<option type="key" name="zoom_specific_1_key">
 		    <_short>Zoom to Specific Zoom 1</_short>
 		    <_long>Zoom to the specific zoom level 1</_long>
 		    <default></default>
 		</option>
-		<option type="float" name="zoom_specific_2">
+		<option type="float" name="zoom_spec2">
 		    <_short>Specific Zoom 2</_short>
 		    <_long>Zoom level to go to when triggering hotkey 2</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
+		    <default>0.5</default>
+		    <min>0.1</min>
+		    <max>1.0</max>
+		    <precision>0.01</precision>
 		</option>
 		<option type="key" name="zoom_specific_2_key">
 		    <_short>Zoom to Specific Zoom 2</_short>
 		    <_long>Zoom to the specific zoom level 2</_long>
 		    <default></default>
 		</option>
-		<option type="float" name="zoom_specific_3">
+		<option type="float" name="zoom_spec3">
 		    <_short>Specific Zoom 3</_short>
 		    <_long>Zoom level to go to when triggering hotkey 3</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
+		    <default>0.2</default>
+		    <min>0.1</min>
+		    <max>1.0</max>
+		    <precision>0.01</precision>
 		</option>
 		<option type="key" name="zoom_specific_3_key">
 		    <_short>Zoom to Specific Zoom 3</_short>
 		    <_long>Zoom to the specific zoom level 3</_long>
 		    <default></default>
 		</option>
-		<option type="float" name="zoom_specific_4">
-		    <_short>Specific Zoom 4</_short>
-		    <_long>Zoom level to go to when triggering hotkey 4</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_4_key">
-		    <_short>Zoom to Specific Zoom 4</_short>
-		    <_long>Zoom to the specific zoom level 4</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_5">
-		    <_short>Specific Zoom 5</_short>
-		    <_long>Zoom level to go to when triggering hotkey 5</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_5_key">
-		    <_short>Zoom to Specific Zoom 5</_short>
-		    <_long>Zoom to the specific zoom level 5</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_6">
-		    <_short>Specific Zoom 6</_short>
-		    <_long>Zoom level to go to when triggering hotkey 6</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_6_key">
-		    <_short>Zoom to Specific Zoom 6</_short>
-		    <_long>Zoom to the specific zoom level 6</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_7">
-		    <_short>Specific Zoom 7</_short>
-		    <_long>Zoom level to go to when triggering hotkey 7</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_7_key">
-		    <_short>Zoom to Specific Zoom 7</_short>
-		    <_long>Zoom to the specific zoom level 7</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_8">
-		    <_short>Specific Zoom 8</_short>
-		    <_long>Zoom level to go to when triggering hotkey 8</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_8_key">
-		    <_short>Zoom to Specific Zoom 8</_short>
-		    <_long>Zoom to the specific zoom level 8</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_9">
-		    <_short>Specific Zoom 9</_short>
-		    <_long>Zoom level to go to when triggering hotkey 9</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_9_key">
-		    <_short>Zoom to Specific Zoom 9</_short>
-		    <_long>Zoom to the specific zoom level 9</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_10">
-		    <_short>Specific Zoom 10</_short>
-		    <_long>Zoom level to go to when triggering hotkey 10</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_10_key">
-		    <_short>Zoom to Specific Zoom 10</_short>
-		    <_long>Zoom to the specific zoom level 10</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_11">
-		    <_short>Specific Zoom 11</_short>
-		    <_long>Zoom level to go to when triggering hotkey 11</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_11_key">
-		    <_short>Zoom to Specific Zoom 11</_short>
-		    <_long>Zoom to the specific zoom level 11</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_12">
-		    <_short>Specific Zoom 12</_short>
-		    <_long>Zoom level to go to when triggering hotkey 12</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_12_key">
-		    <_short>Zoom to Specific Zoom 12</_short>
-		    <_long>Zoom to the specific zoom level 12</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_13">
-		    <_short>Specific Zoom 13</_short>
-		    <_long>Zoom level to go to when triggering hotkey 13</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_13_key">
-		    <_short>Zoom to Specific Zoom 13</_short>
-		    <_long>Zoom to the specific zoom level 13</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_14">
-		    <_short>Specific Zoom 14</_short>
-		    <_long>Zoom level to go to when triggering hotkey 14</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_14_key">
-		    <_short>Zoom to Specific Zoom 14</_short>
-		    <_long>Zoom to the specific zoom level 14</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_15">
-		    <_short>Specific Zoom 15</_short>
-		    <_long>Zoom level to go to when triggering hotkey 15</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		    </option>
-		    <option type="key" name="zoom_specific_15_key">
-		    <_short>Zoom to Specific Zoom 15</_short>
-		    <_long>Zoom to the specific zoom level 15</_long>
-		    <default></default>
-		</option>
-		<option type="float" name="zoom_specific_16">
-		    <_short>Specific Zoom 16</_short>
-		    <_long>Zoom level to go to when triggering hotkey 16</_long>
-		    <default>1.0</default>
-		    <min>1.0</min>
-		    <max>10.0</max>
-		    <precision>0.1</precision>
-		</option>
-		<option type="key" name="zoom_specific_16_key">
-		    <_short>Zoom to Specific Zoom 16</_short>
-		    <_long>Zoom to the specific zoom level 16</_long>
-		    <default></default>
-		</option>
 	    </group>
 	    <group>
 		<_short>Zoom Area Movement</_short>
diff --git a/plugins/ezoom/src/ezoom.cpp b/plugins/ezoom/src/ezoom.cpp
index c8ab878d6c31afb0a7db4e0e30275bde55cee1b8..802516fca31bab9e59d8766ce008bf22acfe38c5 100755
--- a/plugins/ezoom/src/ezoom.cpp
+++ b/plugins/ezoom/src/ezoom.cpp
@@ -1775,67 +1775,15 @@ EZoomScreen::zoomSpecific (CompAction         *action,
     switch (target)
     {
 	case ZoomTarget1:
-	    zoom_level = 1.0f / optionGetZoomSpecific1 ();
+	    zoom_level = optionGetZoomSpec1 ();
 	    break;
 
 	case ZoomTarget2:
-	    zoom_level = 1.0f / optionGetZoomSpecific2 ();
+	    zoom_level = optionGetZoomSpec2 ();
 	    break;
 
 	case ZoomTarget3:
-	    zoom_level = 1.0f / optionGetZoomSpecific3 ();
-	    break;
-
-	case ZoomTarget4:
-	    zoom_level = 1.0f / optionGetZoomSpecific4 ();
-	    break;
-
-	case ZoomTarget5:
-	    zoom_level = 1.0f / optionGetZoomSpecific5 ();
-	    break;
-
-	case ZoomTarget6:
-	    zoom_level = 1.0f / optionGetZoomSpecific6 ();
-	    break;
-
-	case ZoomTarget7:
-	    zoom_level = 1.0f / optionGetZoomSpecific7 ();
-	    break;
-
-	case ZoomTarget8:
-	    zoom_level = 1.0f / optionGetZoomSpecific8 ();
-	    break;
-
-	case ZoomTarget9:
-	    zoom_level = 1.0f / optionGetZoomSpecific9 ();
-	    break;
-
-	case ZoomTarget10:
-	    zoom_level = 1.0f / optionGetZoomSpecific10 ();
-	    break;
-
-	case ZoomTarget11:
-	    zoom_level = 1.0f / optionGetZoomSpecific11 ();
-	    break;
-
-	case ZoomTarget12:
-	    zoom_level = 1.0f / optionGetZoomSpecific12 ();
-	    break;
-
-	case ZoomTarget13:
-	    zoom_level = 1.0f / optionGetZoomSpecific13 ();
-	    break;
-
-	case ZoomTarget14:
-	    zoom_level = 1.0f / optionGetZoomSpecific14 ();
-	    break;
-
-	case ZoomTarget15:
-	    zoom_level = 1.0f / optionGetZoomSpecific15 ();
-	    break;
-
-	case ZoomTarget16:
-	    zoom_level = 1.0f / optionGetZoomSpecific16 ();
+	    zoom_level = optionGetZoomSpec3 ();
 	    break;
 
 	default:
@@ -2214,45 +2162,6 @@ EZoomScreen::EZoomScreen (CompScreen *screen) :
     optionSetZoomSpecific3KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
                                        this, _1, _2, _3, 
                                        ZoomTarget3));
-    optionSetZoomSpecific4KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                       this, _1, _2, _3, 
-                                       ZoomTarget4));
-    optionSetZoomSpecific5KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                       this, _1, _2, _3, 
-                                       ZoomTarget5));
-    optionSetZoomSpecific6KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                       this, _1, _2, _3, 
-                                       ZoomTarget6));
-    optionSetZoomSpecific7KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                       this, _1, _2, _3, 
-                                       ZoomTarget7));
-    optionSetZoomSpecific8KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                       this, _1, _2, _3, 
-                                       ZoomTarget8));
-    optionSetZoomSpecific9KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                       this, _1, _2, _3, 
-                                       ZoomTarget9));
-    optionSetZoomSpecific10KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                        this, _1, _2, _3, 
-                                        ZoomTarget10));
-    optionSetZoomSpecific11KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                        this, _1, _2, _3, 
-                                        ZoomTarget11));
-    optionSetZoomSpecific12KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                        this, _1, _2, _3, 
-                                        ZoomTarget12));
-    optionSetZoomSpecific13KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                        this, _1, _2, _3, 
-                                        ZoomTarget13));
-    optionSetZoomSpecific14KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                        this, _1, _2, _3, 
-                                        ZoomTarget14));
-    optionSetZoomSpecific15KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                        this, _1, _2, _3, 
-                                        ZoomTarget15));
-    optionSetZoomSpecific16KeyInitiate (boost::bind (&EZoomScreen::zoomSpecific, 
-                                        this, _1, _2, _3, 
-                                        ZoomTarget16));
     optionSetPanLeftKeyInitiate (boost::bind (&EZoomScreen::zoomPan, this, _1,
 					      _2, _3, -1, 0));
     optionSetPanRightKeyInitiate (boost::bind (&EZoomScreen::zoomPan, this, _1,
diff --git a/plugins/ezoom/src/ezoom.h b/plugins/ezoom/src/ezoom.h
index 7aad7fd90e932daa6616ff82d4d31a2199493fe8..04f93baf11b1f91b89009de64aabf4cb10ba8022 100755
--- a/plugins/ezoom/src/ezoom.h
+++ b/plugins/ezoom/src/ezoom.h
@@ -60,20 +60,7 @@ enum SpecificZoomTarget
 {
     ZoomTarget1 = 0,
     ZoomTarget2,
-    ZoomTarget3,
-    ZoomTarget4,
-    ZoomTarget5,
-    ZoomTarget6,
-    ZoomTarget7,
-    ZoomTarget8,
-    ZoomTarget9,
-    ZoomTarget10,
-    ZoomTarget11,
-    ZoomTarget12,
-    ZoomTarget13,
-    ZoomTarget14,
-    ZoomTarget15,
-    ZoomTarget16
+    ZoomTarget3
 };
 
 class EZoomScreen :