diff --git a/features/org.jkiss.dbeaver.ui.feature/feature.xml b/features/org.jkiss.dbeaver.ui.feature/feature.xml
index e96d4e680f52bfdd5c0ecdd70783b1d41ce64483..bfa76e67d8dc44363decd3c15abd69e2c2c51364 100644
--- a/features/org.jkiss.dbeaver.ui.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.ui.feature/feature.xml
@@ -27,8 +27,8 @@
       <import plugin="org.eclipse.jface.text" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views" version="0.0.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.search" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.draw2d" version="0.0.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.gef" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.draw2dl" version="0.0.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.gef3" version="0.0.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.erd.ui/META-INF/MANIFEST.MF
index 7f11164e186f78685229360563926c8bcfe1fe9b..245559c307de95f5f0a6b33209665542100c0260 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.erd.ui/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.ide,
  org.eclipse.ui.views,
- org.eclipse.gef;visibility:=reexport,
+ org.eclipse.gef3;visibility:=reexport,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.erd.model;visibility:=reexport,
  org.jkiss.dbeaver.ui,
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/plugin.xml b/plugins/org.jkiss.dbeaver.erd.ui/plugin.xml
index 24ef752e9bb6f14c0a05849bc0f9d3564e49f748..967397d67ef3e3833d1fa1973d1e63c4b444441b 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/plugin.xml
+++ b/plugins/org.jkiss.dbeaver.erd.ui/plugin.xml
@@ -51,7 +51,7 @@
     </extension>
 
     <extension point="org.eclipse.core.runtime.adapters">
-        <factory adaptableType="org.eclipse.gef.EditPart" class="org.jkiss.dbeaver.erd.ui.model.ERDObjectAdapter">
+        <factory adaptableType="org.eclipse.gef3.EditPart" class="org.jkiss.dbeaver.erd.ui.model.ERDObjectAdapter">
             <adapter type="org.jkiss.dbeaver.model.DBPNamedObject"/>
             <adapter type="org.jkiss.dbeaver.model.DBPQualifiedObject"/>
             <adapter type="org.jkiss.dbeaver.model.struct.DBSObject"/>
@@ -518,7 +518,7 @@
     </extension>
 
     <extension point="org.eclipse.ui.commands">
-        <command id="org.jkiss.dbeaver.erd.toggleHand" name="Toggle hand tool" description="Cycle through hand tool and previously used tool" categoryId="org.eclipse.gef.category.view"/>
+        <command id="org.jkiss.dbeaver.erd.toggleHand" name="Toggle hand tool" description="Cycle through hand tool and previously used tool" categoryId="org.eclipse.gef3.category.view"/>
     </extension>
 
     <extension point="org.eclipse.ui.bindings">
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java
index 39fabb2027705e708c9faa826db4dbba571f1c1f..151ed8ebe23f142ac123964b94bf7aef71b79ea9 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIConstants.java
@@ -17,7 +17,7 @@
 
 package org.jkiss.dbeaver.erd.ui;
 
-import org.eclipse.draw2d.PrintFigureOperation;
+import org.eclipse.draw2dl.PrintFigureOperation;
 import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;
 
 /**
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java
index f152fd17f37ce405044974376405bdaae9365920..23f9439450be09090d7c3cc08d0fcc81a6fc7c4b 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/ERDUIUtils.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui;
 
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteEntry;
+import org.eclipse.gef3.palette.PaletteContainer;
+import org.eclipse.gef3.palette.PaletteEntry;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.IWorkbenchPage;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java
index c3bc5406d00b26cc169424c74313ab5e8217fdbf..6cbe61ffaf64a9c77b185e5bfe3c79db09bb37c8 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/DiagramToggleHandAction.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.action;
 
-import org.eclipse.gef.Disposable;
-import org.eclipse.gef.palette.PaletteListener;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.ui.palette.PaletteViewer;
+import org.eclipse.gef3.Disposable;
+import org.eclipse.gef3.palette.PaletteListener;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.ui.palette.PaletteViewer;
 import org.eclipse.jface.action.Action;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.erd.ui.ERDIcon;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java
index 083d397f450ae6bc9db89bede625f9b4fa1c3c2c..38993c6a18f0b9433d6a9305f9189b5fce03183a 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDEditorPropertyTester.java
@@ -17,7 +17,7 @@
 package org.jkiss.dbeaver.erd.ui.action;
 
 import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.gef.ui.actions.DeleteAction;
+import org.eclipse.gef3.ui.actions.DeleteAction;
 import org.eclipse.ui.IWorkbenchPart;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java
index 07bcf2e75003ab6ab4910cf3ce2daf3494d958ec..7365a83f554375cd58e4e784561ea9bfa7a52d20 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerDelete.java
@@ -19,9 +19,9 @@ package org.jkiss.dbeaver.erd.ui.action;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.gef.ui.actions.DeleteAction;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.commands.CompoundCommand;
+import org.eclipse.gef3.ui.actions.DeleteAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IEditorPart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java
index 4218cf6add07fcae5b0ebefcc2b5d957e4fd1a05..aba36e50b1b719fbd15630a67502d0d28a120a96 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerPaste.java
@@ -19,8 +19,8 @@ package org.jkiss.dbeaver.erd.ui.action;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.gef3.commands.Command;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.ISources;
 import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java
index e36ad877d5b41b367504bc0639395f1670c2aa44..23e05ed2aeeb32f4e1b378fd379eba4dbaf60396 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/action/ERDHandlerSelectAll.java
@@ -19,7 +19,7 @@ package org.jkiss.dbeaver.erd.ui.action;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.gef.ui.actions.SelectAllAction;
+import org.eclipse.gef3.ui.actions.SelectAllAction;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.ISources;
 import org.eclipse.ui.handlers.HandlerUtil;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java
index f0b25403b02026a75a5315c2c1a985fc146af803..0e7efc3567fb9e25c73348f593869adf37463e8c 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationCreateCommand.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.*;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java
index 8966b62ce2118cbd92a5b32da5ce8198ef139651..eba81a909d9f876eb49ede63aba772bd89281384 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationDeleteCommand.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.commands.Command;
 import org.eclipse.swt.SWT;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDElement;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java
index eb151bf44620915ec07e676a9591b71914735d5e..c9c66f826bab608356c9bf8bea219b95d700c1a1 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectSourceCommand.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDElement;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java
index 9a1dfa4188b7db21218983d49f8e10ed4e8361c6..6ddde20c91fec21f9410857caca9c666ebdc52b8 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AssociationReconnectTargetCommand.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDElement;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java
index 577fac8112cae4d5eac303d70d771977d45e99a5..39fe3aef8ef59645ea7f372be66ad41f6b163cfa 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/AttributeCheckCommand.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.ui.part.AttributePart;
 
 /**
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java
index ca20e26f4c9e7fe0a0114cb492abfab0623ced19..b87ab10d34d24d307360f730863f4ca507bc3162 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCommand.java
@@ -17,7 +17,7 @@
 
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
 
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java
index 534189db751a3b2e06fe32a3220aaf56f068effb..f31ca05057f681cbb4b1507ff29db7afd497575b 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointCreateCommand.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2dl.geometry.Point;
 import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
 
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java
index db40caf1e2344fc627ff9e25eade41d699cebced..beada7e8800ddbbdb16579c36076cfc525841be6 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/BendpointMoveCommand.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2dl.Bendpoint;
+import org.eclipse.draw2dl.geometry.Point;
 import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
 
 public class BendpointMoveCommand extends BendpointCommand {
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java
index 2b5a0da5f5b79b013506d39d2ac2bc4d906acaaa..64211a9abbd8688b7529f3ae203298ee718f0fb2 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityAddCommand.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDUtils;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java
index b95d0c66f73e905a9af144c23bfc724d2b5542c9..74c9f9af9d6f9f5a8edda7dcc2fc345e610e582f 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/EntityRemoveCommand.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
@@ -74,7 +74,7 @@ public class EntityRemoveCommand extends Command {
     }
 
     /**
-     * @see org.eclipse.gef.commands.Command#execute()
+     * @see org.eclipse.gef3.commands.Command#execute()
      */
     @Override
     public void execute() {
@@ -98,7 +98,7 @@ public class EntityRemoveCommand extends Command {
     }
 
     /**
-     * @see org.eclipse.gef.commands.Command#redo()
+     * @see org.eclipse.gef3.commands.Command#redo()
      */
     @Override
     public void redo() {
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java
index 6608a112388972f25ba8a299f4613b66289055d9..262ef709cc1036f96aa4043cf8c5aae93af9fa0a 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NodeMoveCommand.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.ui.part.NodePart;
 
 /**
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java
index 4e0544aa36fbb67090a8d7148c1e74791e75255a..34477f2f1e976b3a9047d44048d8f988bb17bc76 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteCreateCommand.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java
index 2f5f0e43a633f89d63e1329189756688c799da44..05d6298a1dfd28a98b2965799c05ae08dced291d 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteDeleteCommand.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;
@@ -42,7 +42,7 @@ public class NoteDeleteCommand extends Command
     }
 
 	/**
-	 * @see org.eclipse.gef.commands.Command#execute()
+	 * @see org.eclipse.gef3.commands.Command#execute()
 	 */
 	@Override
     public void execute()
@@ -51,7 +51,7 @@ public class NoteDeleteCommand extends Command
 	}
 
 	/**
-	 * @see org.eclipse.gef.commands.Command#redo()
+	 * @see org.eclipse.gef3.commands.Command#redo()
 	 */
 	@Override
     public void redo()
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java
index b566fcfdb807759019eb10b69645de088838f746..905ae9b04a07d088654c0a7c513281d0a74d6ed9 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/command/NoteSetTextCommand.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.command;
 
-import org.eclipse.gef.commands.Command;
+import org.eclipse.gef3.commands.Command;
 import org.jkiss.dbeaver.erd.ui.figures.NoteFigure;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java
index 06abcbd66bedb8a1e0aa37e5ac87c7e234320040..21b6bd164ad5f846849f15c0f6f05a3afbda4e18 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/ExtendedDirectEditManager.java
@@ -19,14 +19,14 @@
  */
 package org.jkiss.dbeaver.erd.ui.directedit;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.Label;
+import org.eclipse.gef3.EditPolicy;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.commands.CommandStack;
+import org.eclipse.gef3.tools.CellEditorLocator;
+import org.eclipse.gef3.tools.DirectEditManager;
 import org.eclipse.jface.viewers.ICellEditorValidator;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.VerifyEvent;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java
index c4cadc7ed645cba1a0881ca3b0b08557648e117a..5b33ce832e26c1aedef8051dbe67e2c1a42ed131 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/directedit/FigureEditorLocator.java
@@ -19,11 +19,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.directedit;
 
-import org.eclipse.draw2d.Border;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.draw2dl.Border;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.tools.CellEditorLocator;
 import org.eclipse.jface.viewers.CellEditor;
 import org.eclipse.swt.widgets.Text;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java
index c4abe1dca03db13da5b35f3e5a6b85a1a9163941..b26d657577b0e813770399023a1548f6152a9e5e 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataEditDropTargetListener.java
@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.dnd;
 
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.dnd.TemplateTransferDropTargetListener;
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef3.EditPartViewer;
+import org.eclipse.gef3.dnd.TemplateTransferDropTargetListener;
+import org.eclipse.gef3.requests.CreationFactory;
 
 /**
  * Provides a listener for dropping templates onto the editor drawing
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java
index eeea387f09af531b0d16045c085f8c15fa98a9da..16f40dd8c4cc60bf3f1911f07eb31d33fcb6c06b 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/DataElementFactory.java
@@ -19,7 +19,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.dnd;
 
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef3.requests.CreationFactory;
 
 /**
  * Factory for creating instances of new objects from a palette
@@ -42,7 +42,7 @@ public class DataElementFactory implements CreationFactory
 	}
 
 	/**
-	 * @see org.eclipse.gef.requests.CreationFactory#getNewObject()
+	 * @see org.eclipse.gef3.requests.CreationFactory#getNewObject()
 	 */
 	@Override
     public Object getNewObject()
@@ -58,7 +58,7 @@ public class DataElementFactory implements CreationFactory
 	}
 
 	/**
-	 * @see org.eclipse.gef.requests.CreationFactory#getObjectType()
+	 * @see org.eclipse.gef3.requests.CreationFactory#getObjectType()
 	 */
 	@Override
     public Object getObjectType()
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java
index 467fd63ef228fa6ea424743f537e6e9ec7159a0d..cbcbdfcfc40825d650a1c040a4060830226c09e6 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/NodeDropTargetListener.java
@@ -22,12 +22,12 @@ package org.jkiss.dbeaver.erd.ui.dnd;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.dnd.AbstractTransferDropTargetListener;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef3.EditPartViewer;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.RequestConstants;
+import org.eclipse.gef3.dnd.AbstractTransferDropTargetListener;
+import org.eclipse.gef3.requests.CreateRequest;
+import org.eclipse.gef3.requests.CreationFactory;
 import org.jkiss.dbeaver.erd.model.DiagramObjectCollector;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java
index c44a859240c823416a73e5d93c6a6f92c32286ba..9cab6e78192b2d35fe41363d131d05e6ee8f74e3 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/dnd/ObjectCreationFactory.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.dnd;
 
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.gef3.requests.CreationFactory;
 
 /**
  * Simple object creation factory
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java
index d57cb9bb9e5b8351613683fed1606f9c3383d32d..d5d46e9514048bc8633df2bae8661932324056ad 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditPartFactory.java
@@ -19,8 +19,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.EditPartFactory;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java
index 6ae98ce59786947b7c352b8d3f8538062b176511..3121de1deda8037477294bc8f0bc4bd982e816c0 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorPart.java
@@ -21,21 +21,21 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.MultiStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PrintFigureOperation;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gef.*;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.ui.actions.*;
-import org.eclipse.gef.ui.palette.FlyoutPaletteComposite;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
-import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette;
-import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.gef.ui.properties.UndoablePropertySheetEntry;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.PrintFigureOperation;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.commands.CommandStack;
+import org.eclipse.gef3.editparts.ScalableFreeformRootEditPart;
+import org.eclipse.gef3.editparts.ZoomManager;
+import org.eclipse.gef3.palette.PaletteRoot;
+import org.eclipse.gef3.ui.actions.*;
+import org.eclipse.gef3.ui.palette.FlyoutPaletteComposite;
+import org.eclipse.gef3.ui.palette.PaletteViewerProvider;
+import org.eclipse.gef3.ui.parts.GraphicalEditorWithFlyoutPalette;
+import org.eclipse.gef3.ui.parts.GraphicalViewerKeyHandler;
+import org.eclipse.gef3.ui.properties.UndoablePropertySheetEntry;
 import org.eclipse.jface.action.*;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
@@ -60,11 +60,7 @@ import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.erd.model.*;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
-import org.jkiss.dbeaver.erd.ui.action.DiagramExportAction;
-import org.jkiss.dbeaver.erd.ui.action.DiagramLayoutAction;
-import org.jkiss.dbeaver.erd.ui.action.DiagramToggleGridAction;
-import org.jkiss.dbeaver.erd.ui.action.DiagramToggleHandAction;
-import org.jkiss.dbeaver.erd.ui.action.ERDEditorPropertyTester;
+import org.jkiss.dbeaver.erd.ui.action.*;
 import org.jkiss.dbeaver.erd.ui.directedit.StatusLineValidationMessageHandler;
 import org.jkiss.dbeaver.erd.ui.dnd.DataEditDropTargetListener;
 import org.jkiss.dbeaver.erd.ui.dnd.NodeDropTargetListener;
@@ -107,14 +103,15 @@ import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.EventObject;
 import java.util.List;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
 /**
  * Editor implementation based on the the example editor skeleton that is built in <i>Building
- * an editor </i> in chapter <i>Introduction to GEF </i>
+ * an editor </i> in chapter <i>Introduction to .gef3 </i>
  */
 public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
         implements DBPDataSourceTask, IDatabaseModellerEditor, ISearchContextProvider, IRefreshablePart, INavigatorModelView {
@@ -314,7 +311,7 @@ public abstract class ERDEditorPart extends GraphicalEditorWithFlyoutPalette
     @Override
     public Object getAdapter(Class adapter)
     {
-        // we need to handle common GEF elements we created
+        // we need to handle common .gef3 elements we created
         if (adapter == GraphicalViewer.class || adapter == EditPartViewer.class) {
             return getGraphicalViewer();
         } else if (adapter == CommandStack.class) {
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java
index 40d212f9df8a118c134d2c43893db571437c7974..d0350294e1afc8e202971beef5360418df9bb8e5 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDEditorViewer.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef3.GraphicalViewer;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java
index 0acf4631a22edada8d590c52bf05dd6a3fc87abf..e194d300c570e25e85c4fcc47ed9ebf04a286206 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDGraphicalViewer.java
@@ -19,17 +19,17 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.palette.PaletteContainer;
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.PaletteRoot;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
-import org.eclipse.gef.ui.parts.AbstractEditPartViewer;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
+import org.eclipse.draw2dl.FigureCanvas;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.palette.PaletteContainer;
+import org.eclipse.gef3.palette.PaletteDrawer;
+import org.eclipse.gef3.palette.PaletteRoot;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
+import org.eclipse.gef3.ui.parts.AbstractEditPartViewer;
+import org.eclipse.gef3.ui.parts.ScrollingGraphicalViewer;
 import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
@@ -565,10 +565,10 @@ public class ERDGraphicalViewer extends ScrollingGraphicalViewer implements IPro
     /**
      * Handler that provides horizontal scrolling using mouse wheel.
      *
-     * Copied from {@link org.eclipse.graphiti.ui.internal.util.gef.MouseWheelHorizontalScrollHandler}
+     * Copied from {@link org.eclipse.graphiti.ui.internal.util.gef3.MouseWheelHorizontalScrollHandler}
      *
      * @implNote this implementation differs from the source, since scrolling direction is inverted.
-     * @see org.eclipse.graphiti.ui.internal.util.gef.MouseWheelHorizontalScrollHandler
+     * @see org.eclipse.graphiti.ui.internal.util.gef3.MouseWheelHorizontalScrollHandler
      */
     private static class MouseWheelHorizontalScrollHandler implements MouseWheelHandler {
         public static final MouseWheelHandler SINGLETON = new MouseWheelHorizontalScrollHandler();
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java
index 1bea87d394c383776a01f5460d08ec8c9a830e08..0105d0f83621a3f2648d77a0bd5e675aaaf78458 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDOutlinePage.java
@@ -16,13 +16,13 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.draw2d.LightweightSystem;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.parts.ScrollableThumbnail;
-import org.eclipse.draw2d.parts.Thumbnail;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
+import org.eclipse.draw2dl.LightweightSystem;
+import org.eclipse.draw2dl.MarginBorder;
+import org.eclipse.draw2dl.Viewport;
+import org.eclipse.draw2dl.parts.ScrollableThumbnail;
+import org.eclipse.draw2dl.parts.Thumbnail;
+import org.eclipse.gef3.LayerConstants;
+import org.eclipse.gef3.editparts.ScalableFreeformRootEditPart;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.StructuredSelection;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java
index 7fc06d237b1ae67fd09c730a87b48f7075135592..3baba279f590f87de22aa3d46f8b8d22fd914013 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPalettePreferences.java
@@ -19,8 +19,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.ui.palette.FlyoutPaletteComposite.FlyoutPreferences;
+import org.eclipse.draw2dl.PositionConstants;
+import org.eclipse.gef3.ui.palette.FlyoutPaletteComposite.FlyoutPreferences;
 import org.jkiss.dbeaver.erd.ui.internal.ERDUIActivator;
 
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java
index 0f25a2494c6dffcb29cb155695e4042d5e4ce3b1..39fc4dd89fd9a22fa14eb2e64f8990ebdea6a0e4 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPaletteViewerProvider.java
@@ -19,10 +19,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.gef.EditDomain;
-import org.eclipse.gef.dnd.TemplateTransferDragSourceListener;
-import org.eclipse.gef.ui.palette.PaletteViewer;
-import org.eclipse.gef.ui.palette.PaletteViewerProvider;
+import org.eclipse.gef3.EditDomain;
+import org.eclipse.gef3.dnd.TemplateTransferDragSourceListener;
+import org.eclipse.gef3.ui.palette.PaletteViewer;
+import org.eclipse.gef3.ui.palette.PaletteViewerProvider;
 
 /**
  * PaletteViewerProvider subclass used for initialising drag and drop
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java
index 33a5b4b7cea2fbe8a09bfe6b8d975ccae98e9d2b..1d4b2acd8cbd76c87312cecdc7fc91731460fddb 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPreferencePage.java
@@ -18,7 +18,7 @@
 package org.jkiss.dbeaver.erd.ui.editor;
 
 import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.PrintFigureOperation;
+import org.eclipse.draw2dl.PrintFigureOperation;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.*;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java
index 6e3bd147c30d48349a635eff14c3d4da860570e7..e318fc22f42551233fb9a3ed69e74971cd95ca12 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/ERDPropertiesDrawer.java
@@ -19,14 +19,14 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor;
 
-import org.eclipse.gef.palette.PaletteDrawer;
-import org.eclipse.gef.palette.SelectionToolEntry;
+import org.eclipse.gef3.palette.PaletteDrawer;
+import org.eclipse.gef3.palette.SelectionToolEntry;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.UIIcon;
 
 /**
  * Experimental drawer.
- * Unfortunately it is not possible to customize drawer look-and-feel. All UI rendering is performed by GEF.
+ * Unfortunately it is not possible to customize drawer look-and-feel. All UI rendering is performed by .gef3.
  */
 public class ERDPropertiesDrawer extends PaletteDrawer
 {
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java
index e76a95843813443f7351cc6327d77b5fd5a5b569..084718973383940beae045c76445f05b07f16111 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ActionToolEntry.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
+import org.eclipse.gef3.Tool;
+import org.eclipse.gef3.palette.PaletteEntry;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
 import org.eclipse.jface.action.IAction;
 
 public class ActionToolEntry extends ToolEntry {
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java
index 8974452440f0f19976cd7090efb0b3670af8c56e..6b0acc4661c303e6cab3753a9df5d09c4b4e3265 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/BringToFrontToolEntry.java
@@ -16,11 +16,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.SharedImages;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
+import org.eclipse.gef3.DefaultEditDomain;
+import org.eclipse.gef3.GraphicalViewer;
+import org.eclipse.gef3.SharedImages;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
 import org.jkiss.dbeaver.erd.ui.part.NodePart;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java
index 21164bb966ebd1a22e84b067f21ad76da799dc28..e0219e5cb2e11090c2a695c0f1f7eb1a678f6ebe 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ChangeZOrderAction.java
@@ -1,8 +1,8 @@
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.ui.actions.SelectionAction;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.ui.actions.SelectionAction;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
 import org.jkiss.dbeaver.erd.ui.internal.ERDUIMessages;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java
index a39865ef0304db6fd0dd07b5429bf1f8189a6a8c..744192ef704540b01c37b6acc66958b0b216d109 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/CommandToolEntry.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.Tool;
-import org.eclipse.gef.palette.PaletteEntry;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
+import org.eclipse.gef3.Tool;
+import org.eclipse.gef3.palette.PaletteEntry;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
 import org.jkiss.dbeaver.model.DBPImage;
 import org.jkiss.dbeaver.ui.ActionUtils;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java
index 84f7d1120838e20dc96d1154ec631d24c1c903e2..cdf2d101753d9b9b172f30e5c5e769dc7a134601 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/HandToolEntry.java
@@ -16,13 +16,13 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.AbstractTool;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
+import org.eclipse.draw2dl.Cursors;
+import org.eclipse.draw2dl.FigureCanvas;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.gef3.EditPartViewer;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.AbstractTool;
+import org.eclipse.gef3.ui.parts.ScrollingGraphicalViewer;
 import org.eclipse.swt.widgets.Control;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java
index 14b19dc381f01e48a2992175750d364e64e51d5a..e89e53ee09942ff654011004dc148904ff2d305e 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/ResetPartColorAction.java
@@ -1,7 +1,7 @@
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.ui.actions.SelectionAction;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.ui.actions.SelectionAction;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.graphics.Color;
 import org.jkiss.dbeaver.erd.ui.editor.ERDEditorPart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java
index 0e137b0e2f95fb278ebb315967dc85fe2d5fa7e7..88ecce6c42ba41cc3042b7f306868d7c24e0a5c0 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SelectionToolEntry.java
@@ -16,15 +16,15 @@
  */
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.palette.ToolEntry;
-import org.eclipse.gef.tools.SelectionTool;
+import org.eclipse.gef3.palette.ToolEntry;
+import org.eclipse.gef3.tools.SelectionTool;
 import org.jkiss.dbeaver.erd.ui.ERDIcon;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 
 /**
  * This class is used to override default GEF icons.
  *
- * @see org.eclipse.gef.palette.SelectionToolEntry
+ * @see org.eclipse.gef3.palette.SelectionToolEntry
  */
 public class SelectionToolEntry extends ToolEntry {
     public SelectionToolEntry() {
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java
index 9779659af7cbc34ce336a018c3bf5ac6dc53fb80..3bc0457825518080bfde91b6558613abbb93a75f 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartColorAction.java
@@ -1,7 +1,7 @@
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.ui.actions.SelectionAction;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.ui.actions.SelectionAction;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java
index a77c8a7d02853f84280616216a9ac77bd4f9c5df..335b66c86fb50b3d84170277fcc8316e116dfe4d 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/editor/tools/SetPartSettingsAction.java
@@ -1,7 +1,7 @@
 package org.jkiss.dbeaver.erd.ui.editor.tools;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.ui.actions.SelectionAction;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.ui.actions.SelectionAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.ColorSelector;
 import org.eclipse.jface.viewers.IStructuredSelection;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java
index d5366bc585b156b75719fe0baaceed41f22b54ff..6a34c4762adbaf5fa517c21e14dfa98958f26bd3 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportFormatHandler.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.export;
 
-import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2dl.IFigure;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java
index 8db4ccfcf014993fe451e89715f6126ef97addc1..051a42538a6b21bc9f0be68ae48f241bfe121359 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportGraphML.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.export;
 
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Bendpoint;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.graphics.Color;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.erd.model.*;
@@ -37,7 +37,10 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
-import java.util.*;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java
index 6698b078aebad4757bdd483aeb10f7225ccd8215..d12223c5ed6c9074c5c789f6bb91037ce4afd692 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/export/ERDExportRasterImage.java
@@ -16,11 +16,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.export;
 
-import org.eclipse.draw2d.FreeformLayeredPane;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.FreeformLayeredPane;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.SWTGraphics;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java
index d2a3b38c8a9fbf79d23b1435256cacfae9a8aea4..4f3ceae5c572f25e4073f0e0c27c5add8405fcf8 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeItemFigure.java
@@ -16,12 +16,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Figure;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.Label;
+import org.eclipse.draw2dl.ToolbarLayout;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.jkiss.code.NotNull;
@@ -164,8 +164,8 @@ public class AttributeItemFigure extends Figure
         if (parent != null && parent.getBorder() != null) {
             // Extend bounds to the parent's width. This is required for navigation to work correctly:
             // If there's two attributes whose names have different length (e.g. 'id' and 'description'),
-            // descending direction between them would be 'east', not 'south', since that's what GEF thinks.
-            // See org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler.getNavigationPoint
+            // descending direction between them would be 'east', not 'south', since that's what .gef3 thinks.
+            // See org.eclipse.gef3.ui.parts.GraphicalViewerKeyHandler.getNavigationPoint
             final Insets insets = parent.getBorder().getInsets(this);
             final Rectangle bounds = parent.getBounds();
             return super.getBounds().getCopy()
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java
index 3084620d9fad6f62ca32f970a7b865047bca5e87..443c2ea73f98e80e1fd441ba9ede2bb41eaafc9c 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/AttributeListFigure.java
@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java
index e44ba905ef2ba9c7b6d8d96cbf3eb66eb290b74c..3f0aaa552d9bf341db51f74f68c8c3bfe8da2508 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/CustomCheckBoxFigure.java
@@ -5,8 +5,8 @@
 
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.Toggle;
+import org.eclipse.draw2dl.Label;
+import org.eclipse.draw2dl.Toggle;
 import org.eclipse.swt.graphics.Image;
 import org.jkiss.dbeaver.ui.DBeaverIcons;
 import org.jkiss.dbeaver.ui.UIIcon;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java
index 1cefd17cad2621a044cdc810a85a728bf5188405..2323fa595a0c71a2a7dfa7aec7ce383ea9665a6b 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EditableLabel.java
@@ -19,11 +19,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.Label;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
 import org.jkiss.dbeaver.ui.UIUtils;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java
index e1f3bf5bbe0c2f8b81e1b88b5aa5a0c1a7fd6218..b9ead542367b0ca13b8e2cb35e94361a74e7c5ed 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityDiagramFigure.java
@@ -20,12 +20,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.draw2d.text.TextFlow;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.draw2dl.text.FlowPage;
+import org.eclipse.draw2dl.text.TextFlow;
 import org.eclipse.jface.resource.JFaceResources;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
 import org.jkiss.dbeaver.erd.ui.editor.ERDGraphicalViewer;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java
index 4176c06d1ca5a890b4b076e50f6a4c4f873fd096..595c34f40c48be8ca2c13cba818c42d297549363 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/EntityFigure.java
@@ -16,7 +16,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.*;
+import org.eclipse.draw2dl.*;
 import org.eclipse.jface.resource.ColorRegistry;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Image;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java
index f64aa2a3c4eaee31f2f2c4487f8b21ba7c9b9a05..49c13df044388c3b6cdd0b7771584b045b363528 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/NoteFigure.java
@@ -20,12 +20,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.CompoundBorder;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.text.FlowPage;
-import org.eclipse.draw2d.text.TextFlow;
+import org.eclipse.draw2dl.CompoundBorder;
+import org.eclipse.draw2dl.LineBorder;
+import org.eclipse.draw2dl.MarginBorder;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.text.FlowPage;
+import org.eclipse.draw2dl.text.TextFlow;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
 import org.jkiss.dbeaver.ui.UIUtils;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java
index 91cc90c354d8821d9a855cf1fb92666db653b738..1ec1e9c78a3507cdbd2f937744498c8c300d8e9f 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/figures/RoundedLineBorder.java
@@ -1,9 +1,9 @@
 package org.jkiss.dbeaver.erd.ui.figures;
 
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.geometry.Insets;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.LineBorder;
+import org.eclipse.draw2dl.geometry.Insets;
 import org.eclipse.swt.graphics.Color;
 
 public class RoundedLineBorder extends LineBorder {
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java
index 64bc93fb1baa7832211c7dc426ba888502105d83..2e4ed20619b62c682af14ab0a3d0da92223056bc 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/DelegatingLayoutManager.java
@@ -19,11 +19,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPolicy;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.LayoutManager;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.EditPolicy;
 import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
 import org.jkiss.dbeaver.erd.ui.policy.DiagramXYLayoutPolicy;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java
index 5dfef8035d54a1e6cd65df2ac56248cc44dcf42c..550efcd68ea96ffee623d43bea608ea986da17ca 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphAnimation.java
@@ -20,12 +20,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout;
 
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Connection;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.Viewport;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.PointList;
+import org.eclipse.draw2dl.geometry.Rectangle;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -33,7 +33,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * GraphAnimation class lifted directly from the GEF flow example. The only
+ * GraphAnimation class lifted directly from the .gef3 flow example. The only
  * modification is in playBackState(): if either the width of height of a final
  * state figure bounds is greater, then the rectangle during animation is shown
  * as the final size from the outset
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java
index 500e887a37dfcbe95672c79e7abe869b882ab6c8..3925053561a9d753b7667e5a8ddd86d81d21a5a0 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutAuto.java
@@ -19,11 +19,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout;
 
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.Animation;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.AbstractLayout;
+import org.eclipse.draw2dl.Animation;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.jkiss.dbeaver.erd.ui.layout.algorithm.direct.DirectedGraphLayoutVisitor;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java
index 74e211e835588665187d00007047d26a748e41e6..e9900d6b2fdb3ee92ea8f9d943935ef4b9c1938e 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/GraphLayoutXY.java
@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout;
 
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.FreeformLayout;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
 
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java
index 5c5c72212d7e0722104e381f8b7283c32038b1fc..a40f07f5f8358505d5608c5e390bad2576773ff1 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/ClusterEdgeCreator.java
@@ -20,7 +20,7 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.graph.*;
+import org.eclipse.draw2dl.graph.*;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java
index 288adcbdbd9b6c538a3f5a0e58131cd1cb73a1a4..f97f68e2e0ea76eae90754d043889337a4cd96c3 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DirectedGraphLayoutVisitor.java
@@ -20,15 +20,15 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.*;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.draw2dl.graph.*;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.NodeEditPart;
+import org.eclipse.gef3.editparts.AbstractConnectionEditPart;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.erd.ui.layout.GraphAnimation;
 import org.jkiss.dbeaver.erd.ui.model.ERDDecorator;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java
index 2a5033c3940e97dead65633c662fd77970a72801..1394b4bdf797f3656f5646a2c0fe5e81da2dd23e 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/DummyEdgePart.java
@@ -20,9 +20,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolylineConnection;
+import org.eclipse.draw2dl.BendpointConnectionRouter;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.PolylineConnection;
 
 
 /**
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java
index 6122f0ee2e7de1953535d64d85767473977c8257..2399e8289fe39b843cde1df8dee925800558a1cf 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/NodeJoiningDirectedGraphLayout.java
@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraphLayout;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.graph.DirectedGraph;
+import org.eclipse.draw2dl.graph.DirectedGraphLayout;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 
 /**
  * Extended version of DirectedGraphLayout which allows DirectedGraphLayout
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java
index be9e9fefe318edec3512811c02b05379aa2dfaa8..cad1b16dab9510c5a54300cd15a83d637b8c7880 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/layout/algorithm/direct/StandaloneNodeConnector.java
@@ -19,9 +19,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.layout.algorithm.direct;
 
-import org.eclipse.draw2d.graph.*;
-import org.eclipse.gef.NodeEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.graph.*;
+import org.eclipse.gef3.NodeEditPart;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 import org.eclipse.swt.graphics.Point;
 
 import java.util.ArrayList;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java
index 062b56f703b62a98c73565ec0af90b52cdb92ef0..e26773d31ed98e13f37344e331a6dd1356689cf8 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/DiagramLoader.java
@@ -20,10 +20,10 @@
 package org.jkiss.dbeaver.erd.ui.model;
 
 import org.eclipse.core.resources.IProject;
-import org.eclipse.draw2d.AbsoluteBendpoint;
-import org.eclipse.draw2d.Bendpoint;
-import org.eclipse.draw2d.RelativeBendpoint;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.AbsoluteBendpoint;
+import org.eclipse.draw2dl.Bendpoint;
+import org.eclipse.draw2dl.RelativeBendpoint;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.jface.resource.StringConverter;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Display;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java
index f9b104f264416d095fc538436d040eb5040bd04a..c1c7f12322643a8bbae8fe382768890969f03250 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDContainerDecorated.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.jkiss.code.NotNull;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java
index d8c5958c9118943f212390ded4a64de4ac9f2b39..eb9a0394905fa565ebd9916127f6d07f6778ff47 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecorator.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.gef3.EditPartFactory;
+import org.eclipse.gef3.palette.PaletteRoot;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java
index 56bb82892af12d95fb6e4909573e012c8d92b6c8..68fd98ffbea70129c8e2ca0346e2fa86573daa10 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDDecoratorDefault.java
@@ -16,12 +16,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.palette.*;
-import org.eclipse.gef.requests.CreationFactory;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Insets;
+import org.eclipse.gef3.EditPartFactory;
+import org.eclipse.gef3.RequestConstants;
+import org.eclipse.gef3.palette.*;
+import org.eclipse.gef3.requests.CreationFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java
index d7832a13731f938f8c8f0b12d387ab80591a7c02..27e6df390bfe32779127b70a3cdebb741ba5bce7 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapter.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.Request;
 
 /**
  * ERD model adapter
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java
index 57d86beb9c6cbaee95cd465b44177100a464aa35..c3a670364c0c3d4ef294e1b225623725c333a499 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDModelAdapterDefault.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.erd.ui.model;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.Request;
 
 /**
  * Empty model adapter
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java
index 2f31a721bf879f8110b9ff8d5fec9017a38a9f2f..be3a2673fea2c4be07e6ed37a4ff519ce79f0d84 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/model/ERDObjectAdapter.java
@@ -17,7 +17,7 @@
 package org.jkiss.dbeaver.erd.ui.model;
 
 import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.gef.EditPart;
+import org.eclipse.gef3.EditPart;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.erd.model.ERDObject;
 import org.jkiss.dbeaver.erd.ui.part.DiagramPart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java
index ad10369233d20228453a54a56a0e7fa5131dfe4f..35d63cf6630e12d2416c3fd5525789b303781a97 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AssociationPart.java
@@ -19,13 +19,13 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.PointList;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.editpolicies.ConnectionEndpointEditPolicy;
 import org.eclipse.swt.SWT;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java
index ba9f2ed7c455295b6cff247a6abdc34961589e35..e925abbc8b3925cb5ff01e65b9a04ccb2dc3bbac 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/AttributePart.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.*;
-import org.eclipse.gef.tools.DragEditPartsTracker;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.tools.DragEditPartsTracker;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
 import org.jkiss.dbeaver.erd.ui.ERDUIUtils;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java
index e5aec5306634ca0ecdfbfd59af110bfdd4d9d4a3..999008e291cc079877ac2a64c37db017186ffcf5 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/DiagramPart.java
@@ -16,16 +16,16 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.FanRouter;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ShortestPathConnectionRouter;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStackEvent;
-import org.eclipse.gef.commands.CommandStackEventListener;
+import org.eclipse.draw2dl.ConnectionLayer;
+import org.eclipse.draw2dl.FanRouter;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.ShortestPathConnectionRouter;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.commands.CommandStackEvent;
+import org.eclipse.gef3.commands.CommandStackEventListener;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.widgets.Control;
@@ -206,7 +206,7 @@ public class DiagramPart extends PropertyAwarePart {
     }
 
     /**
-     * @see org.eclipse.gef.editparts.AbstractEditPart#isSelectable()
+     * @see org.eclipse.gef3.editparts.AbstractEditPart#isSelectable()
      */
     @Override
     public boolean isSelectable()
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java
index 76eba7314666ea8b1681364e6b60e1f60729fba8..bc314160ad3b438ab5c020ccff6e3b40997b50b8 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/EntityPart.java
@@ -19,12 +19,12 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.draw2dl.ChopboxAnchor;
+import org.eclipse.draw2dl.ConnectionAnchor;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.tools.DirectEditManager;
 import org.jkiss.dbeaver.erd.model.ERDElement;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDEntityAttribute;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java
index c90c495b97a8127ccdbc84ab9fa9a87bac70cb05..7dd6bc204097bfd79185b273a63de1c690463ed3 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NodePart.java
@@ -17,9 +17,9 @@
 
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.NodeEditPart;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.NodeEditPart;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java
index f20421c5730003d4f263ee2334b338e557a583c9..7e4a97d907aa8f503a1a856e27a4d425706e9d98 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/NotePart.java
@@ -17,15 +17,15 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.ChopboxAnchor;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.*;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.draw2dl.ChopboxAnchor;
+import org.eclipse.draw2dl.ConnectionAnchor;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.*;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.requests.DirectEditRequest;
+import org.eclipse.gef3.tools.DirectEditManager;
 import org.jkiss.dbeaver.erd.model.ERDElement;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.ERDUIConstants;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java
index c01d066d2e27e3604189c64c5f2c961434e7a57a..2f4744e824e9952ec0162f5b7a9d9330668a19dd 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwareConnectionPart.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.editparts.AbstractConnectionEditPart;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.erd.model.ERDObject;
 import org.jkiss.dbeaver.model.DBPNamedObject;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java
index 396c23afcc6647e63d94cf99d8f93cd75de83c3a..c3d5d84f4f2a14b85c9c778ef9b82b7727e1da39 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/part/PropertyAwarePart.java
@@ -16,13 +16,13 @@
  */
 package org.jkiss.dbeaver.erd.ui.part;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.ConnectionEditPart;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 import org.eclipse.ui.views.properties.IPropertySource;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java
index 37e8e2b1507316036b9370ffe429ad647c225cd9..e67314b87a98411cf60cf5384e7353a5f15add95 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationBendEditPolicy.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.BendpointEditPolicy;
-import org.eclipse.gef.requests.BendpointRequest;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.BendpointEditPolicy;
+import org.eclipse.gef3.requests.BendpointRequest;
 import org.jkiss.dbeaver.erd.ui.command.BendpointCreateCommand;
 import org.jkiss.dbeaver.erd.ui.command.BendpointDeleteCommand;
 import org.jkiss.dbeaver.erd.ui.command.BendpointMoveCommand;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java
index e84ba62545f1a610ffce5858736c88fe7bed07ed..a89d71a8bcf5aa7174d7b5c6776f82cfd28154eb 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AssociationEditPolicy.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.dbeaver.erd.ui.command.AssociationDeleteCommand;
 import org.jkiss.dbeaver.erd.ui.part.AssociationPart;
 
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java
index ac7eadce4fcdf4094d75ec7738303ba5c555eb4c..a4ce327d8186bf1835368b7ac6608480610c1549 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeConnectionEditPolicy.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.requests.ChangeBoundsRequest;
+import org.eclipse.gef3.requests.CreateRequest;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.erd.ui.command.AssociationCreateCommand;
 import org.jkiss.dbeaver.erd.ui.part.AttributePart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java
index 1ef890febf2296b99a06f4a4807f30f68974db73..d4dea282267594511802e998e7caf62ee561f1d3 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeContainerEditPolicy.java
@@ -16,11 +16,11 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
+import org.eclipse.gef3.requests.ChangeBoundsRequest;
+import org.eclipse.gef3.requests.CreateRequest;
+import org.eclipse.gef3.requests.GroupRequest;
 
 /**
  * Edit policy for attribute container
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java
index 324f9c7d37568dad13487c4eeb988a902be60e78..0501bbe2ed3919141041ffaa16961c726f009c31 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/AttributeDragAndDropEditPolicy.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.RequestConstants;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.GraphicalEditPolicy;
 import org.jkiss.dbeaver.erd.ui.part.AttributePart;
 
 /**
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java
index 2ec97e632da5d405b5e40aeefa4eb40ef7bc082b..ed0c3c7573d82c8ebdc7bd3a549b993068a57c7f 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramContainerEditPolicy.java
@@ -16,14 +16,14 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.AbstractEditPolicy;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.AbstractEditPolicy;
+import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
+import org.eclipse.gef3.requests.CreateRequest;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.dbeaver.erd.model.ERDEntity;
 import org.jkiss.dbeaver.erd.model.ERDNote;
 import org.jkiss.dbeaver.erd.ui.command.NoteCreateCommand;
@@ -43,7 +43,7 @@ import java.util.List;
 public class DiagramContainerEditPolicy extends ContainerEditPolicy {
 
     /**
-     * @see org.eclipse.gef.editpolicies.ContainerEditPolicy#getAddCommand(org.eclipse.gef.requests.GroupRequest)
+     * @see org.eclipse.gef3.editpolicies.ContainerEditPolicy#getAddCommand(org.eclipse.gef3.requests.GroupRequest)
      */
     @Override
     protected Command getAddCommand(GroupRequest request)
@@ -53,7 +53,7 @@ public class DiagramContainerEditPolicy extends ContainerEditPolicy {
     }
 
     /**
-     * @see ContainerEditPolicy#getCreateCommand(org.eclipse.gef.requests.CreateRequest)
+     * @see ContainerEditPolicy#getCreateCommand(org.eclipse.gef3.requests.CreateRequest)
      */
     @Override
     protected Command getCreateCommand(CreateRequest request)
@@ -85,7 +85,7 @@ public class DiagramContainerEditPolicy extends ContainerEditPolicy {
     }
 
     /**
-     * @see AbstractEditPolicy#getTargetEditPart(org.eclipse.gef.Request)
+     * @see AbstractEditPolicy#getTargetEditPart(org.eclipse.gef3.Request)
      */
     @Override
     public EditPart getTargetEditPart(Request request)
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java
index 7a061d7be22bf0d57e88a8e5c2513881da93ad37..1eb93302f6fce595e0db0e83b367cccd5bb52057 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/DiagramXYLayoutPolicy.java
@@ -16,15 +16,15 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.draw2dl.Figure;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.GraphicalEditPart;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.XYLayoutEditPolicy;
+import org.eclipse.gef3.requests.CreateRequest;
 import org.jkiss.dbeaver.erd.ui.command.NodeMoveCommand;
 import org.jkiss.dbeaver.erd.ui.part.EntityPart;
 import org.jkiss.dbeaver.erd.ui.part.NodePart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java
index 56ecce746f4926354ca0dab935db74183fc4a4e1..8997dbbfe7867def01d3628d7f17f33ef97980e5 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityConnectionEditPolicy.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.GraphicalNodeEditPolicy;
-import org.eclipse.gef.requests.CreateConnectionRequest;
-import org.eclipse.gef.requests.ReconnectRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.GraphicalNodeEditPolicy;
+import org.eclipse.gef3.requests.CreateConnectionRequest;
+import org.eclipse.gef3.requests.ReconnectRequest;
 import org.jkiss.dbeaver.erd.model.ERDAssociation;
 import org.jkiss.dbeaver.erd.ui.command.AssociationCreateCommand;
 import org.jkiss.dbeaver.erd.ui.command.AssociationReconnectSourceCommand;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java
index cc09299bd9ae1ef19b4fa5e420228035dfbc9c26..db19bbc9ac56a1c29667a4bcdee86b92f44c8518 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityContainerEditPolicy.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ContainerEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ContainerEditPolicy;
+import org.eclipse.gef3.requests.CreateRequest;
 
 /**
  * Edit policy for Table as a container, handling functionality for dropping new columns into tables
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java
index db21ff32de8c67673c64e0f44e7468570556c451..35ef39006a714970567cff5efe4b27a781544d83 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/EntityEditPolicy.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.dbeaver.erd.ui.part.EntityPart;
 
 /**
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java
index 76c9a55b9d0b8016fb04194ca94bc62f47bc713d..657f2e5b895d118e2d0f10022cc3b6251cc098df 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteDirectEditPolicy.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.DirectEditPolicy;
+import org.eclipse.gef3.requests.DirectEditRequest;
 import org.eclipse.jface.viewers.CellEditor;
 import org.jkiss.dbeaver.erd.ui.command.NoteSetTextCommand;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;
diff --git a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java
index 7816b64319c43c369c75d409d7c5031f565cda59..39db23004291f24476f28add59e83409d601d02f 100644
--- a/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.erd.ui/src/org/jkiss/dbeaver/erd/ui/policy/NoteEditPolicy.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.erd.ui.policy;
 
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ComponentEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ComponentEditPolicy;
+import org.eclipse.gef3.requests.GroupRequest;
 import org.jkiss.dbeaver.erd.ui.command.NoteDeleteCommand;
 import org.jkiss.dbeaver.erd.ui.model.EntityDiagram;
 import org.jkiss.dbeaver.erd.ui.part.NotePart;
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF
index 78e5c5c8aa5ed6928972f56725ce488f318e293d..f5025be21a1b90a484d41e9ba38998997dab4c64 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.osgi.services,
  org.eclipse.ui.workbench,
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.editors,
- org.eclipse.gef,
+ org.eclipse.gef3,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.registry,
  org.jkiss.dbeaver.ext.postgresql,
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF
index 12372cf2f818c2d78db09d601fb1d1e83226c775..aa436ab9933d59cde065549224d6ad8cd89801e2 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
  org.eclipse.ui.ide,
- org.eclipse.gef,
+ org.eclipse.gef3,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.navigator,
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java
index 133b25bec6ffc8609d36c85bc3db65b027afdb24..1ee61e13c670e3d8da08e3da8f122f75966defe9 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionAnchor.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2dl.AbstractConnectionAnchor;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.geometry.Point;
 
 public class LockGraphConnectionAnchor extends AbstractConnectionAnchor {
 
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java
index 4247be12cfa7f0be8d252340af2eddd169de0738..9bdd8c0904c5c9535559ee75466e6fa1305df7bf 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphConnectionEditPolicy.java
@@ -16,9 +16,9 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.ConnectionEditPolicy;
-import org.eclipse.gef.requests.GroupRequest;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.ConnectionEditPolicy;
+import org.eclipse.gef3.requests.GroupRequest;
 
 public class LockGraphConnectionEditPolicy extends ConnectionEditPolicy {
 
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java
index 6649ed5f56c3e6b35dfb6a5a9e5a7cdf6bf37ff5..acf4577032af12a1b1b05287aa3d1a2cf5f06288 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEdgeEditPart.java
@@ -16,12 +16,12 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractConnectionEditPart;
-import org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.draw2dl.PolygonDecoration;
+import org.eclipse.draw2dl.PolylineConnection;
+import org.eclipse.gef3.EditPolicy;
+import org.eclipse.gef3.editparts.AbstractConnectionEditPart;
+import org.eclipse.gef3.editpolicies.ConnectionEndpointEditPolicy;
 
 public class LockGraphEdgeEditPart extends AbstractConnectionEditPart {
 
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPart.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPart.java
index 1207e9dfb00163a34aa667eef8411571f922ae8d..275a320e5a40c274c0181f3d2ca37329185d5acc 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPart.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPart.java
@@ -16,10 +16,10 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.draw2dl.*;
+import org.eclipse.gef3.EditPolicy;
+import org.eclipse.gef3.LayerConstants;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraph;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphNode;
 
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPartFactory.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPartFactory.java
index 2b2c488968be45af8fb048a47260f8b71eab0163..0b7fcd89c1ae368a2ba69e5dd381b4bd3af7f2c5 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPartFactory.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphEditPartFactory.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.EditPartFactory;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraph;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphEdge;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphNode;
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeEditPart.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeEditPart.java
index 9b035033e3f766458f7a020fa1f628c860ef3a1e..ebad647e2a76b0b6652c615efd53cd476dfe5469 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeEditPart.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeEditPart.java
@@ -16,14 +16,14 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.GridData;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
+import org.eclipse.draw2dl.ConnectionAnchor;
+import org.eclipse.draw2dl.GridData;
+import org.eclipse.draw2dl.IFigure;
+import org.eclipse.gef3.ConnectionEditPart;
+import org.eclipse.gef3.EditPolicy;
+import org.eclipse.gef3.Request;
+import org.eclipse.gef3.editparts.AbstractGraphicalEditPart;
+import org.eclipse.gef3.editpolicies.NonResizableEditPolicy;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraph;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphEdge;
 import org.jkiss.dbeaver.model.impl.admin.locks.LockGraphNode;
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeFigure.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeFigure.java
index 354fce0ee78c166ffcece0cbd052545c5de03df5..78bee11c003056efddb797514c8d5261bd47649d 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeFigure.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphNodeFigure.java
@@ -16,8 +16,8 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Rectangle;
 
 
 public class LockGraphNodeFigure extends Figure {
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphXYLayoutEditPolicy.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphXYLayoutEditPolicy.java
index efbf65c77e18209b2aa2e5ca4055f9853dde3e0a..6b0f32a3d8ff5b0e8cb3e3b5cc70764bc03432a1 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphXYLayoutEditPolicy.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphXYLayoutEditPolicy.java
@@ -17,10 +17,10 @@
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
 
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.XYLayoutEditPolicy;
-import org.eclipse.gef.requests.CreateRequest;
+import org.eclipse.gef3.EditPart;
+import org.eclipse.gef3.commands.Command;
+import org.eclipse.gef3.editpolicies.XYLayoutEditPolicy;
+import org.eclipse.gef3.requests.CreateRequest;
 
 public class LockGraphXYLayoutEditPolicy extends XYLayoutEditPolicy {
 
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphicalView.java b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphicalView.java
index cb52fdfc1357b8a4f7d78df09750cfc45ca53b74..7322c1e347609b7dbe891ce6a0fb56bb9f353fd6 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphicalView.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/src/org/jkiss/dbeaver/ext/ui/locks/graph/LockGraphicalView.java
@@ -17,12 +17,12 @@
  */
 package org.jkiss.dbeaver.ext.ui.locks.graph;
 
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.editparts.FreeformGraphicalRootEditPart;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
+import org.eclipse.draw2dl.ColorConstants;
+import org.eclipse.gef3.ContextMenuProvider;
+import org.eclipse.gef3.DefaultEditDomain;
+import org.eclipse.gef3.GraphicalViewer;
+import org.eclipse.gef3.editparts.FreeformGraphicalRootEditPart;
+import org.eclipse.gef3.ui.parts.ScrollingGraphicalViewer;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF
index c0af7998c3d17e071690e0797c98743a85b9a5cd..519dd14c04e4f3ac6a8314e90936413c366fee83 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.ui,
- org.eclipse.gef,
+ org.eclipse.gef3,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.erd.ui,
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/ERDExportSVG.java b/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/ERDExportSVG.java
index 197a6a1cadb96b23527675b23354c34c8c11ced5..1762bd4481c3e222d16685cef8a8f3eb22f6bc42 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/ERDExportSVG.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/ERDExportSVG.java
@@ -19,9 +19,10 @@ package org.jkiss.dbeaver.ext.ui.svg;
 import org.apache.batik.ext.awt.image.codec.png.PNGImageWriter;
 import org.apache.batik.ext.awt.image.spi.ImageWriterRegistry;
 import org.apache.batik.svggen.SVGGraphics2D;
-import org.eclipse.draw2d.*;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.editparts.LayerManager;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.*;
+import org.eclipse.draw2dl.geometry.Rectangle;
+import org.eclipse.gef3.editparts.LayerManager;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.erd.ui.export.ERDExportFormatHandler;
@@ -32,7 +33,7 @@ import org.jkiss.dbeaver.ui.UIUtils;
 import org.jkiss.utils.xml.XMLUtils;
 import org.w3c.dom.Document;
 
-import java.awt.Dimension;
+import java.awt.*;
 import java.io.File;
 
 /**
@@ -66,7 +67,7 @@ public class ERDExportSVG implements ERDExportFormatHandler {
             SVGGraphics2D svgGenerator = new SVGGraphics2D(document);
             svgGenerator.setSVGCanvasSize(new Dimension(contentBounds.width, contentBounds.height));
 
-            // We need a converter from Draw2D.Graphics (GEF) to awt.Graphics2D (Batik)
+            // We need a converter from draw2dl.Graphics (.gef3) to awt.Graphics2D (Batik)
             Graphics graphics = new GraphicsToGraphics2DAdaptor(svgGenerator);
 
             // Reset origin to make it the top/left most part of the diagram
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/GraphicsToGraphics2DAdaptor.java b/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/GraphicsToGraphics2DAdaptor.java
index b693f9e0f9c6071a5ae7fecb119bf430648ae3ab..65862d36a93daba1a766991a11bdeebeb017245c 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/GraphicsToGraphics2DAdaptor.java
+++ b/plugins/org.jkiss.dbeaver.ext.ui.svg/src/org/jkiss/dbeaver/ext/ui/svg/GraphicsToGraphics2DAdaptor.java
@@ -11,19 +11,19 @@
  *    		   uses GraphitiUiInternal.getWorkbenchService() instead of 
  *    		   GMF's DisplayUtils, does not implement the interface
  *    		   DrawableRenderedImage, since it is not needed.
- *    RaM - Remove/hide initial viewport/clipping area, so all GEF diagrams fit
+ *    RaM - Remove/hide initial viewport/clipping area, so all .gef3 diagrams fit
  *    			
  ****************************************************************************/
 
 package org.jkiss.dbeaver.ext.ui.svg;
 
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.TextUtilities;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.draw2dl.Graphics;
+import org.eclipse.draw2dl.SWTGraphics;
+import org.eclipse.draw2dl.TextUtilities;
+import org.eclipse.draw2dl.geometry.Dimension;
+import org.eclipse.draw2dl.geometry.Point;
+import org.eclipse.draw2dl.geometry.PointList;
+import org.eclipse.draw2dl.geometry.Rectangle;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.Font;
@@ -38,7 +38,7 @@ import java.awt.image.BufferedImage;
 import java.util.Stack;
 
 /**
- * Objects of this class can be used with draw2d to render to a Graphics2D object.
+ * Objects of this class can be used with draw2dl to render to a Graphics2D object.
  * 
  * @author jschofie / sshaw
  * 
@@ -312,7 +312,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#clipRect(org.eclipse.draw2d.geometry.Rectangle )
+     * @see org.eclipse.draw2dl.Graphics#clipRect(org.eclipse.draw2dl.geometry.Rectangle )
      */
     @Override
     public void clipRect(Rectangle rect)
@@ -331,7 +331,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#dispose()
+     * @see org.eclipse.draw2dl.Graphics#dispose()
      */
     @Override
     public void dispose()
@@ -359,7 +359,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawArc(int, int, int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawArc(int, int, int, int, int, int)
      */
     @Override
     public void drawArc(int x, int y, int width, int height, int startAngle, int endAngle)
@@ -374,7 +374,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillArc(int, int, int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillArc(int, int, int, int, int, int)
      */
     @Override
     public void fillArc(int x, int y, int w, int h, int offset, int length)
@@ -388,7 +388,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawFocus(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawFocus(int, int, int, int)
      */
     @Override
     public void drawFocus(int x, int y, int w, int h)
@@ -454,7 +454,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int)
      */
     @Override
     public void drawImage(Image srcImage, int xpos, int ypos)
@@ -472,7 +472,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int, int, int, int, int, int,
+     * @see org.eclipse.draw2dl.Graphics#drawImage(org.eclipse.swt.graphics.Image, int, int, int, int, int, int, int,
      * int)
      */
     @Override
@@ -488,7 +488,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawLine(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawLine(int, int, int, int)
      */
     @Override
     public void drawLine(int x1, int y1, int x2, int y2)
@@ -503,7 +503,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawOval(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawOval(int, int, int, int)
      */
     @Override
     public void drawOval(int x, int y, int w, int h)
@@ -518,7 +518,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillOval(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillOval(int, int, int, int)
      */
     @Override
     public void fillOval(int x, int y, int w, int h)
@@ -546,7 +546,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawPolygon(org.eclipse.draw2d.geometry.PointList )
+     * @see org.eclipse.draw2dl.Graphics#drawPolygon(org.eclipse.draw2dl.geometry.PointList )
      */
     @Override
     public void drawPolygon(PointList pointList)
@@ -559,7 +559,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillPolygon(org.eclipse.draw2d.geometry.PointList )
+     * @see org.eclipse.draw2dl.Graphics#fillPolygon(org.eclipse.draw2dl.geometry.PointList )
      */
     @Override
     public void fillPolygon(PointList pointList)
@@ -571,7 +571,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawPolyline(org.eclipse.draw2d.geometry. PointList)
+     * @see org.eclipse.draw2dl.Graphics#drawPolyline(org.eclipse.draw2dl.geometry. PointList)
      */
     @Override
     public void drawPolyline(PointList pointList)
@@ -589,7 +589,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawRectangle(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawRectangle(int, int, int, int)
      */
     @Override
     public void drawRectangle(int x, int y, int w, int h)
@@ -604,7 +604,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillRectangle(int, int, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillRectangle(int, int, int, int)
      */
     @Override
     public void fillRectangle(int x, int y, int width, int height)
@@ -618,7 +618,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawRoundRectangle(org.eclipse.draw2d.geometry .Rectangle, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawRoundRectangle(org.eclipse.draw2dl.geometry .Rectangle, int, int)
      */
     @Override
     public void drawRoundRectangle(Rectangle rect, int arcWidth, int arcHeight)
@@ -634,7 +634,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillRoundRectangle(org.eclipse.draw2d.geometry .Rectangle, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillRoundRectangle(org.eclipse.draw2dl.geometry .Rectangle, int, int)
      */
     @Override
     public void fillRoundRectangle(Rectangle rect, int arcWidth, int arcHeight)
@@ -649,7 +649,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawText(java.lang.String, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawText(java.lang.String, int, int)
      */
     @Override
     public void drawText(String s, int x, int y)
@@ -659,7 +659,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawString(java.lang.String, int, int)
+     * @see org.eclipse.draw2dl.Graphics#drawString(java.lang.String, int, int)
      */
     @Override
     public void drawString(String s, int x, int y)
@@ -741,7 +741,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillString(java.lang.String, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillString(java.lang.String, int, int)
      */
     @Override
     public void fillString(String s, int x, int y)
@@ -751,7 +751,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillText(java.lang.String, int, int)
+     * @see org.eclipse.draw2dl.Graphics#fillText(java.lang.String, int, int)
      */
     @Override
     public void fillText(String s, int x, int y)
@@ -761,7 +761,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getBackgroundColor()
+     * @see org.eclipse.draw2dl.Graphics#getBackgroundColor()
      */
     @Override
     public Color getBackgroundColor()
@@ -771,7 +771,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getClip(org.eclipse.draw2d.geometry.Rectangle )
+     * @see org.eclipse.draw2dl.Graphics#getClip(org.eclipse.draw2dl.geometry.Rectangle )
      */
     @Override
     public Rectangle getClip(Rectangle rect)
@@ -789,7 +789,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getFont()
+     * @see org.eclipse.draw2dl.Graphics#getFont()
      */
     @Override
     public Font getFont()
@@ -799,7 +799,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getFontMetrics()
+     * @see org.eclipse.draw2dl.Graphics#getFontMetrics()
      */
     @Override
     public FontMetrics getFontMetrics()
@@ -809,7 +809,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getForegroundColor()
+     * @see org.eclipse.draw2dl.Graphics#getForegroundColor()
      */
     @Override
     public Color getForegroundColor()
@@ -819,7 +819,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getLineStyle()
+     * @see org.eclipse.draw2dl.Graphics#getLineStyle()
      */
     @Override
     public int getLineStyle()
@@ -829,7 +829,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getLineWidth()
+     * @see org.eclipse.draw2dl.Graphics#getLineWidth()
      */
     @Override
     public int getLineWidth()
@@ -845,7 +845,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getXORMode()
+     * @see org.eclipse.draw2dl.Graphics#getXORMode()
      */
     @Override
     public boolean getXORMode()
@@ -855,7 +855,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#popState()
+     * @see org.eclipse.draw2dl.Graphics#popState()
      */
     @Override
     public void popState()
@@ -867,7 +867,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#pushState()
+     * @see org.eclipse.draw2dl.Graphics#pushState()
      */
     @Override
     public void pushState()
@@ -882,7 +882,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#restoreState()
+     * @see org.eclipse.draw2dl.Graphics#restoreState()
      */
     @Override
     public void restoreState()
@@ -928,7 +928,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#scale(double)
+     * @see org.eclipse.draw2dl.Graphics#scale(double)
      */
     @Override
     public void scale(double amount)
@@ -938,7 +938,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setBackgroundColor(org.eclipse.swt.graphics .Color)
+     * @see org.eclipse.draw2dl.Graphics#setBackgroundColor(org.eclipse.swt.graphics .Color)
      */
     @Override
     public void setBackgroundColor(Color rgb)
@@ -949,7 +949,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setClip(org.eclipse.draw2d.geometry.Rectangle )
+     * @see org.eclipse.draw2dl.Graphics#setClip(org.eclipse.draw2dl.geometry.Rectangle )
      */
     @Override
     public void setClip(Rectangle rect)
@@ -999,7 +999,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setFont(org.eclipse.swt.graphics.Font)
+     * @see org.eclipse.draw2dl.Graphics#setFont(org.eclipse.swt.graphics.Font)
      */
     @Override
     public void setFont(Font f)
@@ -1035,7 +1035,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setForegroundColor(org.eclipse.swt.graphics .Color)
+     * @see org.eclipse.draw2dl.Graphics#setForegroundColor(org.eclipse.swt.graphics .Color)
      */
     @Override
     public void setForegroundColor(Color rgb)
@@ -1072,7 +1072,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setLineStyle(int)
+     * @see org.eclipse.draw2dl.Graphics#setLineStyle(int)
      */
     @Override
     public void setLineStyle(int style)
@@ -1110,7 +1110,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setLineWidth(int)
+     * @see org.eclipse.draw2dl.Graphics#setLineWidth(int)
      */
     @Override
     public void setLineWidth(int width)
@@ -1134,7 +1134,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setXORMode(boolean)
+     * @see org.eclipse.draw2dl.Graphics#setXORMode(boolean)
      */
     @Override
     public void setXORMode(boolean xorMode)
@@ -1157,7 +1157,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#translate(int, int)
+     * @see org.eclipse.draw2dl.Graphics#translate(int, int)
      */
     @Override
     public void translate(int dx, int dy)
@@ -1190,7 +1190,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillGradient(int, int, int, int, boolean)
+     * @see org.eclipse.draw2dl.Graphics#fillGradient(int, int, int, int, boolean)
      */
     @Override
     public void fillGradient(int x, int y, int w, int h, boolean vertical)
@@ -1221,7 +1221,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#drawPath(org.eclipse.swt.graphics.Path)
+     * @see org.eclipse.draw2dl.Graphics#drawPath(org.eclipse.swt.graphics.Path)
      */
     @Override
     public void drawPath(Path path)
@@ -1234,7 +1234,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#fillPath(org.eclipse.swt.graphics.Path)
+     * @see org.eclipse.draw2dl.Graphics#fillPath(org.eclipse.swt.graphics.Path)
      */
     @Override
     public void fillPath(Path path)
@@ -1246,7 +1246,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setClip(org.eclipse.swt.graphics.Path)
+     * @see org.eclipse.draw2dl.Graphics#setClip(org.eclipse.swt.graphics.Path)
      */
     @Override
     public void setClip(Path path)
@@ -1269,7 +1269,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getFillRule()
+     * @see org.eclipse.draw2dl.Graphics#getFillRule()
      */
     @Override
     public int getFillRule()
@@ -1279,7 +1279,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setFillRule(int)
+     * @see org.eclipse.draw2dl.Graphics#setFillRule(int)
      */
     @Override
     public void setFillRule(int rule)
@@ -1338,7 +1338,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.DrawableRenderedImage #allowDelayRender()
+     * @see org.eclipse.gmf.runtime.draw2dl.ui.render.awt.internal.DrawableRenderedImage #allowDelayRender()
      */
     public boolean shouldAllowDelayRender()
     {
@@ -1347,7 +1347,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.gmf.runtime.draw2d.ui.render.awt.internal.DrawableRenderedImage #getMaximumRenderSize()
+     * @see org.eclipse.gmf.runtime.draw2dl.ui.render.awt.internal.DrawableRenderedImage #getMaximumRenderSize()
      */
     public Dimension getMaximumRenderSize()
     {
@@ -1366,7 +1366,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#getAntialias()
+     * @see org.eclipse.draw2dl.Graphics#getAntialias()
      */
     @Override
     public int getAntialias()
@@ -1387,7 +1387,7 @@ public class GraphicsToGraphics2DAdaptor extends Graphics
 
     /*
      * (non-Javadoc)
-     * @see org.eclipse.draw2d.Graphics#setAntialias(int)
+     * @see org.eclipse.draw2dl.Graphics#setAntialias(int)
      */
     @Override
     public void setAntialias(int value)
diff --git a/product/debug/DBeaver.product.launch b/product/debug/DBeaver.product.launch
index fc4b361fad8d4e72f412300496cafaf90fe4ed23..86b96e1822d5004fd664b62fead165deb19236f4 100644
--- a/product/debug/DBeaver.product.launch
+++ b/product/debug/DBeaver.product.launch
@@ -80,7 +80,7 @@
         <setEntry value="org.eclipse.core.variables@default:default"/>
         <setEntry value="org.eclipse.debug.core@default:default"/>
         <setEntry value="org.eclipse.debug.ui@default:default"/>
-        <setEntry value="org.eclipse.draw2d@default:default"/>
+        <setEntry value="org.eclipse.draw2dl@default:default"/>
         <setEntry value="org.eclipse.e4.core.commands@default:default"/>
         <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
         <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
@@ -158,7 +158,7 @@
         <setEntry value="org.eclipse.equinox.security@default:default"/>
         <setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
         <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
-        <setEntry value="org.eclipse.gef@default:default"/>
+        <setEntry value="org.eclipse.gef3@default:default"/>
         <setEntry value="org.eclipse.help@default:default"/>
         <setEntry value="org.eclipse.jface.databinding@default:default"/>
         <setEntry value="org.eclipse.jface.notifications@default:default"/>