Index: /applications/editors/josm/plugins/ext_tools/build.xml
===================================================================
--- /applications/editors/josm/plugins/ext_tools/build.xml	(revision 34508)
+++ /applications/editors/josm/plugins/ext_tools/build.xml	(revision 34509)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="ExtTools: help shortcut paser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13007"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/DataSetToCmd.java
===================================================================
--- /applications/editors/josm/plugins/ext_tools/src/ext_tools/DataSetToCmd.java	(revision 34508)
+++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/DataSetToCmd.java	(revision 34509)
@@ -13,5 +13,11 @@
 import org.openstreetmap.josm.command.ChangeNodesCommand;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.osm.*;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.PrimitiveId;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MainApplication;
 
Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java
===================================================================
--- /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java	(revision 34508)
+++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/ExtTool.java	(revision 34509)
@@ -21,5 +21,4 @@
 import javax.swing.SwingUtilities;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
@@ -38,4 +37,6 @@
 import org.openstreetmap.josm.tools.Logging;
 
+import org.openstreetmap.josm.data.UndoRedoHandler;
+
 public class ExtTool {
 
@@ -156,5 +157,5 @@
                 p.add(new JScrollPane(info), GBC.eop());
             }
-            JOptionPane.showMessageDialog(Main.parent, p, tr("External tool error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), p, tr("External tool error"), JOptionPane.ERROR_MESSAGE);
         });
     }
@@ -236,5 +237,5 @@
                 final List<Command> cmdlist = new DataSetToCmd(ds).getCommandList();
                 if (!cmdlist.isEmpty()) {
-                    Main.main.undoRedo.add(new SequenceCommand(getName(), cmdlist));
+                    UndoRedoHandler.getInstance().add(new SequenceCommand(getName(), cmdlist));
                 }
             } catch (IllegalDataException e) {
Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java
===================================================================
--- /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java	(revision 34508)
+++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/EditToolDialog.java	(revision 34509)
@@ -13,9 +13,9 @@
 import javax.swing.JTextField;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.tools.GBC;
 
 import ext_tools.ExtTool;
+import org.openstreetmap.josm.gui.MainApplication;
 
 public class EditToolDialog extends ExtendedDialog {
@@ -44,5 +44,5 @@
 
     public EditToolDialog(ExtTool tool) {
-        super(Main.parent, tr("Edit tool"),
+        super(MainApplication.getMainFrame(), tr("Edit tool"),
                 new String[] { tr("OK"), tr("Cancel") },
                 true);
Index: /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java
===================================================================
--- /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java	(revision 34508)
+++ /applications/editors/josm/plugins/ext_tools/src/ext_tools/preferences/MyToolsPanel.java	(revision 34509)
@@ -15,8 +15,7 @@
 import javax.swing.JPanel;
 
-import org.openstreetmap.josm.Main;
-
 import ext_tools.ExtTool;
 import ext_tools.ToolsInformation;
+import org.openstreetmap.josm.gui.MainApplication;
 
 public class MyToolsPanel extends JPanel {
@@ -66,5 +65,5 @@
                 @Override
                 public void actionPerformed(ActionEvent arg0) {
-                    if (JOptionPane.showConfirmDialog(Main.parent,
+                    if (JOptionPane.showConfirmDialog(MainApplication.getMainFrame(),
                             tr("Delete tool \"{0}\"?", tool.name),
                             tr("Are you sure?"),