Index: applications/editors/josm/plugins/CommandLine/build.xml
===================================================================
--- applications/editors/josm/plugins/CommandLine/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/CommandLine/build.xml	(revision 27852)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="Moar bugfixes"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4645"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLineAction.java
===================================================================
--- applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLineAction.java	(revision 27848)
+++ applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLineAction.java	(revision 27852)
@@ -41,5 +41,5 @@
 	public CommandLineAction(CommandLine parentPlugin) {
 		super(tr("Command line"), "blankmenu", tr("Set input focus to the command line."),
-		Shortcut.registerShortcut("edit:simplifyArea", tr("Tool: {0}", tr("Command line")), KeyEvent.VK_ENTER, Shortcut.GROUP_DIRECT), true);
+		Shortcut.registerShortcut("edit:simplifyArea", tr("Tool: {0}", tr("Command line")), KeyEvent.VK_ENTER, Shortcut.DIRECT), true);
 		this.parentPlugin = parentPlugin;
 	}
Index: applications/editors/josm/plugins/Create_grid_of_ways/build.xml
===================================================================
--- applications/editors/josm/plugins/Create_grid_of_ways/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/Create_grid_of_ways/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Changed constructor signature, updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java
===================================================================
--- applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java	(revision 27848)
+++ applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java	(revision 27852)
@@ -33,7 +33,5 @@
     public CreateGridOfWaysAction() {
         super(tr("Create grid of ways"), "creategridofways", tr("Forms a grid of ways in base to two existing that have various nodes and one in common"), Shortcut.registerShortcut("tools:CreateGridOfWays", tr("Tool: {0}", tr("Create grid of ways")),
-        KeyEvent.VK_G, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
-/* en mis otras pruebas esto terminaba : Shortcut.GROUP_EDIT), true);
-/* le puse tecla G de shortcut pero parece que esta usado por tools:unglue , buscar otro */
+        KeyEvent.VK_G, Shortcut.SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/DirectUpload/build.xml
===================================================================
--- applications/editors/josm/plugins/DirectUpload/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/DirectUpload/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="DirectUpload" default="dist" basedir=".">
     <property name="commit.message" value="applied JOSM Ticket 4498 (patch by ax) - oauth support for gpx upload (I accidentally committed parts of the path in [24236])"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java
===================================================================
--- applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java	(revision 27852)
@@ -37,5 +37,5 @@
             super(tr("Upload Traces"), "UploadAction", tr("Uploads traces to openstreetmap.org"),
                 Shortcut.registerShortcut("tools:uploadtraces", tr("Tool: {0}", tr("Upload Traces")),
-                KeyEvent.VK_G, Shortcut.GROUP_MENU), false);
+                KeyEvent.VK_G, Shortcut.CTRL), false);
         }
         
Index: applications/editors/josm/plugins/FastDraw/build.xml
===================================================================
--- applications/editors/josm/plugins/FastDraw/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/FastDraw/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="FastDraw: shortcut parsing"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java
===================================================================
--- applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 27848)
+++ applications/editors/josm/plugins/FastDraw/src/org/openstreetmap/josm/plugins/fastdraw/FastDrawingMode.java	(revision 27852)
@@ -93,5 +93,5 @@
     FastDrawingMode(MapFrame mapFrame) {
         super(tr("FastDrawing"), "turbopen.png", tr("Fast drawing mode"), 
-		Shortcut.registerShortcut("mapmode:fastdraw", tr("Mode: {0}", tr("Fast drawing mode")), KeyEvent.VK_F, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1)
+		Shortcut.registerShortcut("mapmode:fastdraw", tr("Mode: {0}", tr("Fast drawing mode")), KeyEvent.VK_F, Shortcut.SHIFT)
 		,mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         line=new DrawnPolyLine();
Index: applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- applications/editors/josm/plugins/FixAddresses/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/FixAddresses/build.xml	(revision 27852)
@@ -96,5 +96,5 @@
                 <attribute name="de_Plugin-Description" value="Findet ungültige Addressen und bietet Unterstützung zur deren Korrektur."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/FixAddresses"/>
-                <attribute name="Plugin-Mainversion" value="4549"/>
+                <attribute name="Plugin-Mainversion" value="4980"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
                 <attribute name="Plugin-Icon" value="images/fixaddresses.png"/>
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 27848)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 27852)
@@ -31,5 +31,5 @@
 				tr("Find and fix addresses without (valid) streets."),
 				Shortcut.registerShortcut("tools:AddressEdit", tr("Tool: {0}",
-				tr("Address Edit")), KeyEvent.VK_X, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), false);
+				tr("Address Edit")), KeyEvent.VK_X, Shortcut.CTRL_SHIFT), false);
 
 		setEnabled(false);
Index: applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Initial version."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4789"/>
+    <property name="plugin.main.version" value="4980"/>
     <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
Index: applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java
===================================================================
--- applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 27848)
+++ applications/editors/josm/plugins/HouseNumberTaggingTool/src/org/openstreetmap/josm/plugins/housenumbertool/LaunchAction.java	(revision 27852)
@@ -27,5 +27,5 @@
             "home-icon32", 
             "Launches the HouseNumberTaggingTool dialog", 
-            Shortcut.registerShortcut("edit:housenumbertaggingtool", "HouseNumberTaggingTool", KeyEvent.VK_K, Shortcut.GROUP_EDIT),
+            Shortcut.registerShortcut("edit:housenumbertaggingtool", "HouseNumberTaggingTool", KeyEvent.VK_K, Shortcut.DIRECT),
             true);
 
Index: applications/editors/josm/plugins/OpeningHoursEditor/build.xml
===================================================================
--- applications/editors/josm/plugins/OpeningHoursEditor/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/OpeningHoursEditor/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="fixed main version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java
===================================================================
--- applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java	(revision 27852)
@@ -88,5 +88,5 @@
                     tr("Edit time-tag of selected element in a graphical interface"), Shortcut.registerShortcut(
                             "tools:opening_hourseditor", tr("Tool: {0}", tr("Edit opening hours")), KeyEvent.VK_O,
-                            Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), false);
+                            Shortcut.ALT_CTRL_SHIFT), false);
         }
 
Index: applications/editors/josm/plugins/addrinterpolation/build.xml
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/addrinterpolation/build.xml	(revision 27852)
@@ -23,5 +23,5 @@
 <project name="AddrInterpolation" default="dist" basedir=".">
     <property name="commit.message" value="Impoved Icon"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java
===================================================================
--- applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java	(revision 27848)
+++ applications/editors/josm/plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java	(revision 27852)
@@ -25,5 +25,5 @@
         super(tr("Address Interpolation"), "AddrInterpolation", tr("Handy Address Interpolation Functions"),
                 Shortcut.registerShortcut("tools:AddressInterpolation", tr("Tool: {0}", tr("Address Interpolation")),
-                        KeyEvent.VK_Z, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT2), false);
+                        KeyEvent.VK_Z, Shortcut.ALT_CTRL), false);
         setEnabled(false);
         DataSet.addSelectionListener(this);
Index: applications/editors/josm/plugins/alignways/build.xml
===================================================================
--- applications/editors/josm/plugins/alignways/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/alignways/build.xml	(revision 27852)
@@ -35,5 +35,5 @@
         with
     -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
         ************************************************ ** should not be
Index: applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAction.java
===================================================================
--- applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAction.java	(revision 27848)
+++ applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysAction.java	(revision 27852)
@@ -33,5 +33,5 @@
                         + "around a chosen pivot."), 
 				Shortcut.registerShortcut("tools:alignways", tr("Tool: {0}", tr("Align Ways")),
-                                KeyEvent.VK_SPACE, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1)
+                                KeyEvent.VK_SPACE, Shortcut.SHIFT)
 				, true);
         setEnabled(false);
Index: applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java
===================================================================
--- applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java	(revision 27848)
+++ applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysMode.java	(revision 27852)
@@ -45,5 +45,5 @@
                 Shortcut.registerShortcut("mapmode:alignways",
                         tr("Mode: {0}", tr("Align Ways")),
-                        KeyEvent.VK_N, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1),
+                        KeyEvent.VK_N, Shortcut.SHIFT),
                         mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         noneSelected = new AlignWaysSelNoneState();
Index: applications/editors/josm/plugins/buildings_tools/build.xml
===================================================================
--- applications/editors/josm/plugins/buildings_tools/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/buildings_tools/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="BuildingTools: shortcut changes - binary"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java	(revision 27848)
+++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java	(revision 27852)
@@ -15,5 +15,5 @@
         super(tr("Set buildings size"), "mapmode/building", tr("Set buildings size"),
                 Shortcut.registerShortcut("edit:buildingsdialog", tr("Edit: {0}", tr("Set buildings size")),
-                KeyEvent.VK_B, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2),
+                KeyEvent.VK_B, Shortcut.ALT_CTRL),
                 true);
     }
Index: applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java
===================================================================
--- applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java	(revision 27848)
+++ applications/editors/josm/plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java	(revision 27852)
@@ -67,5 +67,5 @@
                 Shortcut.registerShortcut("mapmode:buildings",
                         tr("Mode: {0}", tr("Draw buildings")),
-                        KeyEvent.VK_B, Shortcut.GROUP_EDIT),
+                        KeyEvent.VK_B, Shortcut.DIRECT),
                 mapFrame, getCursor());
 
Index: applications/editors/josm/plugins/cadastre-fr/build.xml
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/cadastre-fr/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="ant.build.javac.target" value="1.5"/>
     <property name="commit.message" value="Changed constructor for Plugin"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java	(revision 27848)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java	(revision 27852)
@@ -95,5 +95,5 @@
         super(tr("Add address"), "buildings", 
                 tr("Helping tool for tag address"),
-                Shortcut.registerShortcut("mapmode:buildings", tr("Mode: {0}", tr("Buildings")), KeyEvent.VK_E, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1),
+                Shortcut.registerShortcut("mapmode:buildings", tr("Mode: {0}", tr("Buildings")), KeyEvent.VK_E, Shortcut.ALT_CTRL_SHIFT),
                 mapFrame, getCursor());
     }
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java	(revision 27848)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java	(revision 27852)
@@ -10,5 +10,5 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
 import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
 import org.openstreetmap.josm.tools.GBC;
@@ -21,5 +21,5 @@
  * @author Pieren <pieren3@gmail.com>
  */
-public class CadastrePreferenceSetting implements PreferenceSetting {
+public class CadastrePreferenceSetting extends DefaultTabPreferenceSetting {
 
     static final int TRANS_MIN = 1;
@@ -91,12 +91,17 @@
     static final int DEFAULT_CROSSPIECES = 0;
 
-    public void addGui(final PreferenceTabbedPane gui) {
-
-        String description = tr("A special handler of the French cadastre wms at www.cadastre.gouv.fr" + "<BR><BR>"
+    public CadastrePreferenceSetting() {
+        super("cadastrewms.gif", I18n.tr("French cadastre WMS"),
+            tr("A special handler of the French cadastre wms at www.cadastre.gouv.fr" + "<BR><BR>"
                 + "Please read the Terms and Conditions of Use here (in French): <br>"
                 + "<a href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> "
                 + "http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> <BR>"
-                + "before any upload of data created by this plugin.");
-        JPanel cadastrewmsMast = gui.createPreferenceTab("cadastrewms.gif", I18n.tr("French cadastre WMS"), description);
+                + "before any upload of data created by this plugin.")
+        );
+    }
+
+
+    public void addGui(final PreferenceTabbedPane gui) {
+        JPanel cadastrewmsMast = gui.createPreferenceTab(this);
 
         JPanel cadastrewms = new JPanel(new GridBagLayout());
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java	(revision 27848)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrab.java	(revision 27852)
@@ -26,5 +26,5 @@
         super(tr(name), "cadastre_small", tr("Download Image from French Cadastre WMS"),
                 Shortcut.registerShortcut("cadastre:grab", tr("Cadastre: {0}", tr("Download Image from French Cadastre WMS")),
-                KeyEvent.VK_F10, Shortcut.GROUP_DIRECT), false);
+                KeyEvent.VK_F10, Shortcut.DIRECT), false);
     }
 
Index: applications/editors/josm/plugins/conflation/build.xml
===================================================================
--- applications/editors/josm/plugins/conflation/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/conflation/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java
===================================================================
--- applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java	(revision 27848)
+++ applications/editors/josm/plugins/conflation/src/org/openstreetmap/josm/plugins/conflation/ConflationAction.java	(revision 27852)
@@ -21,5 +21,5 @@
         super(tr("Conflation"), "conflation", tr("Conflation tool for merging data"),
                 Shortcut.registerShortcut("tool:conflation", tr("Tool: {0}", tr("Conflation")),
-                KeyEvent.VK_A, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1), true);
+                KeyEvent.VK_A, Shortcut.CTRL_SHIFT), true);
         //setEnabled(false);
         //DataSet.selListeners.add(this);
Index: applications/editors/josm/plugins/czechaddress/build.xml
===================================================================
--- applications/editors/josm/plugins/czechaddress/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/czechaddress/build.xml	(revision 27852)
@@ -33,5 +33,5 @@
             <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/CS:JOSM/Plugins/CzechAddress"/>
             <attribute name="Plugin-Icon" value="images/preferences/czech_flag.png"/>
-            <attribute name="Plugin-Mainversion" value="4928"/>
+            <attribute name="Plugin-Mainversion" value="4980"/>
             <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
         </manifest>
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java	(revision 27848)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/ConflictResolveAction.java	(revision 27852)
@@ -27,5 +27,5 @@
               Shortcut.registerShortcut("address:resolveconflict",
                         "Adresy: Zobrazit konflikty",
-                        KeyEvent.VK_R, Shortcut.GROUP_NONE, Shortcut.SHIFT_DEFAULT),
+                        KeyEvent.CHAR_UNDEFINED, Shortcut.NONE),
               true);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java	(revision 27848)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/FactoryAction.java	(revision 27852)
@@ -40,5 +40,5 @@
               Shortcut.registerShortcut( "mapmode:clickaddress",
                   "Sputit továrnu na adresy",
-                  KeyEvent.VK_K, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT2),
+                  KeyEvent.VK_K, Shortcut.ALT_SHIFT),
               frame,
               ImageProvider.getCursor("crosshair", "envelope-star-small"));
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java	(revision 27848)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/GroupManipulatorAction.java	(revision 27852)
@@ -28,5 +28,5 @@
               Shortcut.registerShortcut("address:assignaddress",
                         "Adresy: Přiřadit adresy",
-                        KeyEvent.VK_P, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT),
+                        KeyEvent.VK_P, Shortcut.SHIFT),
               true);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java	(revision 27848)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/PointManipulatorAction.java	(revision 27852)
@@ -30,5 +30,5 @@
                 Shortcut.registerShortcut("tools:newaddress",
                         "Adresy: Vytvořit/upravit adres",
-                        KeyEvent.VK_W, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1),
+                        KeyEvent.VK_W, Shortcut.ALT_CTRL_SHIFT),
                 true);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 27848)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java	(revision 27852)
@@ -43,5 +43,5 @@
               Shortcut.registerShortcut("tools:splitarea",
                     tr("Tool: {0}", tr("Split area")),
-                    KeyEvent.VK_W, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT1),
+                    KeyEvent.VK_W, Shortcut.ALT_SHIFT),
               true);
     }
Index: applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java
===================================================================
--- applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/gui/FactoryDialog.java	(revision 27852)
@@ -62,5 +62,5 @@
                "Umožňuje rychlé vytváření adresních bodů „jedním kliknutím.“",
                 Shortcut.registerShortcut("subwindow:addressfactory","Přepnout: Továrna na adresy",
-                    KeyEvent.VK_T, Shortcut.GROUP_LAYER),
+                    KeyEvent.VK_T, Shortcut.ALT),
                 200);
 
Index: applications/editors/josm/plugins/download_along/build.xml
===================================================================
--- applications/editors/josm/plugins/download_along/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/download_along/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java
===================================================================
--- applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java	(revision 27848)
+++ applications/editors/josm/plugins/download_along/src/org/openstreetmap/josm/plugin/download_along/DownloadAlong.java	(revision 27852)
@@ -56,6 +56,5 @@
           tr("Download OSM data along the selected ways."),
           Shortcut.registerShortcut("tools:download_along", tr("Tool: {0}",
-          tr("Download Along")), KeyEvent.VK_D, Shortcut.GROUP_EDIT+
-          Shortcut.GROUPS_ALT2), true);
+          tr("Download Along")), KeyEvent.VK_D, Shortcut.ALT_SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/globalsat/build.xml
===================================================================
--- applications/editors/josm/plugins/globalsat/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/globalsat/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Changed constructor signature of plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java
===================================================================
--- applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java	(revision 27852)
@@ -108,5 +108,5 @@
             tr("Import Data from Globalsat Datalogger DG100 into GPX layer."),
             Shortcut.registerShortcut("menu:globalsatimport", tr("Menu: {0}", tr("Globalsat Import")),
-            KeyEvent.VK_G, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT2), false);
+            KeyEvent.VK_G, Shortcut.ALT_CTRL), false);
         }
         public void actionPerformed(ActionEvent e){
Index: applications/editors/josm/plugins/gpxfilter/build.xml
===================================================================
--- applications/editors/josm/plugins/gpxfilter/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/gpxfilter/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="GPXFilter: moved to Alt-Shift-X"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4960"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java
===================================================================
--- applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java	(revision 27848)
+++ applications/editors/josm/plugins/gpxfilter/src/gpxfilter/AddEGpxLayerAction.java	(revision 27852)
@@ -15,6 +15,7 @@
     public AddEGpxLayerAction() {
         super(tr("Add EGPX layer"),null,tr("Add EGPX layer"),
-                Shortcut.registerShortcut("gpxfilter:egpx", tr("Tool: {0}", tr("Add EGPX layer")),
-                        KeyEvent.VK_X, Shortcut.GROUPS_ALT1+Shortcut.GROUP_LAYER), true);
+            Shortcut.registerShortcut("gpxfilter:egpx", tr("Tool: {0}", tr("Add EGPX layer")),
+                 KeyEvent.VK_X, Shortcut.ALT_SHIFT),
+            true, "gpxfilter/addegpxlayer", true);
     }
 
Index: applications/editors/josm/plugins/imageryadjust/build.xml
===================================================================
--- applications/editors/josm/plugins/imageryadjust/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/imageryadjust/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="ImageryAdjust: Adjust while holding Y"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java
===================================================================
--- applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java	(revision 27848)
+++ applications/editors/josm/plugins/imageryadjust/src/imageryadjust/ImageryAdjustMapMode.java	(revision 27852)
@@ -37,5 +37,5 @@
                 tr("Adjust the position of the selected imagery layer"), 
                 Shortcut.registerShortcut("imageryadjust:adjustmode", tr("Mode: {0}", tr("Adjust imagery")),
-                KeyEvent.VK_Y, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2),
+                KeyEvent.VK_Y, Shortcut.ALT_CTRL),
                 mapFrame,
                 ImageProvider.getCursor("normal", "move"));
Index: applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Updated the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java
===================================================================
--- applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/imagewaypoint/src/org/insignificant/josm/plugins/imagewaypoint/ImageWayPointDialog.java	(revision 27852)
@@ -189,5 +189,5 @@
         tr("Display non-geotagged photos"),
         Shortcut.registerShortcut("subwindow:imagewaypoint", tr("Toggle: {0}", tr("WayPoint Image")),
-        KeyEvent.VK_Y, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1),
+        KeyEvent.VK_Y, Shortcut.ALT_SHIFT),
         200);
 
Index: applications/editors/josm/plugins/importvec/build.xml
===================================================================
--- applications/editors/josm/plugins/importvec/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/importvec/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java
===================================================================
--- applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java	(revision 27848)
+++ applications/editors/josm/plugins/importvec/src/org/openstreetmap/josm/plugins/importvec/ImportVectorAction.java	(revision 27852)
@@ -45,5 +45,5 @@
     public ImportVectorAction() {
         super(tr("Import..."), "open", tr("Import vector graphics."),
-                Shortcut.registerShortcut("system:import", tr("File: {0}", tr("Import...")), KeyEvent.VK_I, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT2), false);
+                Shortcut.registerShortcut("system:import", tr("File: {0}", tr("Import...")), KeyEvent.VK_I, Shortcut.ALT_CTRL), false);
         // Avoid to override "open" toolbar function
         putValue("toolbar", "importvec");
Index: applications/editors/josm/plugins/infomode/build.xml
===================================================================
--- applications/editors/josm/plugins/infomode/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/infomode/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="InfoMode : for shortcurt parser"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4667"/>
+    <property name="plugin.main.version" value="4980"/>
     <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
Index: applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java
===================================================================
--- applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java	(revision 27848)
+++ applications/editors/josm/plugins/infomode/src/org/openstreetmap/josm/plugins/infomode/InfoMode.java	(revision 27852)
@@ -59,5 +59,5 @@
     InfoMode(MapFrame mapFrame) {
         super(tr("InfoMode"), "infomode.png", tr("GPX info mode"), 
-		Shortcut.registerShortcut("mapmode:infomode", tr("Mode: {0}", tr("GPX info mode")), KeyEvent.VK_BACK_SLASH, Shortcut.GROUP_EDIT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+		Shortcut.registerShortcut("mapmode:infomode", tr("Mode: {0}", tr("GPX info mode")), KeyEvent.VK_BACK_SLASH, Shortcut.DIRECT), mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
         infoPanel=new InfoPanel();
         
Index: applications/editors/josm/plugins/irsrectify/build.xml
===================================================================
--- applications/editors/josm/plugins/irsrectify/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/irsrectify/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="irsrectify shortcut confilct"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4960"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java
===================================================================
--- applications/editors/josm/plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/irsrectify/src/irsrectify/IRSRectifyPlugin.java	(revision 27852)
@@ -43,5 +43,5 @@
         public IRSRectifyAction() {
             super(tr("Update IRS adjustment layer"), "irsrectify.png", tr("Update IRS adjustment layer"),
-                    Shortcut.registerShortcut("menu:irsrectify", tr("Update IRS adjustment layer"), KeyEvent.VK_MULTIPLY, Shortcut.GROUP_DIRECT), false);
+                    Shortcut.registerShortcut("menu:irsrectify", tr("Update IRS adjustment layer"), KeyEvent.VK_MULTIPLY, Shortcut.DIRECT), false);
         }
 
Index: applications/editors/josm/plugins/junctionchecking/build.xml
===================================================================
--- applications/editors/josm/plugins/junctionchecking/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/junctionchecking/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="junctionchecking" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.build.dir" value="build"/>
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/JunctionCheckDialog.java	(revision 27852)
@@ -48,5 +48,5 @@
 		super(tr("JunctionChecking"), "junctionchecker", tr("Open the junctionchecking window."),
 				Shortcut.registerShortcut("subwindow:junctionchecker", tr("Toggle: {0}", tr("junctions")),
-						KeyEvent.VK_J, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
+						KeyEvent.VK_J, Shortcut.ALT_SHIFT), 150);
 		plugin = junctionCheckerGuiPlugin;
 		//das Digraph Create Panel
Index: applications/editors/josm/plugins/lakewalker/build.xml
===================================================================
--- applications/editors/josm/plugins/lakewalker/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/lakewalker/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="lakewalker" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java
===================================================================
--- applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java	(revision 27848)
+++ applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java	(revision 27852)
@@ -52,5 +52,5 @@
         super(name, "lakewalker-sml", tr("Lake Walker."),
         Shortcut.registerShortcut("tools:lakewalker", tr("Tool: {0}", tr("Lake Walker")),
-        KeyEvent.VK_L, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
+        KeyEvent.VK_L, Shortcut.ALT_CTRL_SHIFT), true);
         this.name = name;
         setEnabled(true);
Index: applications/editors/josm/plugins/licensechange/build.xml
===================================================================
--- applications/editors/josm/plugins/licensechange/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/licensechange/build.xml	(revision 27852)
@@ -26,5 +26,5 @@
     -->
     <property name="commit.message" value=""/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java
===================================================================
--- applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java	(revision 27848)
+++ applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/CheckAction.java	(revision 27852)
@@ -38,5 +38,5 @@
     {
         super(tr("License Check"), "licensechange", tr("Performs the license check"),
-        Shortcut.registerShortcut("tools:licensechange", tr("Tool: {0}", tr("License Check")), KeyEvent.VK_C, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
+        Shortcut.registerShortcut("tools:licensechange", tr("Tool: {0}", tr("License Check")), KeyEvent.VK_C, Shortcut.ALT_CTRL_SHIFT), true);
         this.plugin = plugin;
     }
Index: applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java
===================================================================
--- applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/licensechange/src/org/openstreetmap/josm/plugins/licensechange/LicenseChangeDialog.java	(revision 27852)
@@ -76,5 +76,5 @@
         super(tr("Relicensing problems"), "licensechange", tr("Open the relicensing window."),
                 Shortcut.registerShortcut("subwindow:licensechange", tr("Toggle: {0}", tr("Relicensing problems")),
-                        KeyEvent.VK_L, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2), 150);
+                        KeyEvent.VK_L, Shortcut.ALT_CTRL), 150);
 
         this.plugin = plugin;
Index: applications/editors/josm/plugins/livegps/build.xml
===================================================================
--- applications/editors/josm/plugins/livegps/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/livegps/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="livegps" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java	(revision 27852)
@@ -45,5 +45,5 @@
         super(tr("Live GPS"), "livegps", tr("Show GPS data."),
         Shortcut.registerShortcut("subwindow:livegps", tr("Toggle: {0}", tr("Live GPS")),
-        KeyEvent.VK_G, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), 100);
+        KeyEvent.VK_G, Shortcut.ALT_CTRL_SHIFT), 100);
         panel = new JPanel();
         panel.setLayout(new GridLayout(6,2));
Index: applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java
===================================================================
--- applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java	(revision 27852)
@@ -49,5 +49,5 @@
                     Shortcut.registerShortcut("menu:livegps:capture", tr(
                             "Menu: {0}", tr("Capture GPS Track")),
-                            KeyEvent.VK_R, Shortcut.GROUP_MENU), true);
+                            KeyEvent.VK_R, Shortcut.CTRL), true);
         }
 
@@ -63,5 +63,5 @@
                     Shortcut.registerShortcut("edit:centergps", tr("Edit: {0}",
                             tr("Center Once")), KeyEvent.VK_HOME,
-                            Shortcut.GROUP_EDIT), true);
+                            Shortcut.DIRECT), true);
         }
 
@@ -81,5 +81,5 @@
                     Shortcut.registerShortcut("menu:livegps:autocenter", tr(
                             "Menu: {0}", tr("Capture GPS Track")),
-                            KeyEvent.VK_HOME, Shortcut.GROUP_MENU), true);
+                            KeyEvent.VK_HOME, Shortcut.CTRL), true);
         }
 
Index: applications/editors/josm/plugins/mapdust/build.xml
===================================================================
--- applications/editors/josm/plugins/mapdust/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/mapdust/build.xml	(revision 27852)
@@ -3,5 +3,5 @@
     <!-- properties -->
     <property name="commit.message" value="MapDust bug reporter plugin"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.build.dir" value="build/classes"/>
Index: applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java
===================================================================
--- applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java	(revision 27852)
@@ -125,5 +125,5 @@
         /* create MapDust GUI */
         Shortcut shortcut = Shortcut.registerShortcut("MapDust", tr("Toggle: {0}", tr("Open MapDust")),
-                KeyEvent.VK_0, Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1);
+                KeyEvent.VK_0, Shortcut.ALT_SHIFT);
         String name = "MapDust bug reports";
         String tooltip = "Activates the MapDust bug reporter plugin";
Index: applications/editors/josm/plugins/measurement/build.xml
===================================================================
--- applications/editors/josm/plugins/measurement/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/measurement/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="measurement" default="dist" basedir=".">
     <property name="commit.message" value="recompile dure to core change"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java
===================================================================
--- applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java	(revision 27852)
@@ -67,5 +67,5 @@
         super(tr("Measured values"), "measure", tr("Open the measurement window."),
         Shortcut.registerShortcut("subwindow:measurement", tr("Toggle: {0}", tr("Measured values")),
-        KeyEvent.VK_U, Shortcut.GROUP_DIRECT3), 150);
+        KeyEvent.VK_U, Shortcut.CTRL_SHIFT), 150);
 
         resetButton = new SideButton(marktr("Reset"), "select", "Measurement",
Index: applications/editors/josm/plugins/merge-overlap/build.xml
===================================================================
--- applications/editors/josm/plugins/merge-overlap/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/merge-overlap/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
 
     <import file="../build-common.xml"/>
Index: applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java
===================================================================
--- applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 27848)
+++ applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java	(revision 27852)
@@ -55,5 +55,5 @@
 				tr("Merge overlap of ways."), 
 				Shortcut.registerShortcut("tools:mergeoverlap",tr("Tool: {0}", tr("Merge overlap")), KeyEvent.VK_O,
-				Shortcut.GROUP_HOTKEY+Shortcut.GROUPS_ALT2)
+				Shortcut.ALT_CTRL)
 				, true);
 	}
Index: applications/editors/josm/plugins/michigan_left/build.xml
===================================================================
--- applications/editors/josm/plugins/michigan_left/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/michigan_left/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java
===================================================================
--- applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java	(revision 27848)
+++ applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeft.java	(revision 27852)
@@ -50,6 +50,5 @@
           tr("Adds no left turn for sets of 4 or 5 ways."),
           Shortcut.registerShortcut("tools:michigan_left", tr("Tool: {0}",
-          tr("Michigan Left")), KeyEvent.VK_N, Shortcut.GROUP_EDIT
-          +Shortcut.GROUPS_ALT2), true);
+          tr("Michigan Left")), KeyEvent.VK_N, Shortcut.ALT_SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/mirrored_download/build.xml
===================================================================
--- applications/editors/josm/plugins/mirrored_download/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/mirrored_download/build.xml	(revision 27852)
@@ -86,5 +86,5 @@
                 <attribute name="Plugin-Description" value="Simplifies download from different read-only APIs."/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/wiki/JOSM/Plugins/mirrored_download"/>
-                <attribute name="Plugin-Mainversion" value="4549"/>
+                <attribute name="Plugin-Mainversion" value="4980"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java
===================================================================
--- applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java	(revision 27848)
+++ applications/editors/josm/plugins/mirrored_download/src/mirrored_download/DownloadAction2.java	(revision 27852)
@@ -29,5 +29,5 @@
     public DownloadAction2() {
         super(tr("Download from OSM mirror..."), null, tr("Download map data from the OSM server."),
-                Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_DOWN, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);
+                Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_DOWN, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/MirroredDownload"));
     }
Index: applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java
===================================================================
--- applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java	(revision 27848)
+++ applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java	(revision 27852)
@@ -25,5 +25,5 @@
     public UrlSelectionAction() {
         super(tr("Select URL..."), null, tr("Select URL to download from."),
-                Shortcut.registerShortcut("file:selecturl", tr("File: {0}", tr("Select URL...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true);
+                Shortcut.registerShortcut("file:selecturl", tr("File: {0}", tr("Select URL...")), KeyEvent.VK_D, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/SelectUrl"));
     }
Index: applications/editors/josm/plugins/multipoly-convert/build.xml
===================================================================
--- applications/editors/josm/plugins/multipoly-convert/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/multipoly-convert/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Mulpipoly-convert: help shortcut parser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
 
     <import file="../build-common.xml"/>
Index: applications/editors/josm/plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java
===================================================================
--- applications/editors/josm/plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java	(revision 27848)
+++ applications/editors/josm/plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java	(revision 27852)
@@ -40,5 +40,5 @@
                 Shortcut.registerShortcut("tools:multipolyconv", tr("Tool: {0}",
                     tr("Convert to multipolygon")), KeyEvent.VK_M,
-                    Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
+                    Shortcut.ALT_CTRL_SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="openstreetbugs" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java
===================================================================
--- applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java	(revision 27852)
@@ -115,5 +115,5 @@
                 tr("Opens the OpenStreetBugs window and activates the automatic download"), Shortcut.registerShortcut(
                         "view:openstreetbugs", tr("Toggle: {0}", tr("Open OpenStreetBugs")), KeyEvent.VK_B,
-                        Shortcut.GROUP_LAYER+Shortcut.GROUPS_ALT1), 150);
+                        Shortcut.ALT_SHIFT), 150);
 
         osbPlugin = plugin;
Index: applications/editors/josm/plugins/openvisible/build.xml
===================================================================
--- applications/editors/josm/plugins/openvisible/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/openvisible/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class; updated build.xml"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java
===================================================================
--- applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java	(revision 27848)
+++ applications/editors/josm/plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java	(revision 27852)
@@ -49,5 +49,5 @@
         tr("Open only files that are visible in current view."),
         Shortcut.registerShortcut("tools:openvisible", tr("Menu: {0}", tr("Open Visible...")),
-        KeyEvent.VK_I, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
+        KeyEvent.VK_I, Shortcut.ALT_CTRL_SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/pdfimport/build.xml
===================================================================
--- applications/editors/josm/plugins/pdfimport/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/pdfimport/build.xml	(revision 27852)
@@ -33,5 +33,5 @@
     <property name="commit.message" value="Initial pdfimport version"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4980"/>
     <!-- compilation properties -->
     <property name="josm.build.dir" value="../../core"/>
Index: applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportAction.java
===================================================================
--- applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportAction.java	(revision 27848)
+++ applications/editors/josm/plugins/pdfimport/src/pdfimport/PdfImportAction.java	(revision 27852)
@@ -20,5 +20,5 @@
 		    tr("Import PDF file."), 
 		    Shortcut.registerShortcut("tools:pdfimport", tr("Tool: {0}",tr("Import PDF file")),
-		    KeyEvent.VK_P,Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT)
+		    KeyEvent.VK_P, Shortcut.SHIFT)
 		    , true);
 	}
Index: applications/editors/josm/plugins/print/build.xml
===================================================================
--- applications/editors/josm/plugins/print/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/print/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Added a field to specify the map scale."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4733"/>
+    <property name="plugin.main.version" value="4980"/>
     <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
Index: applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintAction.java
===================================================================
--- applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintAction.java	(revision 27848)
+++ applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintAction.java	(revision 27852)
@@ -47,5 +47,5 @@
         super(tr("Print..."), null, tr("Print the map"), 
         Shortcut.registerShortcut("print:print", tr("File: {0}", tr("Print...")), 
-	KeyEvent.VK_P, Shortcut.GROUP_MENU),
+	KeyEvent.VK_P, Shortcut.CTRL),
         true, "print/print", true);
     }
Index: applications/editors/josm/plugins/reltoolbox/build.xml
===================================================================
--- applications/editors/josm/plugins/reltoolbox/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/reltoolbox/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="RelToolbox"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/RelContextDialog.java	(revision 27852)
@@ -545,5 +545,5 @@
             super("…", null, tr("Enter role for selected members"),
                     Shortcut.registerShortcut("reltoolbox:changerole", tr("Relation Toolbox: {0}", tr("Enter role for selected members")),
-                    KeyEvent.VK_R, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT2), true);
+                    KeyEvent.VK_R, Shortcut.ALT_CTRL), true);
             chosenRelation.addChosenRelationListener(this);
             updateEnabledState();
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java	(revision 27848)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/AddRemoveMemberAction.java	(revision 27852)
@@ -34,5 +34,5 @@
         super(null, "relcontext/addremove", tr("Add/remove members from the chosen relation"),
                 Shortcut.registerShortcut("reltoolbox:addremove", tr("Relation Toolbox: {0}", tr("Add/remove members from the chosen relation")),
-                KeyEvent.VK_EQUALS, Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_EQUALS, Shortcut.DIRECT), true);
         this.rel = rel;
         rel.addChosenRelationListener(this);
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java	(revision 27848)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java	(revision 27852)
@@ -31,5 +31,5 @@
 	super("Multi", "data/multipolygon", tr("Create a multipolygon from selected objects"),
 		Shortcut.registerShortcut("reltoolbox:multipolygon", tr("Relation Toolbox: {0}", tr("Create multipolygon")),
-		KeyEvent.VK_B, Shortcut.GROUP_HOTKEY), true);
+		KeyEvent.VK_B, Shortcut.CTRL), true);
 	this.chRel = chRel;
 	updateEnabledState();
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java	(revision 27848)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateRelationAction.java	(revision 27852)
@@ -39,5 +39,5 @@
         super(tr("New"), "data/relation", tr("Create a relation from selected objects"),
                 Shortcut.registerShortcut("reltoolbox:create", tr("Relation Toolbox: {0}", tr("Create a new relation")),
-                KeyEvent.VK_N, Shortcut.GROUP_HOTKEY+Shortcut.GROUPS_ALT2), true);
+                KeyEvent.VK_N, Shortcut.ALT_CTRL), true);
         this.chRel = chRel;
         updateEnabledState();
Index: applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java
===================================================================
--- applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java	(revision 27848)
+++ applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/FindRelationAction.java	(revision 27852)
@@ -29,5 +29,5 @@
         super("Find", "relcontext/find", tr("Find a relation"),
                 Shortcut.registerShortcut("reltoolbox:find", tr("Relation Toolbox: {0}", tr("Find a relation")),
-                KeyEvent.VK_F, Shortcut.GROUP_HOTKEY+Shortcut.GROUPS_ALT2), true);
+                KeyEvent.VK_F, Shortcut.ALT_CTRL), true);
         this.chRel = chRel;
     }
Index: applications/editors/josm/plugins/restart/build.xml
===================================================================
--- applications/editors/josm/plugins/restart/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/restart/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/restart/src/josmrestartplugin/RestartJosmAction.java
===================================================================
--- applications/editors/josm/plugins/restart/src/josmrestartplugin/RestartJosmAction.java	(revision 27848)
+++ applications/editors/josm/plugins/restart/src/josmrestartplugin/RestartJosmAction.java	(revision 27852)
@@ -18,5 +18,5 @@
                 Shortcut.registerShortcut("file:restart",
                 tr("File: {0}", tr("Restart JOSM")),
-                KeyEvent.VK_J, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1),
+                KeyEvent.VK_J, Shortcut.ALT_CTRL_SHIFT),
                 false);
         putValue("toolbar", "action/restart");
Index: applications/editors/josm/plugins/reverter/build.xml
===================================================================
--- applications/editors/josm/plugins/reverter/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/reverter/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Reverter: moved menu to Alt-Y (conflicts), recompile"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java	(revision 27848)
+++ applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java	(revision 27852)
@@ -16,5 +16,5 @@
             Shortcut.registerShortcut("tool:history",
                 "Tool: Display objects history dialog",
-                KeyEvent.VK_H, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1),
+                KeyEvent.VK_H, Shortcut.ALT_CTRL_SHIFT),
                 true);
         setEnabled(false);
Index: applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java
===================================================================
--- applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java	(revision 27848)
+++ applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java	(revision 27852)
@@ -19,5 +19,5 @@
             Shortcut.registerShortcut("tool:revert",
                 tr("Tool: {0}", tr("Revert changeset")),
-                KeyEvent.VK_T, Shortcut.GROUP_DIRECT3),
+                KeyEvent.VK_T, Shortcut.CTRL_SHIFT),
                 true);
     }
Index: applications/editors/josm/plugins/roadsigns/build.xml
===================================================================
--- applications/editors/josm/plugins/roadsigns/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/roadsigns/build.xml	(revision 27852)
@@ -30,5 +30,5 @@
     <property name="commit.message" value="preset maintenance (Fahrradstraße)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4721"/>
+    <property name="plugin.main.version" value="4980"/>
 
     <!--
Index: applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java
===================================================================
--- applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java	(revision 27852)
@@ -52,5 +52,5 @@
         public RoadSignAction() {
             super(tr("Roadsign tagging"), "pref/roadsigns-small", tr("Add tags by clicking on road signs"),
-                    Shortcut.registerShortcut("plugin:roadsigns:dialog", tr("Roadsigns plugin: open dialog"), KeyEvent.VK_R, Shortcut.GROUP_LAYER), false);
+                    Shortcut.registerShortcut("plugin:roadsigns:dialog", tr("Roadsigns plugin: open dialog"), KeyEvent.VK_R, Shortcut.ALT), false);
         }
 
Index: applications/editors/josm/plugins/routes/build.xml
===================================================================
--- applications/editors/josm/plugins/routes/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/routes/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="routes" default="dist" basedir=".">
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java
===================================================================
--- applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java	(revision 27848)
+++ applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java	(revision 27852)
@@ -27,5 +27,5 @@
     public RelationEditMode(MapFrame mapFrame) {
         super(tr("Edit relation"), "node/autonode", tr("Edit relations"),
-                Shortcut.registerShortcut("mapmode:editRelation", tr("Mode: {0}", tr("Edit relation")), KeyEvent.VK_H, Shortcut.GROUP_EDIT),
+                Shortcut.registerShortcut("mapmode:editRelation", tr("Mode: {0}", tr("Edit relation")), KeyEvent.VK_H, Shortcut.DIRECT),
                 mapFrame, Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
     }
Index: applications/editors/josm/plugins/routing/build.xml
===================================================================
--- applications/editors/josm/plugins/routing/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/routing/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="routing" default="dist" basedir=".">
     <property name="commit.message" value="fixed NPE at startup"/>
-    <property name="plugin.main.version" value="4669"/>
+    <property name="plugin.main.version" value="4980"/>
     <!-- Define some properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
Index: applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java
===================================================================
--- applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java	(revision 27852)
@@ -68,5 +68,5 @@
     public RoutingDialog() {
         super(tr("Routing"), "routing", tr("Open a list of routing nodes"),
-                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut.GROUP_LAYER), 150);
+                Shortcut.registerShortcut("subwindow:relations", tr("Toggle: {0}", tr("Routing")), KeyEvent.VK_R, Shortcut.ALT), 150);
         model = new DefaultListModel();
         createLayout(getJScrollPane(), false, null);
Index: applications/editors/josm/plugins/simplifyarea/build.xml
===================================================================
--- applications/editors/josm/plugins/simplifyarea/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/simplifyarea/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Initial commit"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java
===================================================================
--- applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java	(revision 27848)
+++ applications/editors/josm/plugins/simplifyarea/src/sk/zdila/josm/plugin/simplify/SimplifyAreaAction.java	(revision 27852)
@@ -47,5 +47,5 @@
     public SimplifyAreaAction() {
         super(tr("Simplify Area"), "simplify", tr("Delete unnecessary nodes from an area."),
-                Shortcut.registerShortcut("tools:simplifyArea", tr("Tool: {0}", tr("Simplify Area")), KeyEvent.VK_Y, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1), true);
+                Shortcut.registerShortcut("tools:simplifyArea", tr("Tool: {0}", tr("Simplify Area")), KeyEvent.VK_Y, Shortcut.CTRL_SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/smed/build.xml
===================================================================
--- applications/editors/josm/plugins/smed/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/smed/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="New release"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!-- should not be necessary to change the following properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
Index: applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java
===================================================================
--- applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java	(revision 27848)
+++ applications/editors/josm/plugins/smed/src/smed/tabs/SmedTabAction.java	(revision 27852)
@@ -38,5 +38,5 @@
         super( editor, "Smed",editor, 
 	    Shortcut.registerShortcut("tools:Seamaps", tr("Tool: {0}", tr("SeaMap Editor")),
-	    KeyEvent.VK_K, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1),
+	    KeyEvent.VK_K, Shortcut.SHIFT),
 	    true);  //$NON-NLS-1$ //$NON-NLS-2$
     }
Index: applications/editors/josm/plugins/surveyor/build.xml
===================================================================
--- applications/editors/josm/plugins/surveyor/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/surveyor/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java	(revision 27848)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveAction.java	(revision 27852)
@@ -38,5 +38,5 @@
         super(tr("AutoSave LiveData"), "autosave.png", tr("Save captured data to file every minute."),
         Shortcut.registerShortcut("surveyor:autosave", tr("Tool: {0}", tr("AutoSave LiveData")),
-        KeyEvent.VK_S, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
+        KeyEvent.VK_S, Shortcut.ALT_CTRL_SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java	(revision 27848)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java	(revision 27852)
@@ -46,5 +46,5 @@
         super(tr("Surveyor..."), "surveyormenu.png", tr("Open surveyor tool."),
         Shortcut.registerShortcut("surveyor:open", tr("Tool: {0}", tr("Surveyor...")),
-        KeyEvent.VK_R, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
+        KeyEvent.VK_R, Shortcut.CTRL_SHIFT), true);
         this.gpsPlugin = gpsPlugin;
     }
Index: applications/editors/josm/plugins/tageditor/build.xml
===================================================================
--- applications/editors/josm/plugins/tageditor/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/tageditor/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="tageditor" default="dist" basedir=".">
     <property name="commit.message" value="Tageditor:  help shortcut parser, rebuild"/>
-    <property name="plugin.main.version" value="4847"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java
===================================================================
--- applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 27848)
+++ applications/editors/josm/plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java	(revision 27852)
@@ -27,5 +27,5 @@
                 tr("Launches the tag editor dialog"),
                 Shortcut.registerShortcut("edit:launchtageditor", tr("Launches the tag editor dialog"),
-                        KeyEvent.VK_T,Shortcut.GROUP_EDIT)
+                        KeyEvent.VK_T,Shortcut.DIRECT)
                 , true, "tageditor/launch", true);
 
Index: applications/editors/josm/plugins/tagging-preset-tester/build.xml
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/tagging-preset-tester/build.xml	(revision 27852)
@@ -27,5 +27,5 @@
 <project name="tagging-preset-tester" default="dist" basedir=".">
     <property name="commit.message" value="fix shortcuts conflict"/>
-    <property name="plugin.main.version" value="4960"/>
+    <property name="plugin.main.version" value="4980"/>
     <property name="josm" location="../../core/dist/josm-custom.jar"/>
     <property name="plugin.dist.dir" value="../../dist"/>
Index: applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java
===================================================================
--- applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java	(revision 27848)
+++ applications/editors/josm/plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java	(revision 27852)
@@ -28,5 +28,5 @@
         Shortcut.registerShortcut("tools:taggingpresettester",
         tr("Tool: {0}", tr("Tagging Preset Tester")),
-        KeyEvent.VK_T, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT3), true);
+        KeyEvent.VK_T, Shortcut.ALT_CTRL_SHIFT), true);
         Main.main.menu.helpMenu.addSeparator();
         MainMenu.add(Main.main.menu.helpMenu, this);
Index: applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- applications/editors/josm/plugins/terracer/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/terracer/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="ant.build.javac.target" value="1.5"/>
     <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <target name="init">
         <mkdir dir="${plugin.build.dir}"/>
Index: applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java
===================================================================
--- applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java	(revision 27848)
+++ applications/editors/josm/plugins/terracer/src/terracer/ReverseTerraceAction.java	(revision 27852)
@@ -41,5 +41,5 @@
             Shortcut.registerShortcut("tools:ReverseTerrace",
                     tr("Tool: {0}", tr("Reverse a Terrace")),
-                    KeyEvent.VK_V, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1),
+                    KeyEvent.VK_V, Shortcut.ALT_CTRL_SHIFT),
                         true);
     }
Index: applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java
===================================================================
--- applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java	(revision 27848)
+++ applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java	(revision 27852)
@@ -71,5 +71,5 @@
                 Shortcut.registerShortcut("tools:Terracer", tr("Tool: {0}",
                         tr("Terrace a building")), KeyEvent.VK_T,
-                        Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
+                        Shortcut.SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/tracer/build.xml
===================================================================
--- applications/editors/josm/plugins/tracer/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/tracer/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="adapt to latest josm (getNodePairs changed)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java
===================================================================
--- applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java	(revision 27848)
+++ applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java	(revision 27852)
@@ -42,5 +42,5 @@
 
     public TracerAction(MapFrame mapFrame) {
-        super(tr("Tracer"), "tracer-sml", tr("Tracer."), Shortcut.registerShortcut("tools:tracer", tr("Tool: {0}", tr("Tracer")), KeyEvent.VK_T, Shortcut.GROUP_EDIT), mapFrame, getCursor());
+        super(tr("Tracer"), "tracer-sml", tr("Tracer."), Shortcut.registerShortcut("tools:tracer", tr("Tool: {0}", tr("Tracer")), KeyEvent.VK_T, Shortcut.DIRECT), mapFrame, getCursor());
     }
 
Index: applications/editors/josm/plugins/trustosm/build.xml
===================================================================
--- applications/editors/josm/plugins/trustosm/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/trustosm/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="New plugin for digital signing osm data"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4961"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java
===================================================================
--- applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java	(revision 27848)
+++ applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/ExportSigsAction.java	(revision 27852)
@@ -17,5 +17,5 @@
 	public ExportSigsAction() {
 		super(tr("Export sigs..."), "exportsigs", tr("Export all signatures to XML file."),
-				Shortcut.registerShortcut("file:exportsigs", tr("Export sigs to XML..."), KeyEvent.VK_X, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU));
+				Shortcut.registerShortcut("file:exportsigs", tr("Export sigs to XML..."), KeyEvent.VK_X, Shortcut.ALT_CTRL));
 	}
 
Index: applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java
===================================================================
--- applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java	(revision 27848)
+++ applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/actions/GetMissingDataAction.java	(revision 27852)
@@ -23,5 +23,5 @@
 	public GetMissingDataAction() {
 		super(tr("Download OSM"),"getmissing",tr("Get all referenced but not actually present OSM objects from OSM server."),
-				Shortcut.registerShortcut("gpg:download", tr("Download referenced osm objects..."), KeyEvent.VK_T, Shortcut.GROUP_MENU),true);
+				Shortcut.registerShortcut("gpg:download", tr("Download referenced osm objects..."), KeyEvent.VK_T, Shortcut.CTRL),true);
 	}
 
Index: applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java
===================================================================
--- applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java	(revision 27848)
+++ applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/gui/dialogs/TrustDialog.java	(revision 27852)
@@ -187,5 +187,5 @@
 		super(tr("Object signatures"), "trustosm", tr("Open object signing window."),
 				Shortcut.registerShortcut("subwindow:trustosm", tr("Toggle: {0}", tr("Object signatures")),
-						KeyEvent.VK_T, Shortcut.GROUPS_ALT2+Shortcut.GROUP_DIRECT2), 150);
+						KeyEvent.VK_T, Shortcut.ALT_CTRL), 150);
 
 		Main.map.mapView.addTemporaryLayer(this);
Index: applications/editors/josm/plugins/undelete/build.xml
===================================================================
--- applications/editors/josm/plugins/undelete/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/undelete/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="adapt to core changes (backwards compatible)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java
===================================================================
--- applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java	(revision 27848)
+++ applications/editors/josm/plugins/undelete/src/org/openstreetmap/josm/plugins/undelete/Undelete.java	(revision 27852)
@@ -68,5 +68,5 @@
         public UndeleteAction() {
         super(tr("Undelete object..."), "undelete", tr("Undelete object by id"), Shortcut.registerShortcut("tools:undelete", tr("File: {0}", tr("Undelete object...")),
-        KeyEvent.VK_U, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT2), true);
+        KeyEvent.VK_U, Shortcut.ALT_SHIFT), true);
       }
 
Index: applications/editors/josm/plugins/utilsplugin2/build.xml
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="Utilsplugin2: fixing shortcut deprecation"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4937"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java	(revision 27852)
@@ -29,5 +29,5 @@
     public AddIntersectionsAction() {
         super(tr("Add nodes at intersections"), "addintersect", tr("Add missing nodes at intersections of selected ways."),
-                Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_N, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT3), true);
+                Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_N, Shortcut.ALT_CTRL_SHIFT), true);
         putValue("help", ht("/Action/AddIntersections"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java	(revision 27852)
@@ -34,5 +34,5 @@
                 tr("Extracts node from a way"),
                 Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}","Extract node"),
-                KeyEvent.VK_J, Shortcut.GROUP_DIRECT2  ), true);
+                KeyEvent.VK_J, Shortcut.ALT), true);
         putValue("help", ht("/Action/ExtractNode"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/LatLonAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/LatLonAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/LatLonAction.java	(revision 27852)
@@ -31,5 +31,5 @@
     public LatLonAction() {
         super(tr("Lat Lon tool"), "latlon", tr("Create geometry by entering lat lon coordinates for it."),
-                Shortcut.registerShortcut("latlon", tr("Edit: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut.GROUP_DIRECT3), true);
+                Shortcut.registerShortcut("latlon", tr("Edit: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/AddNode"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SplitObjectAction.java	(revision 27852)
@@ -43,5 +43,5 @@
         super(tr("Split Object"), "splitobject", tr("Split an object at the selected nodes."),
                 Shortcut.registerShortcut("tools:splitobject", tr("Tool: {0}", tr("Split Object")),
-                KeyEvent.VK_P,  Shortcut.GROUP_MENU)
+                KeyEvent.VK_P,  Shortcut.CTRL)
                 , true);
         putValue("help", ht("/Action/SplitObject"));
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java	(revision 27852)
@@ -36,5 +36,5 @@
         super(tr("Symmetry"), "symmetry", tr("Mirror selected nodes and ways."),
                 Shortcut.registerShortcut("tools:symmetry", tr("Tool: {0}", tr("Symmetry")),
-                        KeyEvent.VK_S, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);
+                        KeyEvent.VK_S, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/Symmetry"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java	(revision 27852)
@@ -43,5 +43,5 @@
     public UnGlueRelationAction() {
         super(tr("UnGlue Relation"), "ungluerelations", tr("Duplicate nodes, ways and relations that are used by multiple relations."),
-              Shortcut.registerShortcut("tools:ungluerelation", tr("Tool: {0}", tr("UnGlue Relations")), KeyEvent.VK_G, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2 ), true);
+              Shortcut.registerShortcut("tools:ungluerelation", tr("Tool: {0}", tr("UnGlue Relations")), KeyEvent.VK_G, Shortcut.ALT_SHIFT ), true);
         putValue("help", ht("/Action/UnGlueRelation"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/curves/CurveAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/curves/CurveAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/curves/CurveAction.java	(revision 27852)
@@ -31,5 +31,5 @@
         super(tr("Circle arc"), "circlearc", tr("Create a circle arc"),
                 Shortcut.registerShortcut("tools:createcurve", tr("Tool: {0}", tr("Create a circle arc")), KeyEvent.VK_C,
-                        Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                        Shortcut.SHIFT), true);
         putValue("help", ht("/Action/CreateCircleArc"));
         updatePreferences();
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/OpenPageAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/OpenPageAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/OpenPageAction.java	(revision 27852)
@@ -36,5 +36,5 @@
                 tr("Opens specified URL browser"),
                 Shortcut.registerShortcut("tools:openurl", tr("Tool: {0}", tr("Open custom URL")),
-                KeyEvent.VK_H, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_H, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/OpenPage"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java	(revision 27852)
@@ -23,5 +23,5 @@
     public AlignWayNodesAction() {
         super(TITLE, "dumbutils/alignwaynodes", tr("Align nodes in a way"),
-                Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT)
+                Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut.SHIFT)
                 , true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java	(revision 27852)
@@ -21,5 +21,5 @@
     public PasteRelationsAction() {
         super(TITLE, "dumbutils/pasterelations", tr("Paste relation membership from objects in the buffer onto selected object(s)"),
-                Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}",  tr("Paste Relations")), KeyEvent.VK_V, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU), true);
+                Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}",  tr("Paste Relations")), KeyEvent.VK_V, Shortcut.ALT_CTRL), true);
     }
 
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java	(revision 27852)
@@ -33,5 +33,5 @@
     public ReplaceGeometryAction() {
         super(TITLE, "dumbutils/replacegeometry", tr("Replace geometry of selected object with a new one"),
-                Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU)
+                Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut.CTRL_SHIFT)
                 , true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/SplitOnIntersectionsAction.java	(revision 27852)
@@ -27,5 +27,5 @@
         super(TITLE, "dumbutils/splitonintersections", tr("Split adjacent ways on T-intersections"),
                 Shortcut.registerShortcut("tools:splitonintersections", tr("Tool: {0}", tr("Split adjacent ways")),
-                KeyEvent.VK_P, Shortcut.GROUP_DIRECT3+Shortcut.GROUPS_ALT1), true);
+                KeyEvent.VK_P, Shortcut.ALT_CTRL_SHIFT), true);
     }
 
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java	(revision 27852)
@@ -24,5 +24,5 @@
     public TagBufferAction() {
         super(TITLE, "dumbutils/tagbuffer", tr("Pastes tags of previously selected object(s)"),
-                Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr("Copy tags from previous selection")), KeyEvent.VK_R, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT)
+                Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr("Copy tags from previous selection")), KeyEvent.VK_R, Shortcut.SHIFT)
 		, true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java	(revision 27852)
@@ -24,5 +24,5 @@
     public TagSourceAction() {
         super(TITLE, "dumbutils/sourcetag", tr("Add remembered source tag"),
-                Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU)
+                Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.ALT_CTRL)
                 , true);
         source = Main.pref.get("sourcetag.value");
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentNodesAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentNodesAction.java	(revision 27852)
@@ -25,5 +25,5 @@
         super(tr("Adjacent nodes"), "adjnodes", tr("Select adjacent nodes"),
                 Shortcut.registerShortcut("tools:adjnodes", tr("Tool: {0}","Adjacent nodes"),
-                KeyEvent.VK_E, Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_E, Shortcut.DIRECT), true);
         putValue("help", ht("/Action/AdjacentNodes"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java	(revision 27852)
@@ -26,5 +26,5 @@
                 tr("Adjacent ways will be selected. Nodes will be deselected."),
                 Shortcut.registerShortcut("tools:adjways", tr("Tool: {0}","Adjacent ways"),
-                KeyEvent.VK_E, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_E, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/AdjacentWays"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java	(revision 27852)
@@ -23,5 +23,5 @@
         super(tr("All connected ways"), "adjwaysall", tr("Select all connected ways"),
                 Shortcut.registerShortcut("tools:adjwaysall", tr("Tool: {0}","All connected ways"),
-                KeyEvent.VK_E, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), true);
+                KeyEvent.VK_E, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/SelectConnectedWays"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysAction.java	(revision 27852)
@@ -25,5 +25,5 @@
         super(tr("Intersecting ways"), "intway", tr("Select intersecting ways"),
                 Shortcut.registerShortcut("tools:intway", tr("Tool: {0}","Intersecting ways"),
-                KeyEvent.VK_I, Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_I, Shortcut.DIRECT), true);
         putValue("help", ht("/Action/SelectIntersectingWays"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java	(revision 27852)
@@ -25,5 +25,5 @@
         super(tr("All intersecting ways"), "intwayall", tr("Select all intersecting ways"),
                 Shortcut.registerShortcut("tools:intwayall", tr("Tool: {0}","All intersecting ways"),
-                KeyEvent.VK_MULTIPLY, Shortcut.GROUP_MENU), true);
+                KeyEvent.VK_MULTIPLY, Shortcut.CTRL), true);
         putValue("help", ht("/Action/SelectAllIntersectingWays"));
 
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java	(revision 27852)
@@ -27,5 +27,5 @@
         super(tr("Middle nodes"), "midnodes", tr("Select middle nodes"),
                 Shortcut.registerShortcut("tools:midnodes", tr("Tool: {0}","Middle nodes"),
-                KeyEvent.VK_E,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);
+                KeyEvent.VK_E,  Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/MiddleNodes"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java	(revision 27852)
@@ -29,5 +29,5 @@
         super(tr("All inside [testing]"), "selinside", tr("Select all inside selected polygons"),
                 Shortcut.registerShortcut("tools:selinside", tr("Tool: {0}","All inside"),
-                KeyEvent.VK_I, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), true);
+                KeyEvent.VK_I, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/SelectAllInside"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectBoundaryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectBoundaryAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectBoundaryAction.java	(revision 27852)
@@ -36,5 +36,5 @@
         super(tr("Area boundary [testing]"), "selboundary", tr("Select relation or all ways that forms area boundary"),
                 Shortcut.registerShortcut("tools:selboundary", tr("Tool: {0}","Area boundary [testing]"),
-                KeyEvent.VK_SLASH, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_SLASH, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/SelectAreaBoundary"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java	(revision 27852)
@@ -24,5 +24,5 @@
         super(tr("Select Highway"), "selecthighway", tr("Select highway for the name/ref given"),
                 Shortcut.registerShortcut("tools:selecthighway", tr("Tool: {0}","Select Highway"),
-                KeyEvent.VK_W, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU), true);
+                KeyEvent.VK_W, Shortcut.ALT_CTRL), true);
     }
 
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java	(revision 27852)
@@ -28,5 +28,5 @@
                 tr("Select last modified nodes"),
                 Shortcut.registerShortcut("tools:selmodnodes", tr("Tool: {0}","Select last modified nodes"),
-                KeyEvent.VK_Z, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_Z, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/SelectLastModifiedNodes"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java	(revision 27852)
@@ -28,5 +28,5 @@
                 tr("Select last modified ways"),
                 Shortcut.registerShortcut("tools:selmodways", tr("Tool: {0}","Select last modified ways"),
-                KeyEvent.VK_Z,  Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT1), true);
+                KeyEvent.VK_Z,  Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/SelectLastModifiedWays"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java	(revision 27852)
@@ -31,5 +31,5 @@
     public SelectWayNodesAction() {
         super(tr("Select Way Nodes"),"selectwaynodes" , tr("Select all nodes of a selected way."),
-                Shortcut.registerShortcut("tools:selectwaynodes", tr("Tool: {0}", tr("Select Way Nodes")), KeyEvent.VK_N, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), true);
+                Shortcut.registerShortcut("tools:selectwaynodes", tr("Tool: {0}", tr("Select Way Nodes")), KeyEvent.VK_N, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/SelectWayNodes"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java	(revision 27852)
@@ -27,5 +27,5 @@
                 tr("Reselect last added object or selection form history"),
                 Shortcut.registerShortcut("tools:undoselection", tr("Tool: {0}","Undo selection"),
-                KeyEvent.VK_Z, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), true);
+                KeyEvent.VK_Z, Shortcut.CTRL_SHIFT), true);
         putValue("help", ht("/Action/UndoSelection"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java	(revision 27848)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java	(revision 27852)
@@ -24,5 +24,5 @@
                 tr("Removes all nodes from selection"),
                 Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}","Unselect nodes"),
-                KeyEvent.VK_U, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
+                KeyEvent.VK_U, Shortcut.SHIFT), true);
         putValue("help", ht("/Action/UnselectNodes"));
     }
Index: applications/editors/josm/plugins/videomapping/build.xml
===================================================================
--- applications/editors/josm/plugins/videomapping/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/videomapping/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="videomapping"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java
===================================================================
--- applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java	(revision 27852)
@@ -100,5 +100,5 @@
         };       
         VStart = new JosmAction(tr("Play/Pause"), "audio-playpause", tr("starts/pauses video playback"),
-                Shortcut.registerShortcut("videomapping:startstop",tr("Video: {0}", tr("Play/Pause")),KeyEvent.VK_NUMPAD5, Shortcut.GROUP_DIRECT), false) {            
+                Shortcut.registerShortcut("videomapping:startstop",tr("Video: {0}", tr("Play/Pause")),KeyEvent.VK_NUMPAD5, Shortcut.DIRECT), false) {            
             public void actionPerformed(ActionEvent e) {
             	gpsVideoPlayer.pause();                
@@ -106,5 +106,5 @@
         };
         Vbackward = new JosmAction(tr("Backward"), "audio-prev", tr("jumps n sec back"),
-                Shortcut.registerShortcut("videomapping:backward",tr("Video: {0}", tr("Backward")),KeyEvent.VK_NUMPAD4, Shortcut.GROUP_DIRECT), false) {
+                Shortcut.registerShortcut("videomapping:backward",tr("Video: {0}", tr("Backward")),KeyEvent.VK_NUMPAD4, Shortcut.DIRECT), false) {
             public void actionPerformed(ActionEvent e) {
             	gpsVideoPlayer.backward();
@@ -112,5 +112,5 @@
         };
         Vforward= new JosmAction(tr("Forward"), "audio-next", tr("jumps n sec forward"),
-                Shortcut.registerShortcut("videomapping:forward",tr("Video: {0}", tr("Forward")),KeyEvent.VK_NUMPAD6, Shortcut.GROUP_DIRECT), false) {            
+                Shortcut.registerShortcut("videomapping:forward",tr("Video: {0}", tr("Forward")),KeyEvent.VK_NUMPAD6, Shortcut.DIRECT), false) {            
             public void actionPerformed(ActionEvent e) {
             	gpsVideoPlayer.forward();
@@ -119,5 +119,5 @@
         };
         Vfaster= new JosmAction(tr("Faster"), "audio-faster", tr("faster playback"),
-                Shortcut.registerShortcut("videomapping:faster",tr("Video: {0}", tr("Faster")),KeyEvent.VK_NUMPAD8, Shortcut.GROUP_DIRECT), false) {
+                Shortcut.registerShortcut("videomapping:faster",tr("Video: {0}", tr("Faster")),KeyEvent.VK_NUMPAD8, Shortcut.DIRECT), false) {
             
             public void actionPerformed(ActionEvent e) {
@@ -127,5 +127,5 @@
         };
         Vslower= new JosmAction(tr("Slower"), "audio-slower", tr("slower playback"),
-                Shortcut.registerShortcut("videomapping:slower",tr("Video: {0}", tr("Slower")),KeyEvent.VK_NUMPAD2, Shortcut.GROUP_DIRECT), false) {
+                Shortcut.registerShortcut("videomapping:slower",tr("Video: {0}", tr("Slower")),KeyEvent.VK_NUMPAD2, Shortcut.DIRECT), false) {
             
             public void actionPerformed(ActionEvent e) {
@@ -142,5 +142,5 @@
         };
         Vloop= new JosmAction(tr("Loop"), "loop", tr("loops n sec around current position"),
-                Shortcut.registerShortcut("videomapping:loop",tr("Video: {0}", tr("Loop")),KeyEvent.VK_NUMPAD7, Shortcut.GROUP_DIRECT), false) {            
+                Shortcut.registerShortcut("videomapping:loop",tr("Video: {0}", tr("Loop")),KeyEvent.VK_NUMPAD7, Shortcut.DIRECT), false) {            
             public void actionPerformed(ActionEvent e) {
             	gpsVideoPlayer.toggleLooping();
Index: applications/editors/josm/plugins/waydownloader/build.xml
===================================================================
--- applications/editors/josm/plugins/waydownloader/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/waydownloader/build.xml	(revision 27852)
@@ -26,5 +26,5 @@
     -->
     <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java
===================================================================
--- applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java	(revision 27852)
@@ -57,5 +57,5 @@
                     "way-download",
                     tr("Download map data on the end of selected way"),
-                    Shortcut.registerShortcut("waydownloader:waydownload", tr("Way Download"), KeyEvent.VK_W, Shortcut.GROUP_MENU+Shortcut.GROUPS_ALT1),
+                    Shortcut.registerShortcut("waydownloader:waydownload", tr("Way Download"), KeyEvent.VK_W, Shortcut.CTRL_SHIFT),
                     true);
         }
Index: applications/editors/josm/plugins/wayselector/build.xml
===================================================================
--- applications/editors/josm/plugins/wayselector/build.xml	(revision 27848)
+++ applications/editors/josm/plugins/wayselector/build.xml	(revision 27852)
@@ -32,5 +32,5 @@
     <property name="commit.message" value="recompile due to core change"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4928"/>
+    <property name="plugin.main.version" value="4980"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java
===================================================================
--- applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java	(revision 27848)
+++ applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java	(revision 27852)
@@ -45,5 +45,5 @@
                   "way-select",
                   tr("Select non-branching sequences of ways"),
-                  Shortcut.registerShortcut("wayselector:wayselect", tr("Way Select"), KeyEvent.VK_W, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1),
+                  Shortcut.registerShortcut("wayselector:wayselect", tr("Way Select"), KeyEvent.VK_W, Shortcut.SHIFT),
                   true);
         }