Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/Address.java	(revision 27827)
+++ 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 27827)
+++ 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 27827)
+++ 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);
     }