Index: trunk/src/org/openstreetmap/josm/actions/AboutAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 4942)
@@ -37,5 +37,7 @@
 
     public AboutAction() {
-        super(tr("About"), "about", tr("Display the about screen."), Shortcut.registerShortcut("system:about", tr("About"), KeyEvent.VK_F1, Shortcut.GROUP_DIRECT, Shortcut.SHIFT_DEFAULT), true);
+        super(tr("About"), "about", tr("Display the about screen."),
+            Shortcut.registerShortcut("system:about", tr("About"),
+            KeyEvent.VK_F1, Shortcut.GROUP_DIRECT+Shortcut.GROUPS_ALT1), true);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java	(revision 4942)
@@ -28,6 +28,6 @@
     }
 
-    public AbstractInfoAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
-        super(name, iconName, tooltip, shortcut, register);
+    public AbstractInfoAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register, String toolbarId, boolean installAdapters) {
+        super(name, iconName, tooltip, shortcut, register, toolbarId, installAdapters);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java	(revision 4942)
@@ -26,6 +26,6 @@
     public AddNodeAction() {
         super(tr("Add Node..."), "addnode", tr("Add a node by entering latitude / longitude or easting / northing."),
-                Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")), KeyEvent.VK_D, Shortcut.GROUP_EDIT,
-                        Shortcut.SHIFT_DEFAULT), true);
+                Shortcut.registerShortcut("addnode", tr("Edit: {0}", tr("Add Node...")),
+                        KeyEvent.VK_D, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
         putValue("help", ht("/Action/AddNode"));
     }
Index: trunk/src/org/openstreetmap/josm/actions/DistributeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/DistributeAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/DistributeAction.java	(revision 4942)
@@ -30,5 +30,6 @@
     public DistributeAction() {
         super(tr("Distribute Nodes"), "distribute", tr("Distribute the selected nodes to equal distances along a line."),
-                Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B,
+                Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
         putValue("help", ht("/Action/DistributeNodes"));
     }
Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoWebAction.java	(revision 4942)
@@ -18,8 +18,7 @@
                 tr("Display history information about OSM ways, nodes, or relations in web browser."),
                 Shortcut.registerShortcut("core:historyinfoweb",
-                        tr("History (web)"), KeyEvent.VK_H, Shortcut.GROUP_HOTKEY, Shortcut.SHIFT_DEFAULT), false);
+                        tr("History (web)"), KeyEvent.VK_H, Shortcut.GROUP_DIRECT3),
+                true, "action/historyinfoweb", true);
         putValue("help", ht("/Action/ObjectHistoryWeb"));
-        putValue("toolbar", "action/historyinfoweb");
-        Main.toolbar.register(this);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/InfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/InfoAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/InfoAction.java	(revision 4942)
@@ -19,10 +19,9 @@
     public InfoAction() {
         super(tr("Advanced info"), "about",
-                tr("Display advanced object information about OSM nodes, ways, or relations."),
-                Shortcut.registerShortcut("core:info",
-                tr("Advanced info"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY), false);
+            tr("Display advanced object information about OSM nodes, ways, or relations."),
+            Shortcut.registerShortcut("core:info",
+                tr("Advanced info"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY),
+            true, "action/info", true);
         putValue("help", ht("/Action/InfoAboutElements"));
-        putValue("toolbar", "action/info");
-        Main.toolbar.register(this);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/InfoWebAction.java	(revision 4942)
@@ -18,8 +18,7 @@
                 tr("Display object information about OSM nodes, ways, or relations in web browser."),
                 Shortcut.registerShortcut("core:infoweb",
-                        tr("Advanced info (web)"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY, Shortcut.SHIFT_DEFAULT), false);
+                        tr("Advanced info (web)"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY+Shortcut.GROUPS_ALT1),
+                true, "action/infoweb", true);
         putValue("help", ht("/Action/InfoAboutElementsWeb"));
-        putValue("toolbar", "action/infoweb");
-        Main.toolbar.register(this);
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/MirrorAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MirrorAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/MirrorAction.java	(revision 4942)
@@ -34,5 +34,5 @@
         super(tr("Mirror"), "mirror", tr("Mirror selected nodes and ways."),
                 Shortcut.registerShortcut("tools:mirror", tr("Tool: {0}", tr("Mirror")),
-                        KeyEvent.VK_M, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                        KeyEvent.VK_M, Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1), true);
         putValue("help", ht("/Action/Mirror"));
     }
Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java	(revision 4942)
@@ -79,12 +79,10 @@
     public static class Undo extends JosmAction {
         public Undo() {
-            super(tr("Orthogonalize Shape / Undo"),
-                    "ortho",
+            super(tr("Orthogonalize Shape / Undo"), "ortho",
                     tr("Undo orthogonalization for certain nodes"),
                     Shortcut.registerShortcut("tools:orthogonalizeUndo", tr("Tool: {0}", tr("Orthogonalize Shape / Undo")),
                             KeyEvent.VK_Q,
-                            Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), false);
-            putValue("toolbar", "action/orthogonalize/undo");
-            Main.toolbar.register(this);
+                            Shortcut.GROUP_EDIT+Shortcut.GROUPS_ALT1),
+                    true, "action/orthogonalize/undo", true);
         }
         public void actionPerformed(ActionEvent e) {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 4942)
@@ -162,5 +162,6 @@
     protected LayerListDialog(MapFrame mapFrame) {
         super(tr("Layers"), "layerlist", tr("Open a list of all loaded layers."),
-                Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L, Shortcut.GROUP_LAYER), 100, true);
+                Shortcut.registerShortcut("subwindow:layers", tr("Toggle: {0}", tr("Layers")), KeyEvent.VK_L,
+                Shortcut.GROUPS_ALT1+Shortcut.GROUP_LAYER), 100, true);
 
         // create the models
Index: trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/gui/layer/JumpToMarkerActions.java	(revision 4942)
@@ -34,6 +34,6 @@
 
         public JumpToNextMarker(JumpToMarkerLayer layer) {
-            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
-            KeyEvent.VK_J, Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK).getKeyStroke());
+            Shortcut.registerShortcut("core_multikey:nextMarker", tr("Multikey: {0}", tr("Next marker")),
+                KeyEvent.VK_J, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2).setAccelerator(this);
             putValue(SHORT_DESCRIPTION, tr("Jump to next marker"));
             putValue(NAME, tr("Jump to next marker"));
@@ -61,5 +61,4 @@
             }
         }
-
 
         private void execute(Layer l) {
@@ -91,6 +90,6 @@
             this.layer = (Layer)layer;
 
-            putValue(ACCELERATOR_KEY, Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}",
-            tr("Previos marker")), KeyEvent.VK_P, Shortcut.GROUP_DIRECT, KeyEvent.ALT_DOWN_MASK|KeyEvent.CTRL_DOWN_MASK).getKeyStroke());
+            Shortcut.registerShortcut("core_multikey:previousMarker", tr("Multikey: {0}", tr("Previos marker")),
+                KeyEvent.VK_P, Shortcut.GROUP_DIRECT2+Shortcut.GROUPS_ALT2).setAccelerator(this);
             putValue(SHORT_DESCRIPTION, tr("Jump to previous marker"));
             putValue(NAME, tr("Jump to previous marker"));
@@ -134,7 +133,4 @@
                 return null;
         }
-
     }
-
-
 }
Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java	(revision 4938)
+++ trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java	(revision 4942)
@@ -281,5 +281,5 @@
 
     /**
-     * Find the size of the screen the for given coordinates. Use first screen,
+     * Find the size of the screen for given coordinates. Use first screen,
      * when no coordinates are stored or null is passed.
      *