Index: applications/editors/josm/plugins/utilsplugin2/build.xml
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/build.xml	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/build.xml	(revision 27761)
@@ -30,7 +30,7 @@
 <project name="utilsplugin2" default="dist" basedir=".">
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="Utilsplugin2: moved SplitObject to ctrl-P"/>
+    <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="4847"/>
+    <property name="plugin.main.version" value="4937"/>
     <!--
       ************************************************
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/AddIntersectionsAction.java	(revision 27761)
@@ -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_I, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                Shortcut.registerShortcut("tools:addintersect", tr("Tool: {0}", tr("Add nodes at intersections")), KeyEvent.VK_I,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/ExtractPointAction.java	(revision 27761)
@@ -34,5 +34,5 @@
                 tr("Extracts node from a way"),
                 Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}","Extract node"),
-                KeyEvent.VK_J, Shortcut.GROUP_EDIT, KeyEvent.ALT_DOWN_MASK  ), true);
+                KeyEvent.VK_J, Shortcut.GROUP_DIRECT2  ), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/LatLonAction.java	(revision 27761)
@@ -31,6 +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_HOTKEY,
-                        Shortcut.SHIFT_DEFAULT), true);
+                Shortcut.registerShortcut("latlon", tr("Edit: {0}", tr("Lat Lon tool")), KeyEvent.VK_L, Shortcut.GROUP_DIRECT3), true);
         putValue("help", ht("/Action/AddNode"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/SymmetryAction.java	(revision 27761)
@@ -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.GROUP_EDIT,  KeyEvent.SHIFT_DOWN_MASK|KeyEvent.ALT_DOWN_MASK ), true);
+                        KeyEvent.VK_S, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/UnGlueRelationAction.java	(revision 27761)
@@ -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.GROUP_EDIT, Shortcut.SHIFT_DEFAULT ), true);
+              Shortcut.registerShortcut("tools:ungluerelation", tr("Tool: {0}", tr("UnGlue Relations")), KeyEvent.VK_G, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2 ), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/curves/CurveAction.java	(revision 27761)
@@ -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.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                        Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
         putValue("help", ht("/Action/CreateCircleArc"));
         updatePreferences();
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/ChooseURLAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/ChooseURLAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/ChooseURLAction.java	(revision 27761)
@@ -29,5 +29,4 @@
     public ChooseURLAction() {
          super(tr("Select custom URL"), "selecturl", tr("Select custom URL"),null,true,true);
-         putValue("toolbar", "action/selectURL");
     }
 
@@ -62,5 +61,5 @@
         }
         final JLabel label1=new JLabel(tr("Please select one of custom URLs (configured in Preferences)"));
-        final JList list1=new JList(names);
+        final JList<String> list1=new JList<String>(names);
         final JTextField editField=new JTextField();
         final JCheckBox check1=new JCheckBox(tr("Ask every time"));
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/OpenPageAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/OpenPageAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/customurl/OpenPageAction.java	(revision 27761)
@@ -36,5 +36,5 @@
                 tr("Opens specified URL browser"),
                 Shortcut.registerShortcut("tools:openurl", tr("Tool: {0}", tr("Open custom URL")),
-                KeyEvent.VK_H, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                KeyEvent.VK_H, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/AlignWayNodesAction.java	(revision 27761)
@@ -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.GROUP_EDIT, Shortcut.SHIFT_DEFAULT)
+                Shortcut.registerShortcut("tools:alignwaynodes", tr("Tool: {0}", tr("Align Way Nodes")), KeyEvent.VK_L, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT)
                 , true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/PasteRelationsAction.java	(revision 27761)
@@ -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.GROUP_MENU, KeyEvent.ALT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK), true);
+                Shortcut.registerShortcut("tools:pasterelations", tr("Tool: {0}",  tr("Paste Relations")), KeyEvent.VK_V, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU), true);
     }
 
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/ReplaceGeometryAction.java	(revision 27761)
@@ -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.GROUP_HOTKEY, Shortcut.SHIFT_DEFAULT)
+                Shortcut.registerShortcut("tools:replacegeometry", tr("Tool: {0}", tr("Replace Geometry")), KeyEvent.VK_G, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU)
                 , true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagBufferAction.java	(revision 27761)
@@ -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.GROUP_EDIT, Shortcut.SHIFT_DEFAULT)
+                Shortcut.registerShortcut("tools:tagbuffer", tr("Tool: {0}", tr("Copy tags from previous selection")), KeyEvent.VK_R, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT)
 		, true);
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/dumbutils/TagSourceAction.java	(revision 27761)
@@ -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.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK | KeyEvent.ALT_DOWN_MASK)
+                Shortcut.registerShortcut("tools:sourcetag", tr("Tool: {0}", tr("Add Source Tag")), KeyEvent.VK_S, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU)
                 , true);
         source = Main.pref.get("sourcetag.value");
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/AdjacentWaysAction.java	(revision 27761)
@@ -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.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                KeyEvent.VK_E, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/ConnectedWaysAction.java	(revision 27761)
@@ -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.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
+                KeyEvent.VK_E, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), true);
         putValue("help", ht("/Action/SelectConnectedWays"));
     }
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/IntersectedWaysRecursiveAction.java	(revision 27761)
@@ -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_I, Shortcut.GROUP_MENU, KeyEvent.CTRL_DOWN_MASK|KeyEvent.ALT_DOWN_MASK), true);
+                KeyEvent.VK_I, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/MiddleNodesAction.java	(revision 27761)
@@ -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.GROUP_EDIT, KeyEvent.SHIFT_DOWN_MASK|KeyEvent.ALT_DOWN_MASK ), true);
+                KeyEvent.VK_E,  Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectAllInsideAction.java	(revision 27761)
@@ -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.GROUP_EDIT ,KeyEvent.ALT_DOWN_MASK|KeyEvent.SHIFT_DOWN_MASK), true);
+                KeyEvent.VK_I, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT2), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectBoundaryAction.java	(revision 27761)
@@ -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.GROUP_EDIT ,Shortcut.SHIFT_DEFAULT), true);
+                KeyEvent.VK_SLASH, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
         putValue("help", ht("/Action/SelectAreaBoundary"));
     }
@@ -91,5 +91,4 @@
         if (selectedRelation!=null) {
             int idx = rels.indexOf(selectedRelation); 
-            System.out.println("idx="+idx);
             // selectedRelation has number idx in active relation list
             if (idx>=0) {
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectHighwayAction.java	(revision 27761)
@@ -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.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
+                KeyEvent.VK_W, Shortcut.GROUPS_ALT2+Shortcut.GROUP_MENU), true);
     }
 
Index: applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java	(revision 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModNodesAction.java	(revision 27761)
@@ -28,5 +28,5 @@
                 tr("Select last modified nodes"),
                 Shortcut.registerShortcut("tools:selmodnodes", tr("Tool: {0}","Select last modified nodes"),
-                KeyEvent.VK_Z,  Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT ), true);
+                KeyEvent.VK_Z, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectModWaysAction.java	(revision 27761)
@@ -1,8 +1,4 @@
 // License: GPL. Copyright 2011 by Alexei Kasatkin and Martin Ždila
 package utilsplugin2.selection;
-
-import org.openstreetmap.josm.command.Command;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
@@ -13,6 +9,10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.osm.*;
-
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Way;
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
+import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -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_EDIT, KeyEvent.ALT_MASK ), true);
+                KeyEvent.VK_Z,  Shortcut.GROUP_DIRECT2), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/SelectWayNodesAction.java	(revision 27761)
@@ -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.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
+                Shortcut.registerShortcut("tools:selectwaynodes", tr("Tool: {0}", tr("Select Way Nodes")), KeyEvent.VK_N, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UndoSelectionAction.java	(revision 27761)
@@ -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.GROUP_MENU,Shortcut.SHIFT_DEFAULT ), true);
+                KeyEvent.VK_Z, Shortcut.GROUPS_ALT1+Shortcut.GROUP_MENU), 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 27751)
+++ applications/editors/josm/plugins/utilsplugin2/src/utilsplugin2/selection/UnselectNodesAction.java	(revision 27761)
@@ -24,5 +24,5 @@
                 tr("Removes all nodes from selection"),
                 Shortcut.registerShortcut("tools:unsnodes", tr("Tool: {0}","Unselect nodes"),
-                KeyEvent.VK_U, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                KeyEvent.VK_U, Shortcut.GROUPS_ALT1+Shortcut.GROUP_EDIT), true);
         putValue("help", ht("/Action/UnselectNodes"));
     }