From 817834adc546527ad0a997a55de8456d02c812a2 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Tue, 4 May 2021 16:04:35 -0400
Subject: [PATCH] Refactor Connectors as a Live Path Effect

---
 po/POTFILES.src.in                            |    4 +
 .../scalable/actions/draw-connector-point.svg |   23 +
 .../scalable/actions/connector-jump-arc.svg   |   14 +
 .../scalable/actions/connector-line.svg       |  119 ++
 .../scalable/actions/draw-connector-point.svg |   23 +
 .../actions/connector-jump-arc-symbolic.svg   |   11 +
 .../actions/connector-line-symbolic.svg       |  150 ++
 .../actions/draw-connector-point-symbolic.svg |   23 +
 .../actions/connector-jump-arc-symbolic.svg   |   11 +
 .../actions/connector-line-symbolic.svg       |   78 +
 .../actions/draw-connector-point-symbolic.svg |   23 +
 share/ui/toolbar-connector.ui                 |  181 +-
 src/CMakeLists.txt                            |    2 -
 src/actions/actions-tools.cpp                 |    7 +-
 src/attributes.cpp                            |   13 +-
 src/attributes.h                              |   13 +-
 src/conn-avoid-ref.cpp                        |  395 ----
 src/conn-avoid-ref.h                          |   77 -
 src/display/control/canvas-item-enums.h       |    6 +
 src/document.cpp                              |   87 +-
 src/document.h                                |    5 +-
 src/doxygen-main.dox                          |    1 -
 src/live_effects/CMakeLists.txt               |    8 +
 src/live_effects/effect-enum.h                |    4 +
 src/live_effects/effect.cpp                   |   75 +-
 src/live_effects/effect.h                     |    9 +-
 src/live_effects/lpe-connector-avoid.cpp      |  246 +++
 src/live_effects/lpe-connector-avoid.h        |   62 +
 src/live_effects/lpe-connector-line.cpp       |  857 +++++++++
 src/live_effects/lpe-connector-line.h         |  149 ++
 src/live_effects/parameter/item-reference.cpp |   47 +
 src/live_effects/parameter/item-reference.h   |   53 +
 src/live_effects/parameter/item.cpp           |  295 +++
 src/live_effects/parameter/item.h             |   78 +
 src/live_effects/parameter/path-reference.cpp |    3 +-
 src/object/CMakeLists.txt                     |    6 +-
 src/object/README                             |    2 -
 src/object/algorithms/graphlayout.cpp         |   62 +-
 src/object/algorithms/graphlayout.h           |    2 -
 src/object/sp-conn-end-pair.cpp               |  390 ----
 src/object/sp-conn-end-pair.h                 |   95 -
 src/object/sp-conn-end.cpp                    |  275 ---
 src/object/sp-conn-end.h                      |   71 -
 src/object/sp-ellipse.cpp                     |    9 +
 src/object/sp-ellipse.h                       |    2 +
 src/object/sp-factory.cpp                     |    2 +
 src/object/sp-item-group.cpp                  |    8 +
 src/object/sp-item-group.h                    |    1 +
 src/object/sp-item.cpp                        |   62 +-
 src/object/sp-item.h                          |   16 +-
 src/object/sp-lpe-item.cpp                    |   32 +
 src/object/sp-lpe-item.h                      |    2 +
 src/object/sp-namedview.cpp                   |    7 -
 src/object/sp-namedview.h                     |    2 -
 src/object/sp-object.cpp                      |    8 +-
 src/object/sp-object.h                        |    8 +-
 src/object/sp-path.cpp                        |   19 +-
 src/object/sp-path.h                          |    3 -
 src/object/sp-point.cpp                       |  235 +++
 src/object/sp-point.h                         |   72 +
 src/object/sp-rect.cpp                        |   13 +
 src/object/sp-rect.h                          |    2 +
 src/object/sp-shape.cpp                       |   11 +-
 src/object/sp-shape.h                         |    1 +
 src/object/sp-use.cpp                         |   24 +
 src/object/sp-use.h                           |    1 +
 src/object/tags.h                             |    1 +
 src/path-chemistry.cpp                        |    9 +
 src/path/path-outline.cpp                     |   56 +-
 src/path/path-outline.h                       |   11 +-
 src/selection-chemistry.cpp                   |   33 -
 src/snap.cpp                                  |    8 +-
 src/ui/CMakeLists.txt                         |    2 +
 src/ui/dialog/inkscape-preferences.cpp        |   36 +-
 src/ui/dialog/inkscape-preferences.h          |    1 +
 src/ui/knot/knot-holder-entity.cpp            |    3 +
 src/ui/knot/knot-holder-entity.h              |    6 +
 src/ui/knot/knot-holder.cpp                   |   29 +
 src/ui/knot/knot-holder.h                     |    6 +-
 src/ui/knot/knot.cpp                          |    2 +
 src/ui/knot/knot.h                            |    2 +
 src/ui/shape-editor-knotholders.cpp           |    7 +
 src/ui/toolbar/connector-toolbar.cpp          |  375 ++--
 src/ui/toolbar/connector-toolbar.h            |   66 +-
 src/ui/tools/connector-tool-knotholders.cpp   |  491 +++++
 src/ui/tools/connector-tool-knotholders.h     |  180 ++
 src/ui/tools/connector-tool.cpp               | 1698 ++++++-----------
 src/ui/tools/connector-tool.h                 |  228 +--
 src/ui/tools/lpe-tool.cpp                     |    4 +-
 src/ui/tools/node-tool.cpp                    |    7 +-
 src/ui/tools/pages-tool.cpp                   |    4 +-
 src/ui/widget/desktop-widget.cpp              |    5 -
 testfiles/src/attributes-test.cpp             |   15 +-
 testfiles/src/sp-object-tags-test.cpp         |    2 +
 94 files changed, 4678 insertions(+), 3204 deletions(-)
 create mode 100644 share/icons/Tango/scalable/actions/draw-connector-point.svg
 create mode 100644 share/icons/hicolor/scalable/actions/connector-jump-arc.svg
 create mode 100644 share/icons/hicolor/scalable/actions/connector-line.svg
 create mode 100644 share/icons/hicolor/scalable/actions/draw-connector-point.svg
 create mode 100644 share/icons/hicolor/symbolic/actions/connector-jump-arc-symbolic.svg
 create mode 100644 share/icons/hicolor/symbolic/actions/connector-line-symbolic.svg
 create mode 100644 share/icons/hicolor/symbolic/actions/draw-connector-point-symbolic.svg
 create mode 100644 share/icons/multicolor/symbolic/actions/connector-jump-arc-symbolic.svg
 create mode 100644 share/icons/multicolor/symbolic/actions/connector-line-symbolic.svg
 create mode 100644 share/icons/multicolor/symbolic/actions/draw-connector-point-symbolic.svg
 delete mode 100644 src/conn-avoid-ref.cpp
 delete mode 100644 src/conn-avoid-ref.h
 create mode 100644 src/live_effects/lpe-connector-avoid.cpp
 create mode 100644 src/live_effects/lpe-connector-avoid.h
 create mode 100644 src/live_effects/lpe-connector-line.cpp
 create mode 100644 src/live_effects/lpe-connector-line.h
 create mode 100644 src/live_effects/parameter/item-reference.cpp
 create mode 100644 src/live_effects/parameter/item-reference.h
 create mode 100644 src/live_effects/parameter/item.cpp
 create mode 100644 src/live_effects/parameter/item.h
 delete mode 100644 src/object/sp-conn-end-pair.cpp
 delete mode 100644 src/object/sp-conn-end-pair.h
 delete mode 100644 src/object/sp-conn-end.cpp
 delete mode 100644 src/object/sp-conn-end.h
 create mode 100644 src/object/sp-point.cpp
 create mode 100644 src/object/sp-point.h
 create mode 100644 src/ui/tools/connector-tool-knotholders.cpp
 create mode 100644 src/ui/tools/connector-tool-knotholders.h

diff --git a/po/POTFILES.src.in b/po/POTFILES.src.in
index ec4a0d8361..38d30c08c6 100644
--- a/po/POTFILES.src.in
+++ b/po/POTFILES.src.in
@@ -164,6 +164,8 @@ ${_build_dir}/share/templates/templates.h
 ../src/live_effects/lpe-bspline.cpp
 ../src/live_effects/lpe-circle_with_radius.cpp
 ../src/live_effects/lpe-clone-original.cpp
+../src/live_effects/lpe-connector-line.cpp
+../src/live_effects/lpe-connector-line.h
 ../src/live_effects/lpe-constructgrid.cpp
 ../src/live_effects/lpe-copy_rotate.cpp
 ../src/live_effects/lpe-curvestitch.cpp
@@ -211,6 +213,7 @@ ${_build_dir}/share/templates/templates.h
 ../src/live_effects/parameter/enum.h
 ../src/live_effects/parameter/enumarray.h
 ../src/live_effects/parameter/fontbutton.cpp
+../src/live_effects/parameter/item.cpp
 ../src/live_effects/parameter/nodesatellitesarray.cpp
 ../src/live_effects/parameter/originalpath.cpp
 ../src/live_effects/parameter/originalsatellite.cpp
@@ -366,6 +369,7 @@ ${_build_dir}/share/templates/templates.h
 ../src/ui/tools/booleans-tool.cpp
 ../src/ui/tools/box3d-tool.cpp
 ../src/ui/tools/calligraphic-tool.cpp
+../src/ui/tools/connector-tool-knotholders.cpp
 ../src/ui/tools/connector-tool.cpp
 ../src/ui/tools/dropper-tool.cpp
 ../src/ui/tools/eraser-tool.cpp
diff --git a/share/icons/Tango/scalable/actions/draw-connector-point.svg b/share/icons/Tango/scalable/actions/draw-connector-point.svg
new file mode 100644
index 0000000000..6ee8047c61
--- /dev/null
+++ b/share/icons/Tango/scalable/actions/draw-connector-point.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg1" width="24.065848" height="24.007398" version="1.1" sodipodi:docname="draw-connector-point.svg" inkscape:version="1.1 (1:1.1+202105261517+ce6663b3b7)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview id="base" showgrid="true" pagecolor="#ffffff" bordercolor="#999999" borderopacity="1" inkscape:pageshadow="0" inkscape:pageopacity="0" inkscape:pagecheckerboard="0" inkscape:zoom="21.659989" inkscape:cx="12.026783" inkscape:cy="13.342573" inkscape:window-width="1534" inkscape:window-height="843" inkscape:window-x="66" inkscape:window-y="20" inkscape:window-maximized="1" inkscape:current-layer="svg1">
+    <inkscape:grid id="GridFromPre046Settings" type="xygrid" originx="0pt" originy="0pt" spacingx="1pt" spacingy="1pt" color="#3f3fff" empcolor="#3f3fff" opacity="0.15" empopacity="0.38" empspacing="5" />
+  </sodipodi:namedview>
+  <defs id="defs3">
+    <linearGradient id="linearGradient5704">
+      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1" />
+      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient id="linearGradient700">
+      <stop id="stop347" offset="0" style="stop-color:#376796;stop-opacity:1" />
+      <stop id="stop348" offset="1" style="stop-color:#b0dde2;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient id="linearGradient6684">
+      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1" />
+      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <g aria-label="X" id="text1879" style="font-size:27.4347px;line-height:1.25;-inkscape-font-specification:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#3465a4;stroke-width:0.41152">
+    <path d="m 12.187243,9.7042593 3.670462,-7.4748841 h 2.880108 l -5.077027,9.6718038 5.184194,9.832553 H 15.938081 L 12.187243,14.12489 8.4230089,21.733732 H 5.5161095 L 10.727095,11.901179 5.6232763,2.2293752 h 2.8667118 z" style="font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, '" id="path4495" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/connector-jump-arc.svg b/share/icons/hicolor/scalable/actions/connector-jump-arc.svg
new file mode 100644
index 0000000000..f46f3b081f
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/connector-jump-arc.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg1" width="11.223939" height="10.880276" version="1.1" sodipodi:docname="connector-jump-arc.svg" inkscape:version="1.1 (1:1.1+202105261517+ce6663b3b7)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview id="base" showgrid="true" pagecolor="#ffffff" bordercolor="#999999" borderopacity="1" inkscape:pageshadow="0" inkscape:pageopacity="0" inkscape:pagecheckerboard="0" inkscape:snap-global="false" inkscape:zoom="38.049646" inkscape:cx="6.6229262" inkscape:cy="6.9908666" inkscape:window-width="1534" inkscape:window-height="843" inkscape:window-x="66" inkscape:window-y="20" inkscape:window-maximized="1" inkscape:current-layer="svg1">
+    <inkscape:grid id="GridFromPre046Settings" type="xygrid" originx="0pt" originy="0pt" spacingx="1pt" spacingy="1pt" color="#3f3fff" empcolor="#3f3fff" opacity="0.15" empopacity="0.38" empspacing="5" />
+  </sodipodi:namedview>
+  <defs id="defs3">
+    <linearGradient id="linearGradient10585">
+      <stop id="stop10587" offset="0" style="stop-color:#d7d7d7;stop-opacity:1" />
+      <stop id="stop10595" offset="1" style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <path style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:bevel;-inkscape-stroke:none;paint-order:stroke markers fill" d="M 5.3261719,2.5351563 C 4.7497505,2.5366975 4.174265,2.7309306 3.6835938,3.1191406 2.824161,3.7990941 2.375064,4.9391984 2.2617188,6.1660156 H 0.74414062 a 0.5,0.5 0 0 0 -0.49999999,0.5 0.5,0.5 0 0 0 0.49999999,0.5 H 2.6660156 l 0.5,-0.5 C 3.1626235,5.4974161 3.636231,4.4331565 4.3046875,3.9042969 4.9731417,3.3754282 5.686049,3.3736363 6.3554687,3.8984375 7.0248863,4.4232477 7.4999999,5.483734 7.5,6.6523437 l 0.5,0.5 h 2.302734 a 0.5,0.5 0 0 0 0.5,-0.5 0.5,0.5 0 0 0 -0.5,-0.5 H 8.4023438 C 8.2856852,4.9255013 7.8348762,3.7872916 6.9726562,3.1113281 6.4805715,2.7255512 5.9025932,2.533615 5.3261719,2.5351563 Z" id="path1650" />
+  <path style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:bevel;-inkscape-stroke:none;paint-order:stroke markers fill" d="m 5.28125,4.6816406 a 0.5,0.5 0 0 0 -0.5,0.5 v 4.2207032 a 0.5,0.5 0 0 0 0.5,0.5 0.5,0.5 0 0 0 0.5,-0.5 V 5.1816406 a 0.5,0.5 0 0 0 -0.5,-0.5 z" id="path1552" />
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/connector-line.svg b/share/icons/hicolor/scalable/actions/connector-line.svg
new file mode 100644
index 0000000000..b96f0ea70c
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/connector-line.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg1"
+   width="16"
+   height="16"
+   version="1.1"
+   sodipodi:docname="connector-line.svg"
+   inkscape:version="1.0.2 (1.0.2+r75+1)">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     id="base"
+     showgrid="true"
+     inkscape:document-rotation="0"
+     inkscape:snap-global="false"
+     inkscape:zoom="27.902088"
+     inkscape:cx="4.2407176"
+     inkscape:cy="6.6961783"
+     inkscape:window-width="1534"
+     inkscape:window-height="843"
+     inkscape:window-x="66"
+     inkscape:window-y="20"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg1">
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0pt"
+       originy="0pt"
+       spacingx="1pt"
+       spacingy="1pt"
+       color="#3f3fff"
+       empcolor="#3f3fff"
+       opacity="0.15"
+       empopacity="0.38"
+       empspacing="5" />
+  </sodipodi:namedview>
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient10585">
+      <stop
+         id="stop10587"
+         offset="0"
+         style="stop-color:#d7d7d7;stop-opacity:1" />
+      <stop
+         id="stop10595"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8278-4"
+       inkscape:collect="always"
+       x1="5.6449151"
+       x2="13.52223"
+       xlink:href="#linearGradient10585"
+       y1="209.9819"
+       y2="214.7789" />
+  </defs>
+  <g
+     id="connector-avoid"
+     inkscape:label="#g8327"
+     transform="matrix(1.332753,0,0,1.337164,-684.13361,-481.79788)"
+     style="stroke-width:0.749088">
+    <path
+       d="m 516.40632,362.93118 0.01,3.32006 h 5.75544 l -0.01,3.51335"
+       id="path12164"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       style="fill:none;stroke:#3c3c3c;stroke-width:0.749088px;stroke-linecap:round;stroke-opacity:0.830601" />
+    <g
+       id="use5787"
+       style="stroke:#000000;stroke-width:0.749088"
+       transform="matrix(0.689556,0,0,0.507098,506.5653,256.2643)">
+      <rect
+         height="2.0118859"
+         id="rect8286"
+         style="fill:none;stroke-width:1.26678;stroke-linejoin:round;stroke-miterlimit:0"
+         width="4.5088892"
+         x="11.95337"
+         y="207.90994" />
+    </g>
+    <g
+       id="use5790"
+       style="stroke:#000000;stroke-width:0.749088"
+       transform="matrix(0.689556,0,0,0.507098,513.514,265.2668)">
+      <rect
+         height="2.0118859"
+         id="rect8282"
+         style="fill:none;stroke-width:1.26678;stroke-linejoin:round;stroke-miterlimit:0"
+         width="4.5088892"
+         x="10.519018"
+         y="206.30666" />
+    </g>
+    <g
+       id="use5814"
+       style="stroke:url(#linearGradient8278-4);stroke-width:0.749088"
+       transform="matrix(0.625904,0,0,0.672041,509.1746,223.3273)" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/scalable/actions/draw-connector-point.svg b/share/icons/hicolor/scalable/actions/draw-connector-point.svg
new file mode 100644
index 0000000000..6ee8047c61
--- /dev/null
+++ b/share/icons/hicolor/scalable/actions/draw-connector-point.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg1" width="24.065848" height="24.007398" version="1.1" sodipodi:docname="draw-connector-point.svg" inkscape:version="1.1 (1:1.1+202105261517+ce6663b3b7)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview id="base" showgrid="true" pagecolor="#ffffff" bordercolor="#999999" borderopacity="1" inkscape:pageshadow="0" inkscape:pageopacity="0" inkscape:pagecheckerboard="0" inkscape:zoom="21.659989" inkscape:cx="12.026783" inkscape:cy="13.342573" inkscape:window-width="1534" inkscape:window-height="843" inkscape:window-x="66" inkscape:window-y="20" inkscape:window-maximized="1" inkscape:current-layer="svg1">
+    <inkscape:grid id="GridFromPre046Settings" type="xygrid" originx="0pt" originy="0pt" spacingx="1pt" spacingy="1pt" color="#3f3fff" empcolor="#3f3fff" opacity="0.15" empopacity="0.38" empspacing="5" />
+  </sodipodi:namedview>
+  <defs id="defs3">
+    <linearGradient id="linearGradient5704">
+      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1" />
+      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient id="linearGradient700">
+      <stop id="stop347" offset="0" style="stop-color:#376796;stop-opacity:1" />
+      <stop id="stop348" offset="1" style="stop-color:#b0dde2;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient id="linearGradient6684">
+      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1" />
+      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <g aria-label="X" id="text1879" style="font-size:27.4347px;line-height:1.25;-inkscape-font-specification:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#3465a4;stroke-width:0.41152">
+    <path d="m 12.187243,9.7042593 3.670462,-7.4748841 h 2.880108 l -5.077027,9.6718038 5.184194,9.832553 H 15.938081 L 12.187243,14.12489 8.4230089,21.733732 H 5.5161095 L 10.727095,11.901179 5.6232763,2.2293752 h 2.8667118 z" style="font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, '" id="path4495" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/connector-jump-arc-symbolic.svg b/share/icons/hicolor/symbolic/actions/connector-jump-arc-symbolic.svg
new file mode 100644
index 0000000000..69b4c63e84
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/connector-jump-arc-symbolic.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+
+<svg version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="connector-jump-arc-symbolic.svg" inkscape:version="1.1 (1:1.1+202105261517+ce6663b3b7)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs10" />
+  <sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="41.25" inkscape:cx="8" inkscape:cy="8" inkscape:window-width="1534" inkscape:window-height="843" inkscape:window-x="66" inkscape:window-y="20" inkscape:window-maximized="1" inkscape:current-layer="svg1" pagecolor="#ffffff" bordercolor="#999999" borderopacity="1" inkscape:pageshadow="0" inkscape:pageopacity="0" inkscape:pagecheckerboard="0">
+    <inkscape:grid type="xygrid" id="grid" />
+  </sodipodi:namedview>
+  <path style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:bevel;-inkscape-stroke:none;paint-order:stroke markers fill" d="M 7.7281801,3.853519 C 6.9608378,3.855619 6.1947413,4.114137 5.5415512,4.630929 4.3974591,5.536095 3.7996133,7.053822 3.6487262,8.686982 H 1.6284994 A 0.6656088,0.6656088 0 0 0 0.96289057,9.352591 0.6656088,0.6656088 0 0 0 1.6284994,10.0182 H 4.1869332 L 4.852542,9.352591 C 4.848022,7.796931 5.478501,6.38017 6.3683621,5.676143 7.2582201,4.972103 8.2072548,4.969718 9.0983981,5.668343 9.9895386,6.366979 10.622018,7.778717 10.622018,9.334391 L 11.287626,10 h 3.065442 A 0.6656088,0.6656088 0 0 0 15.018677,9.334391 0.6656088,0.6656088 0 0 0 14.353068,8.668782 H 11.823234 C 11.667937,7.035588 11.067812,5.520383 9.920009,4.620529 9.2649371,4.106976 8.4955223,3.851467 7.7281801,3.853519 Z" id="path1650" />
+  <path style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:bevel;-inkscape-stroke:none;paint-order:stroke markers fill" d="M 7.6683793,6.710956 A 0.6656088,0.6656088 0 0 0 7.0027705,7.376565 V 12.99524 A 0.6656088,0.6656088 0 0 0 7.6683793,13.660849 0.6656088,0.6656088 0 0 0 8.3339881,12.99524 V 7.376565 A 0.6656088,0.6656088 0 0 0 7.6683793,6.710956 Z" id="path1552" />
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/connector-line-symbolic.svg b/share/icons/hicolor/symbolic/actions/connector-line-symbolic.svg
new file mode 100644
index 0000000000..6ebae50c47
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/connector-line-symbolic.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   inkscape:version="1.1-dev (8e2f2691a3, 2020-10-30, custom)"
+   sodipodi:docname="lpe-connector-symbolic.svg.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <style
+     id="s0">.success { fill: #009909; }
+.warning { fill: #FF1990; }
+.error { fill: #00AAFF; }
+</style>
+  <style
+     id="s2"> 
+     @import '../../highlights.css'; 
+  </style>
+  <metadata
+     id="metadata1678">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs1676">
+    <inkscape:path-effect
+       effect="join_type"
+       id="path-effect876"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="butt"
+       line_width="1"
+       linejoin_type="extrp_arc"
+       miter_limit="100"
+       attempt_force_join="true" />
+    <inkscape:path-effect
+       effect="join_type"
+       id="path-effect874"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="butt"
+       line_width="1"
+       linejoin_type="round"
+       miter_limit="100"
+       attempt_force_join="true" />
+    <inkscape:path-effect
+       effect="join_type"
+       id="path-effect872"
+       is_visible="true"
+       lpeversion="1"
+       linecap_type="butt"
+       line_width="1"
+       linejoin_type="miter"
+       miter_limit="100"
+       attempt_force_join="true" />
+    <inkscape:path-effect
+       hide_knots="false"
+       only_selected="true"
+       apply_with_radius="true"
+       apply_no_radius="true"
+       use_knot_distance="false"
+       flexible="false"
+       chamfer_steps="1"
+       radius="0"
+       mode="F"
+       method="auto"
+       unit="px"
+       satellites_param="F,0,0,1,0,2,0,1 @ F,0,0,1,0,2,0,1 @ F,0,0,1,0,2,0,1 @ F,0,0,1,0,2,0,1 | F,0,1,1,0,0,0,1 @ F,0,1,1,0,0,0,1 @ F,0,1,1,0,0,0,1 @ F,0,1,1,0,0,0,1"
+       is_visible="true"
+       id="path-effect957"
+       effect="fillet_chamfer" />
+    <inkscape:path-effect
+       attempt_force_join="true"
+       miter_limit="100"
+       linejoin_type="round"
+       line_width="2.5"
+       linecap_type="round"
+       is_visible="true"
+       id="path-effect4438"
+       effect="join_type" />
+  </defs>
+  <sodipodi:namedview
+     inkscape:snap-global="true"
+     inkscape:document-rotation="0"
+     inkscape:current-layer="g896"
+     inkscape:window-maximized="1"
+     inkscape:window-y="27"
+     inkscape:window-x="0"
+     inkscape:window-height="960"
+     inkscape:window-width="1280"
+     inkscape:cy="5.625"
+     inkscape:cx="8.3035714"
+     inkscape:zoom="11.2"
+     showgrid="false"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10"
+     inkscape:snap-bbox="false"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-nodes="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       id="grid"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     inkscape:label="draw-rectangle"
+     id="g0">
+    <path
+       id="background"
+       d="M 0,0 H 16 V 16 H 0 Z"
+       style="opacity:0"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g896"
+       transform="translate(-0.05701687)">
+      <path
+         d="m 10.943746,10.015446 -0.40996,0.0051 c -3.0338435,0 -1.0823275,-5.9999995 -5.1150525,-5.9999692 l -0.4633565,-0.0051 -0.011006,0.9999394 0.4688595,0.00513 c 3.035059,0 1.083241,5.9999995 5.1266835,5.9999615 l 0.416088,-0.0051 z"
+         id="path892"
+         sodipodi:nodetypes="cccc"
+         inkscape:path-effect="#path-effect874"
+         inkscape:original-d="m 10.949874,10.515408 -0.416088,0.0051 c -3.535579,0 -1.583912,-5.9999995 -5.1205555,-5.9999995 l -0.4633565,-0.0051" />
+    </g>
+    <path
+       id="circle898"
+       style="fill:#000000;stroke-width:3.19471"
+       d="m 14.892857,10.520485 c 0,0.828428 -0.671573,1.5 -1.5,1.5 -0.828427,0 -1.5,-0.671572 -1.5,-1.5 0,-0.8284266 0.671573,-1.4999995 1.5,-1.4999995 0.828427,0 1.5,0.6715729 1.5,1.4999995 z"
+       sodipodi:nodetypes="sssss" />
+    <path
+       id="circle884"
+       style="fill:#000000;stroke-width:3.19471"
+       d="m 3.9429821,4.5204855 c 0,0.8284271 -0.671573,1.5 -1.5,1.5 -0.828427,0 -1.49999997,-0.6715729 -1.49999997,-1.5 0,-0.8284271 0.67157297,-1.5 1.49999997,-1.5 0.828427,0 1.5,0.6715729 1.5,1.5 z"
+       sodipodi:nodetypes="sssss" />
+  </g>
+</svg>
diff --git a/share/icons/hicolor/symbolic/actions/draw-connector-point-symbolic.svg b/share/icons/hicolor/symbolic/actions/draw-connector-point-symbolic.svg
new file mode 100644
index 0000000000..6ee8047c61
--- /dev/null
+++ b/share/icons/hicolor/symbolic/actions/draw-connector-point-symbolic.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg1" width="24.065848" height="24.007398" version="1.1" sodipodi:docname="draw-connector-point.svg" inkscape:version="1.1 (1:1.1+202105261517+ce6663b3b7)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview id="base" showgrid="true" pagecolor="#ffffff" bordercolor="#999999" borderopacity="1" inkscape:pageshadow="0" inkscape:pageopacity="0" inkscape:pagecheckerboard="0" inkscape:zoom="21.659989" inkscape:cx="12.026783" inkscape:cy="13.342573" inkscape:window-width="1534" inkscape:window-height="843" inkscape:window-x="66" inkscape:window-y="20" inkscape:window-maximized="1" inkscape:current-layer="svg1">
+    <inkscape:grid id="GridFromPre046Settings" type="xygrid" originx="0pt" originy="0pt" spacingx="1pt" spacingy="1pt" color="#3f3fff" empcolor="#3f3fff" opacity="0.15" empopacity="0.38" empspacing="5" />
+  </sodipodi:namedview>
+  <defs id="defs3">
+    <linearGradient id="linearGradient5704">
+      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1" />
+      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient id="linearGradient700">
+      <stop id="stop347" offset="0" style="stop-color:#376796;stop-opacity:1" />
+      <stop id="stop348" offset="1" style="stop-color:#b0dde2;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient id="linearGradient6684">
+      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1" />
+      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <g aria-label="X" id="text1879" style="font-size:27.4347px;line-height:1.25;-inkscape-font-specification:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#3465a4;stroke-width:0.41152">
+    <path d="m 12.187243,9.7042593 3.670462,-7.4748841 h 2.880108 l -5.077027,9.6718038 5.184194,9.832553 H 15.938081 L 12.187243,14.12489 8.4230089,21.733732 H 5.5161095 L 10.727095,11.901179 5.6232763,2.2293752 h 2.8667118 z" style="font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, '" id="path4495" />
+  </g>
+</svg>
diff --git a/share/icons/multicolor/symbolic/actions/connector-jump-arc-symbolic.svg b/share/icons/multicolor/symbolic/actions/connector-jump-arc-symbolic.svg
new file mode 100644
index 0000000000..69b4c63e84
--- /dev/null
+++ b/share/icons/multicolor/symbolic/actions/connector-jump-arc-symbolic.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) and export_objects.py -->
+
+<svg version="1.1" id="svg1" width="16" height="16" viewBox="0 0 16 16" sodipodi:docname="connector-jump-arc-symbolic.svg" inkscape:version="1.1 (1:1.1+202105261517+ce6663b3b7)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <defs id="defs10" />
+  <sodipodi:namedview objecttolerance="10" gridtolerance="10" guidetolerance="10" id="namedview" showgrid="true" inkscape:zoom="41.25" inkscape:cx="8" inkscape:cy="8" inkscape:window-width="1534" inkscape:window-height="843" inkscape:window-x="66" inkscape:window-y="20" inkscape:window-maximized="1" inkscape:current-layer="svg1" pagecolor="#ffffff" bordercolor="#999999" borderopacity="1" inkscape:pageshadow="0" inkscape:pageopacity="0" inkscape:pagecheckerboard="0">
+    <inkscape:grid type="xygrid" id="grid" />
+  </sodipodi:namedview>
+  <path style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:bevel;-inkscape-stroke:none;paint-order:stroke markers fill" d="M 7.7281801,3.853519 C 6.9608378,3.855619 6.1947413,4.114137 5.5415512,4.630929 4.3974591,5.536095 3.7996133,7.053822 3.6487262,8.686982 H 1.6284994 A 0.6656088,0.6656088 0 0 0 0.96289057,9.352591 0.6656088,0.6656088 0 0 0 1.6284994,10.0182 H 4.1869332 L 4.852542,9.352591 C 4.848022,7.796931 5.478501,6.38017 6.3683621,5.676143 7.2582201,4.972103 8.2072548,4.969718 9.0983981,5.668343 9.9895386,6.366979 10.622018,7.778717 10.622018,9.334391 L 11.287626,10 h 3.065442 A 0.6656088,0.6656088 0 0 0 15.018677,9.334391 0.6656088,0.6656088 0 0 0 14.353068,8.668782 H 11.823234 C 11.667937,7.035588 11.067812,5.520383 9.920009,4.620529 9.2649371,4.106976 8.4955223,3.851467 7.7281801,3.853519 Z" id="path1650" />
+  <path style="color:#000000;fill:#000000;stroke-linecap:round;stroke-linejoin:bevel;-inkscape-stroke:none;paint-order:stroke markers fill" d="M 7.6683793,6.710956 A 0.6656088,0.6656088 0 0 0 7.0027705,7.376565 V 12.99524 A 0.6656088,0.6656088 0 0 0 7.6683793,13.660849 0.6656088,0.6656088 0 0 0 8.3339881,12.99524 V 7.376565 A 0.6656088,0.6656088 0 0 0 7.6683793,6.710956 Z" id="path1552" />
+</svg>
diff --git a/share/icons/multicolor/symbolic/actions/connector-line-symbolic.svg b/share/icons/multicolor/symbolic/actions/connector-line-symbolic.svg
new file mode 100644
index 0000000000..fdb81546a1
--- /dev/null
+++ b/share/icons/multicolor/symbolic/actions/connector-line-symbolic.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:version="1.0.2 (1.0.2+r75+1)"
+   sodipodi:docname="connector-line-symbolic.svg"
+   viewBox="0 0 16 16"
+   height="16"
+   width="16"
+   id="svg1"
+   version="1.1">
+  <metadata
+     id="metadata5591">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs5589" />
+  <style
+     id="s0">
+.success { fill:#009909; }
+.warning { fill:#FF1990; }
+.error { fill:#00AAFF; }
+</style>
+  <style
+     id="s2">
+@import '../../highlights.css';
+</style>
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:current-layer="svg1"
+     inkscape:window-maximized="1"
+     inkscape:window-y="20"
+     inkscape:window-x="66"
+     inkscape:window-height="843"
+     inkscape:window-width="1534"
+     inkscape:cy="7.8529884"
+     inkscape:cx="11.869011"
+     inkscape:zoom="30.834811"
+     showgrid="true"
+     id="namedview"
+     guidetolerance="10"
+     gridtolerance="10"
+     objecttolerance="10">
+    <inkscape:grid
+       id="grid"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     id="g852">
+    <path
+       style="opacity:1"
+       d="M 6,3 V 3.5 9 h 4 v 3.5 0.5 h 1 V 12.5 8 H 7 V 3.5 3 Z"
+       id="path845"
+       class="success" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect16122-3"
+       d="m 4,2 h 5 c 0.554,0 1,0.446 1,1 V 4 C 10,4.554 9.554,5 9,5 H 4 C 3.446,5 3,4.554 3,4 V 3 C 3,2.446 3.446,2 4,2 Z"
+       sodipodi:nodetypes="sssssssss" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect16124-6"
+       d="m 8,12 h 5 c 0.554,0 1,0.446 1,1 v 1 c 0,0.554 -0.446,1 -1,1 H 8 C 7.446,15 7,14.554 7,14 v -1 c 0,-0.554 0.446,-1 1,-1 z"
+       sodipodi:nodetypes="sssssssss" />
+  </g>
+</svg>
diff --git a/share/icons/multicolor/symbolic/actions/draw-connector-point-symbolic.svg b/share/icons/multicolor/symbolic/actions/draw-connector-point-symbolic.svg
new file mode 100644
index 0000000000..6ee8047c61
--- /dev/null
+++ b/share/icons/multicolor/symbolic/actions/draw-connector-point-symbolic.svg
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg id="svg1" width="24.065848" height="24.007398" version="1.1" sodipodi:docname="draw-connector-point.svg" inkscape:version="1.1 (1:1.1+202105261517+ce6663b3b7)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview id="base" showgrid="true" pagecolor="#ffffff" bordercolor="#999999" borderopacity="1" inkscape:pageshadow="0" inkscape:pageopacity="0" inkscape:pagecheckerboard="0" inkscape:zoom="21.659989" inkscape:cx="12.026783" inkscape:cy="13.342573" inkscape:window-width="1534" inkscape:window-height="843" inkscape:window-x="66" inkscape:window-y="20" inkscape:window-maximized="1" inkscape:current-layer="svg1">
+    <inkscape:grid id="GridFromPre046Settings" type="xygrid" originx="0pt" originy="0pt" spacingx="1pt" spacingy="1pt" color="#3f3fff" empcolor="#3f3fff" opacity="0.15" empopacity="0.38" empspacing="5" />
+  </sodipodi:namedview>
+  <defs id="defs3">
+    <linearGradient id="linearGradient5704">
+      <stop id="stop5706" offset="0" style="stop-color:#5a5a5a;stop-opacity:1" />
+      <stop id="stop5708" offset="1" style="stop-color:#000000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient id="linearGradient700">
+      <stop id="stop347" offset="0" style="stop-color:#376796;stop-opacity:1" />
+      <stop id="stop348" offset="1" style="stop-color:#b0dde2;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient id="linearGradient6684">
+      <stop id="stop6686" offset="0" style="stop-color:#ffbf00;stop-opacity:1" />
+      <stop id="stop6688" offset="1" style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+  </defs>
+  <g aria-label="X" id="text1879" style="font-size:27.4347px;line-height:1.25;-inkscape-font-specification:sans-serif;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#3465a4;stroke-width:0.41152">
+    <path d="m 12.187243,9.7042593 3.670462,-7.4748841 h 2.880108 l -5.077027,9.6718038 5.184194,9.832553 H 15.938081 L 12.187243,14.12489 8.4230089,21.733732 H 5.5161095 L 10.727095,11.901179 5.6232763,2.2293752 h 2.8667118 z" style="font-family:'Roboto Condensed';-inkscape-font-specification:'Roboto Condensed, '" id="path4495" />
+  </g>
+</svg>
diff --git a/share/ui/toolbar-connector.ui b/share/ui/toolbar-connector.ui
index 15b7b1d2e1..3582441fc7 100644
--- a/share/ui/toolbar-connector.ui
+++ b/share/ui/toolbar-connector.ui
@@ -1,185 +1,150 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <object class="GtkAdjustment" id="_curvature_adj">
-    <property name="upper">100</property>
-    <property name="step-increment">1</property>
+  <object class="GtkAdjustment" id="curvature_adj">
     <property name="page-increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="upper">100</property>
   </object>
-  <object class="GtkAdjustment" id="_length_adj">
-    <property name="lower">10</property>
-    <property name="upper">1000</property>
-    <property name="step-increment">10</property>
-    <property name="page-increment">100</property>
-  </object>
-  <object class="GtkAdjustment" id="_spacing_adj">
+  <object class="GtkAdjustment" id="steps_adj">
+    <property name="page-increment">10</property>
+    <property name="step-increment">1</property>
     <property name="upper">100</property>
+  </object>
+  <object class="GtkAdjustment" id="spacing_adj">
+    <property name="page-increment">10</property>
     <property name="step-increment">1</property>
+    <property name="upper">100</property>
+  </object>
+  <object class="GtkAdjustment" id="jump_size_adj">
     <property name="page-increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="upper">100</property>
   </object>
   <object class="GtkBox" id="connector-toolbar">
     <property name="halign">start</property>
-    <property name="valign">center</property>
     <property name="hexpand">True</property>
+    <property name="valign">center</property>
     <child>
-      <object class="GtkButton" id="avoid_btn">
-        <property name="valign">center</property>
-        <property name="focusable">True</property>
-        <property name="receives-default">True</property>
-        <property name="tooltip-text" translatable="yes">Make connectors avoid selected objects</property>
+      <object class="GtkToggleButton" id="line_tool">
+        <property name="icon-name">draw-path</property>
+        <property name="tooltip-text">Selecting and drawing connected lines</property>
         <property name="has-frame">False</property>
-        <child>
-          <object class="GtkImage" id="image1">
-            <property name="icon-name">connector-avoid</property>
-          </object>
-        </child>
       </object>
     </child>
     <child>
-      <object class="GtkButton" id="ignore_btn">
-        <property name="valign">center</property>
-        <property name="focusable">True</property>
-        <property name="receives-default">True</property>
-        <property name="tooltip-text" translatable="yes">Make connectors ignore selected objects</property>
+      <object class="GtkToggleButton" id="point_tool">
+        <property name="icon-name">draw-connector-point</property>
+        <property name="tooltip-text">Creating and moving sub-points</property>
         <property name="has-frame">False</property>
-        <child>
-          <object class="GtkImage" id="image2">
-            <property name="icon-name">connector-ignore</property>
-          </object>
-        </child>
       </object>
     </child>
     <child>
-      <object class="GtkToggleButton" id="_orthogonal_btn">
-        <property name="valign">center</property>
-        <property name="focusable">True</property>
-        <property name="receives-default">True</property>
-        <property name="tooltip-text" translatable="yes">Make connector orthogonal or polyline</property>
+      <object class="GtkSeparator"/>
+    </child>
+    <child>
+      <object class="GtkToggleButton" id="avoid">
+        <property name="icon-name">connector-avoid</property>
+        <property name="tooltip-text">Make connector avoid or ignore selected objects</property>
         <property name="has-frame">False</property>
-        <child>
-          <object class="GtkImage" id="image3">
-            <property name="icon-name">connector-orthogonal</property>
-          </object>
-        </child>
       </object>
     </child>
     <child>
-      <object class="GtkSeparator">
+      <object class="GtkToggleButton" id="orthogonal">
+        <property name="icon-name">connector-orthogonal</property>
+        <property name="tooltip-text">Make connector orthogonal or polyline</property>
+        <property name="has-frame">False</property>
       </object>
     </child>
     <child>
-      <object class="GtkBox" id="curvature_box">
+      <object class="GtkSeparator"/>
+    </child>
+    <child>
+      <object class="GtkBox">
         <property name="tooltip-text" translatable="yes">The amount of connectors curvature</property>
         <child>
           <object class="GtkLabel">
+            <property name="label" translatable="yes">Curve:</property>
             <property name="margin-start">5</property>
-            <property name="label" translatable="yes">Curvature:</property>
           </object>
         </child>
         <child>
-          <object class="GtkSpinButton" id="_curvature_item">
+          <object class="GtkSpinButton" id="curvature_item">
+            <property name="adjustment">curvature_adj</property>
+            <property name="climb-rate">0.10</property>
             <property name="focusable">True</property>
-            <property name="width-chars">5</property>
             <property name="text">0.000</property>
-            <property name="adjustment">_curvature_adj</property>
-            <property name="climb-rate">0.10</property>
+            <property name="width-chars">5</property>
           </object>
         </child>
       </object>
     </child>
     <child>
-      <object class="GtkBox" id="spacing_box">
-        <property name="tooltip-text" translatable="yes">The amount of space left around objects by auto-routing connectors</property>
+      <object class="GtkBox">
+        <property name="tooltip-text" translatable="yes">The number of steps to automatically add</property>
         <child>
           <object class="GtkLabel">
+            <property name="label">Steps:</property>
             <property name="margin-start">5</property>
-            <property name="label" translatable="yes">Spacing:</property>
           </object>
         </child>
         <child>
-          <object class="GtkSpinButton" id="_spacing_item">
+          <object class="GtkSpinButton" id="steps_item">
+            <property name="adjustment">steps_adj</property>
+            <property name="climb-rate">0.10</property>
             <property name="focusable">True</property>
+            <property name="text">0.000</property>
             <property name="width-chars">5</property>
-            <property name="text" translatable="yes">0</property>
-            <property name="adjustment">_spacing_adj</property>
-            <property name="climb-rate">0.10</property>
-            <property name="value">0.01</property>
           </object>
         </child>
       </object>
     </child>
     <child>
-      <object class="GtkButton" id="graph_btn">
-        <property name="valign">center</property>
-        <property name="focusable">True</property>
-        <property name="receives-default">True</property>
-        <property name="tooltip-text" translatable="yes">Nicely arrange selected connector network</property>
-        <property name="has-frame">False</property>
-        <style>
-            <class name="priority1"/>
-        </style>
+      <object class="GtkBox">
+        <property name="tooltip-text" translatable="yes">The amount of space left around objects by auto-routing connectors</property>
         <child>
-          <object class="GtkImage" id="image4">
-            <property name="icon-name">distribute-graph</property>
+          <object class="GtkLabel">
+            <property name="label" translatable="yes">Spacing:</property>
+            <property name="margin-start">5</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="spacing_item">
+            <property name="adjustment">spacing_adj</property>
+            <property name="climb-rate">0.10</property>
+            <property name="focusable">True</property>
+            <property name="text">0</property>
+            <property name="value">0.01</property>
+            <property name="width-chars">5</property>
           </object>
         </child>
       </object>
     </child>
     <child>
-      <object class="GtkBox" id="length_box">
-        <property name="tooltip-text" translatable="yes">Ideal length for connectors when layout is applied</property>
-        <style>
-            <class name="priority1"/>
-        </style>
+      <object class="GtkBox">
+        <property name="tooltip-text" translatable="yes">The size of the jumps as lines cross</property>
         <child>
           <object class="GtkLabel">
+            <property name="label">Jump:</property>
             <property name="margin-start">5</property>
-            <property name="label" translatable="yes">Length:</property>
           </object>
         </child>
         <child>
-          <object class="GtkSpinButton" id="_length_item">
+          <object class="GtkSpinButton" id="jump_item">
+            <property name="adjustment">jump_size_adj</property>
+            <property name="climb-rate">0.10</property>
             <property name="focusable">True</property>
+            <property name="text">0</property>
             <property name="width-chars">7</property>
-            <property name="text" translatable="yes">0</property>
-            <property name="adjustment">_length_adj</property>
-            <property name="climb-rate">0.10</property>
           </object>
         </child>
       </object>
     </child>
     <child>
-      <object class="GtkToggleButton" id="_directed_btn">
-        <property name="valign">center</property>
-        <property name="focusable">True</property>
-        <property name="receives-default">True</property>
-        <property name="tooltip-text" translatable="yes">Make connectors with end-markers (arrows) point downwards</property>
+      <object class="GtkToggleButton" id="jump_type">
+        <property name="icon-name">connector-jump-arc</property>
+        <property name="tooltip-text">The type of jump to make</property>
         <property name="has-frame">False</property>
-        <style>
-            <class name="priority1"/>
-        </style>
-        <child>
-          <object class="GtkImage" id="image5">
-            <property name="icon-name">distribute-graph-directed</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkToggleButton" id="_overlap_btn">
-        <property name="valign">center</property>
-        <property name="focusable">True</property>
-        <property name="receives-default">True</property>
-        <property name="tooltip-text" translatable="yes">Do not allow overlapping shapes</property>
-        <property name="has-frame">False</property>
-        <style>
-            <class name="priority1"/>
-        </style>
-        <child>
-          <object class="GtkImage" id="image6">
-            <property name="icon-name">distribute-remove-overlaps</property>
-          </object>
-        </child>
       </object>
     </child>
     <style>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e620d538e..7f329579b0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,6 @@ set(inkscape_SRC
   axis-manip.cpp
   composite-undo-stack-observer.cpp
   conditions.cpp
-  conn-avoid-ref.cpp
   console-output-undo-observer.cpp
   context-fns.cpp
   desktop-events.cpp
@@ -91,7 +90,6 @@ set(inkscape_SRC
   bad-uri-exception.h
   composite-undo-stack-observer.h
   conditions.h
-  conn-avoid-ref.h
   console-output-undo-observer.h
   context-fns.h
   desktop-events.h
diff --git a/src/actions/actions-tools.cpp b/src/actions/actions-tools.cpp
index 33f9b12ed6..8c85489a5b 100644
--- a/src/actions/actions-tools.cpp
+++ b/src/actions/actions-tools.cpp
@@ -32,10 +32,10 @@
 #include "object/sp-text.h"
 #include "object/sp-marker.h"
 
+#include "live_effects/lpe-connector-line.h"
 #include "ui/dialog/dialog-container.h"
 #include "ui/dialog/dialog-manager.h"
 #include "ui/dialog/inkscape-preferences.h"
-#include "ui/tools/connector-tool.h"
 #include "ui/tools/text-tool.h"
 
 class ToolData {
@@ -178,10 +178,9 @@ set_active_tool(InkscapeWindow *win, SPItem *item, Geom::Point const p)
     } else if (is<SPMarker>(item)) {
         tool_switch("Marker", win);
     } else if (is<SPPath>(item)) {
-        if (Inkscape::UI::Tools::cc_item_is_connector(item)) {
+        if (Inkscape::LivePathEffect::isConnector(item)) {
             tool_switch("Connector", win);
-        }
-        else {
+        } else {
             tool_switch("Node", win);
         }
     } else if (is<SPText>(item) || is<SPFlowtext>(item))  {
diff --git a/src/attributes.cpp b/src/attributes.cpp
index 99657120d1..1209bd0f6b 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -46,8 +46,6 @@ static SPStyleProp const props[] = {
     {SPAttr::TRANSFORM, "transform"},
     {SPAttr::SODIPODI_TYPE, "sodipodi:type"},
     {SPAttr::SODIPODI_INSENSITIVE, "sodipodi:insensitive"},
-    {SPAttr::CONNECTOR_AVOID, "inkscape:connector-avoid"},
-    {SPAttr::CONNECTION_POINTS, "inkscape:connection-points"},
     {SPAttr::TRANSFORM_CENTER_X, "inkscape:transform-center-x"},
     {SPAttr::TRANSFORM_CENTER_Y, "inkscape:transform-center-y"},
     {SPAttr::INKSCAPE_PATH_EFFECT, "inkscape:path-effect"},
@@ -167,14 +165,6 @@ static SPStyleProp const props[] = {
     {SPAttr::SVG_DPI, "inkscape:svg-dpi"},
     /* SPPath */
     {SPAttr::INKSCAPE_ORIGINAL_D, "inkscape:original-d"},
-    /* (Note: XML representation of connectors may change in future.) */
-    {SPAttr::CONNECTOR_TYPE, "inkscape:connector-type"},
-    {SPAttr::CONNECTOR_CURVATURE, "inkscape:connector-curvature"},
-    {SPAttr::INKSCAPE_CONNECTOR_SPACING, "inkscape:connector-spacing"},
-    {SPAttr::CONNECTION_START, "inkscape:connection-start"},
-    {SPAttr::CONNECTION_END, "inkscape:connection-end"},
-    {SPAttr::CONNECTION_START_POINT, "inkscape:connection-start-point"},
-    {SPAttr::CONNECTION_END_POINT, "inkscape:connection-end-point"},
     /* SPRect */
     {SPAttr::RX, "rx"},
     {SPAttr::RY, "ry"},
@@ -592,6 +582,9 @@ static SPStyleProp const props[] = {
     {SPAttr::INKSCAPE_DESK_COLOR, "inkscape:deskcolor"},
     {SPAttr::INKSCAPE_DESK_OPACITY, "inkscape:deskopacity"},
     {SPAttr::INKSCAPE_DESK_CHECKERBOARD, "inkscape:pagecheckerboard"}, // old attr
+
+    /* Connectors */
+    {SPAttr::VIRTUAL_POINT_REF, "inkscape:original-point"},
     // rendering mode
     {SPAttr::INKSCAPE_CLIP_TO_PAGE_RENDERING, "inkscape:clip-to-page"},
     {SPAttr::INKSCAPE_ANTIALIAS_RENDERING, "inkscape:antialias-rendering"},
diff --git a/src/attributes.h b/src/attributes.h
index f42ab8a935..156c2fe4a6 100644
--- a/src/attributes.h
+++ b/src/attributes.h
@@ -44,8 +44,6 @@ enum class SPAttr {
     TRANSFORM,
     SODIPODI_TYPE,
     SODIPODI_INSENSITIVE,
-    CONNECTOR_AVOID,
-    CONNECTION_POINTS,
     TRANSFORM_CENTER_X,
     TRANSFORM_CENTER_Y,
     INKSCAPE_PATH_EFFECT,
@@ -167,13 +165,6 @@ enum class SPAttr {
     /* SPPath */
     // D,  Promoted to property in SVG 2
     INKSCAPE_ORIGINAL_D,
-    CONNECTOR_TYPE,
-    CONNECTOR_CURVATURE,
-    INKSCAPE_CONNECTOR_SPACING,
-    CONNECTION_START,
-    CONNECTION_END,
-    CONNECTION_START_POINT,
-    CONNECTION_END_POINT,
     /* SPRect */
     RX,
     RY,
@@ -594,6 +585,10 @@ enum class SPAttr {
     INKSCAPE_DESK_COLOR,
     INKSCAPE_DESK_OPACITY,
     INKSCAPE_DESK_CHECKERBOARD,
+
+    /* SPPoint to VirtualPoint Ref */
+    VIRTUAL_POINT_REF,
+
     // Inkscape-specific mode: clip content rendering to pages' boundaries
     INKSCAPE_CLIP_TO_PAGE_RENDERING,
     INKSCAPE_ANTIALIAS_RENDERING,
diff --git a/src/conn-avoid-ref.cpp b/src/conn-avoid-ref.cpp
deleted file mode 100644
index 19413a7b6b..0000000000
--- a/src/conn-avoid-ref.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * A class for handling shape interaction with libavoid.
- *
- * Authors:
- *   Michael Wybrow <mjwybrow@users.sourceforge.net>
- *   Abhishek Sharma
- *
- * Copyright (C) 2005 Michael Wybrow
- *
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-
-#include <cstring>
-#include <string>
-#include <iostream>
-
-#include <2geom/convex-hull.h>
-#include <2geom/line.h>
-
-#include "conn-avoid-ref.h"
-#include "desktop.h"
-#include "document-undo.h"
-#include "document.h"
-#include "inkscape.h"
-#include "layer-manager.h"
-
-#include "display/curve.h"
-
-#include "3rdparty/adaptagrams/libavoid/router.h"
-#include "3rdparty/adaptagrams/libavoid/shape.h"
-
-#include "object/sp-namedview.h"
-#include "object/sp-shape.h"
-
-#include "svg/stringstream.h"
-
-#include "xml/node.h"
-
-using Inkscape::DocumentUndo;
-
-using Avoid::Router;
-
-static Avoid::Polygon avoid_item_poly(SPItem const *item);
-
-
-SPAvoidRef::SPAvoidRef(SPItem *spitem)
-    : shapeRef(nullptr)
-    , item(spitem)
-    , setting(false)
-    , new_setting(false)
-    , _transformed_connection()
-{
-}
-
-
-SPAvoidRef::~SPAvoidRef()
-{
-    _transformed_connection.disconnect();
-
-    // If the document is being destroyed then the router instance
-    // and the ShapeRefs will have been destroyed with it.
-    Router *router = item->document->getRouter();
-
-    if (shapeRef && router) {
-        router->deleteShape(shapeRef);
-    }
-    shapeRef = nullptr;
-}
-
-
-void SPAvoidRef::setAvoid(char const *value)
-{
-    // Don't keep avoidance information for cloned objects.
-    if ( !item->cloned ) {
-        new_setting = false;
-        if (value && (strcmp(value, "true") == 0)) {
-            new_setting = true;
-        }
-    }
-}
-
-void SPAvoidRef::handleSettingChange()
-{
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop == nullptr) {
-        return;
-    }
-    if (desktop->getDocument() != item->document) {
-        // We don't want to go any further if the active desktop's document
-        // isn't the same as the document that this item is part of.  This
-        // case can happen if a new document is loaded from the file chooser
-        // or via the recent file menu.  In this case, we can end up here
-        // as a result of a ensureUpToDate performed on a
-        // document not yet attached to the active desktop.
-        return;
-    }
-
-    if (new_setting == setting) {
-        // Don't need to make any changes
-        return;
-    }
-    setting = new_setting;
-
-    Router *router = item->document->getRouter();
-
-    _transformed_connection.disconnect();
-    if (new_setting) {
-        Avoid::Polygon poly = avoid_item_poly(item);
-        if (poly.size() > 0) {
-            _transformed_connection = item->connectTransformed(
-                    sigc::ptr_fun(&avoid_item_move));
-
-            char const *id = item->getAttribute("id");
-            g_assert(id != nullptr);
-
-            // Get a unique ID for the item.
-            GQuark itemID = g_quark_from_string(id);
-
-            shapeRef = new Avoid::ShapeRef(router, poly, itemID);
-        }
-    }
-    else if (shapeRef)
-    {
-        router->deleteShape(shapeRef);
-        shapeRef = nullptr;
-    }
-}
-
-
-std::vector<SPItem *> SPAvoidRef::getAttachedShapes(const unsigned int type)
-{
-    std::vector<SPItem *> list;
-
-    Avoid::IntList shapes;
-    GQuark shapeId = g_quark_from_string(item->getId());
-    item->document->getRouter()->attachedShapes(shapes, shapeId, type);
-
-    for (auto const shape: shapes) {
-        auto const connId = g_quark_to_string(shape);
-        SPObject *obj = item->document->getObjectById(connId);
-        if (obj == nullptr) {
-            g_warning("getAttachedShapes: Object with id=\"%s\" is not "
-                      "found. Skipping.", connId);
-            continue;
-        }
-        auto shapeItem = cast<SPItem>(obj);
-        list.push_back(shapeItem);
-    }
-    return list;
-}
-
-
-std::vector<SPItem *> SPAvoidRef::getAttachedConnectors(const unsigned int type)
-{
-    std::vector<SPItem *> list;
-
-    Avoid::IntList conns;
-    GQuark shapeId = g_quark_from_string(item->getId());
-    item->document->getRouter()->attachedConns(conns, shapeId, type);
-
-    for (auto const conn: conns) {
-        auto const connId = g_quark_to_string(conn);
-        SPObject *obj = item->document->getObjectById(connId);
-        if (obj == nullptr) {
-            g_warning("getAttachedConnectors: Object with id=\"%s\" is not "
-                      "found. Skipping.", connId);
-            continue;
-        }
-        auto connItem = cast<SPItem>(obj);
-        list.push_back(connItem);
-    }
-    return list;
-}
-
-Geom::Point SPAvoidRef::getConnectionPointPos()
-{
-    g_assert(item);
-    // the center is all we are interested in now; we used to care
-    // about non-center points, but that's moot.
-    Geom::OptRect bbox = item->documentVisualBounds();
-    return (bbox) ? bbox->midpoint() : Geom::Point(0, 0);
-}
-
-static std::vector<Geom::Point> approxCurveWithPoints(SPCurve const *curve)
-{
-    // The number of segments to use for not straight curves approximation
-    const unsigned NUM_SEGS = 4;
-    
-    const Geom::PathVector& curve_pv = curve->get_pathvector();
-   
-    // The structure to hold the output
-    std::vector<Geom::Point> poly_points;
-
-    // Iterate over all curves, adding the endpoints for linear curves and
-    // sampling the other curves
-    double seg_size = 1.0 / NUM_SEGS;
-    double at;
-    at = 0;
-    Geom::PathVector::const_iterator pit = curve_pv.begin();
-    while (pit != curve_pv.end())
-    {
-        Geom::Path::const_iterator cit = pit->begin();
-        while (cit != pit->end())
-        {
-            if (cit == pit->begin())
-            {
-                poly_points.push_back(cit->initialPoint());
-            }
-
-            if (dynamic_cast<Geom::CubicBezier const*>(&*cit))
-            {
-                at += seg_size;
-                if (at <= 1.0 )
-                    poly_points.push_back(cit->pointAt(at));
-                else
-                {
-                    at = 0.0;
-                    ++cit;
-                }
-            }
-            else
-            {
-                poly_points.push_back(cit->finalPoint());
-                ++cit;
-            }
-        }
-        ++pit;
-    }
-    return poly_points;
-}
-
-static std::vector<Geom::Point> approxItemWithPoints(SPItem const *item, const Geom::Affine& item_transform)
-{
-    auto item_mutable = const_cast<SPItem *>(item);
-
-    if (auto group = cast<SPGroup>(item_mutable)) {
-        std::vector<Geom::Point> poly_points;
-        // consider all first-order children
-        std::vector<SPItem*> itemlist = group->item_list();
-        for (auto child_item : itemlist) {
-            std::vector<Geom::Point> child_points = approxItemWithPoints(child_item, item_transform * child_item->transform);
-            poly_points.insert(poly_points.end(), child_points.begin(), child_points.end());
-        }
-        return poly_points;
-    } else if (auto shape = cast<SPShape>(item_mutable)) {
-        shape->set_shape();
-        // make sure it has an associated curve
-        if (shape->curve()) {
-            auto item_curve = *shape->curve();
-            // apply transformations (up to common ancestor)
-            item_curve.transform(item_transform);
-            return approxCurveWithPoints(&item_curve);
-        } else {
-            return {};
-        }
-    } else {
-        if (auto bbox = item->documentPreferredBounds()) {
-            auto item_curve = SPCurve(*bbox);
-            return approxCurveWithPoints(&item_curve);
-        } else {
-            return {};
-        }
-    }
-}
-
-static Avoid::Polygon avoid_item_poly(SPItem const *item)
-{
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    g_assert(desktop != nullptr);
-    auto const spacing = desktop->getNamedView()->connector_spacing;
-
-    Geom::Affine itd_mat = item->i2doc_affine();
-    std::vector<Geom::Point> hull_points;
-    hull_points = approxItemWithPoints(item, itd_mat);
-
-    // create convex hull from all sampled points
-    Geom::ConvexHull hull(hull_points);
-
-    // enlarge path by "desktop->namedview->connector_spacing"
-    // store expanded convex hull in Avoid::Polygn
-    Avoid::Polygon poly;
-    if (hull.empty()) {
-        return poly;
-    }
-
-    Geom::Line hull_edge(hull.back(), hull.front());
-    Geom::Line prev_parallel_hull_edge;
-    prev_parallel_hull_edge.setOrigin(hull_edge.origin() + hull_edge.versor().ccw() * spacing);
-    prev_parallel_hull_edge.setVector(hull_edge.versor());
-
-    std::size_t const hull_size = hull.size();
-    for (std::size_t i = 0; i < hull_size; ++i)
-    {
-        if (i + 1 == hull_size) {
-            hull_edge.setPoints(hull.back(), hull.front());
-        } else {
-            hull_edge.setPoints(hull[i], hull[i + 1]);
-        }
-
-        Geom::Line parallel_hull_edge;
-        parallel_hull_edge.setOrigin(hull_edge.origin() + hull_edge.versor().ccw() * spacing);
-        parallel_hull_edge.setVector(hull_edge.versor());
-
-        // determine the intersection point
-        try {
-            Geom::OptCrossing int_pt = Geom::intersection(parallel_hull_edge, prev_parallel_hull_edge);
-            if (int_pt) {
-                Avoid::Point avoid_pt((parallel_hull_edge.origin()+parallel_hull_edge.versor()*int_pt->ta)[Geom::X],
-                                        (parallel_hull_edge.origin()+parallel_hull_edge.versor()*int_pt->ta)[Geom::Y]);
-                poly.ps.push_back(avoid_pt);
-            } else {
-                // something went wrong...
-                std::cerr<<"conn-avoid-ref.cpp: avoid_item_poly: Geom:intersection failed."<<std::endl;
-            }
-        } catch (Geom::InfiniteSolutions const &e) {
-            // the parallel_hull_edge and prev_parallel_hull_edge lie on top of each other, hence infinite crossings
-            g_message("conn-avoid-ref.cpp: trying to get crossings of identical lines");
-        }
-
-        prev_parallel_hull_edge = parallel_hull_edge;
-    }
-
-    return poly;
-}
-
-static inline void get_avoided_items_rec(std::vector<SPItem *> &list, SPObject *from, SPDesktop *desktop, bool initialised);
-
-std::vector<SPItem *> get_avoided_items(SPObject *from, SPDesktop *desktop, bool initialised)
-{
-    std::vector<SPItem *> list;
-    get_avoided_items_rec(list, from, desktop, initialised);
-    return list;
-}
-
-static inline void get_avoided_items_rec(std::vector<SPItem *> &list, SPObject *from, SPDesktop *desktop, bool initialised)
-{
-    for (auto &child: from->children) {
-        if (is<SPItem>(&child) &&
-            !desktop->layerManager().isLayer(cast<SPItem>(&child)) &&
-            !cast_unsafe<SPItem>(&child)->isLocked() &&
-            !desktop->itemIsHidden(cast<SPItem>(&child)) &&
-            (!initialised || cast<SPItem>(&child)->getAvoidRef().shapeRef)
-            )
-        {
-            list.push_back(cast<SPItem>(&child));
-        }
-
-        if (is<SPItem>(&child) && desktop->layerManager().isLayer(cast<SPItem>(&child))) {
-            get_avoided_items_rec(list, &child, desktop, initialised);
-        }
-    }
-}
-
-
-void avoid_item_move(Geom::Affine const */*mp*/, SPItem *moved_item)
-{
-    Avoid::ShapeRef *shapeRef = moved_item->getAvoidRef().shapeRef;
-    g_assert(shapeRef);
-
-    Router *router = moved_item->document->getRouter();
-    Avoid::Polygon poly = avoid_item_poly(moved_item);
-    if (!poly.empty()) {
-        router->moveShape(shapeRef, poly);
-    }
-}
-
-
-void init_avoided_shape_geometry(SPDesktop *desktop)
-{
-    // Don't count this as changes to the document,
-    // it is basically just late initialisation.
-    SPDocument *document = desktop->getDocument();
-    DocumentUndo::ScopedInsensitive _no_undo(document);
-
-    bool initialised = false;
-    auto items = get_avoided_items(desktop->layerManager().currentRoot(), desktop, initialised);
-
-    for (auto item : items) {
-        item->getAvoidRef().handleSettingChange();
-    }
-}
-
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/conn-avoid-ref.h b/src/conn-avoid-ref.h
deleted file mode 100644
index 84b396d66d..0000000000
--- a/src/conn-avoid-ref.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/** \file
- * A class for handling shape interaction with libavoid.
- */
-/*
- * Authors:
- *   Michael Wybrow <mjwybrow@users.sourceforge.net>
- *
- * Copyright (C) 2005 Michael Wybrow
- *
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-#ifndef SEEN_CONN_AVOID_REF
-#define SEEN_CONN_AVOID_REF
-
-#include <2geom/point.h>
-#include <cstddef>
-#include <sigc++/connection.h>
-
-class  SPDesktop;
-class SPObject;
-class  SPItem;
-namespace Avoid { class ShapeRef; }
-
-class SPAvoidRef {
-public:
-    SPAvoidRef(SPItem *spitem);
-    virtual ~SPAvoidRef();
-
-    // libavoid's internal representation of the item.
-    Avoid::ShapeRef *shapeRef;
-
-    void setAvoid(char const *value);
-    void handleSettingChange();
-
-    Geom::Point getConnectionPointPos();
-
-    // Returns a list of SPItems of all connectors/shapes attached to
-    // this object.  Pass one of the following for 'type':
-    //     Avoid::runningTo
-    //     Avoid::runningFrom
-    //     Avoid::runningToAndFrom
-    std::vector<SPItem *> getAttachedShapes(const unsigned int type);
-    std::vector<SPItem *> getAttachedConnectors(const unsigned int type);
-
-private:
-    SPItem *item;
-
-    // true if avoiding, false if not.
-    bool setting;
-    bool new_setting;
-
-    // A sigc connection for transformed signal.
-    sigc::connection _transformed_connection;
-};
-
-extern std::vector<SPItem *> get_avoided_items(SPObject *from,
-        SPDesktop *desktop, bool initialised = true);
-extern void avoid_item_move(Geom::Affine const *mp, SPItem *moved_item);
-extern void init_avoided_shape_geometry(SPDesktop *desktop);
-
-static const double defaultConnSpacing = 3.0;
-static const double defaultConnCurvature = 3.0;
-
-#endif /* !SEEN_CONN_AVOID_REF */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/display/control/canvas-item-enums.h b/src/display/control/canvas-item-enums.h
index 77b7cc0c15..bfe07523c0 100644
--- a/src/display/control/canvas-item-enums.h
+++ b/src/display/control/canvas-item-enums.h
@@ -63,6 +63,12 @@ enum CanvasItemCtrlType {
     CANVAS_ITEM_CTRL_TYPE_NODE_SMOOTH,
     CANVAS_ITEM_CTRL_TYPE_NODE_SYMMETRICAL,
     CANVAS_ITEM_CTRL_TYPE_INVISIPOINT,
+    CANVAS_ITEM_CTRL_TYPE_CONNECT_ITEM,
+    CANVAS_ITEM_CTRL_TYPE_CONNECT_POINT,
+    CANVAS_ITEM_CTRL_TYPE_CONNECT_HINT,
+    CANVAS_ITEM_CTRL_TYPE_CONNECT_CHECKPOINT,
+    CANVAS_ITEM_CTRL_TYPE_CONNECT_MIDPOINT,
+    CANVAS_ITEM_CTRL_TYPE_CONNECTION,
     CANVAS_ITEM_CTRL_TYPE_GUIDE_HANDLE,
     CANVAS_ITEM_CTRL_TYPE_POINTER, // pointy, triangular handle
     CANVAS_ITEM_CTRL_TYPE_MOVE,
diff --git a/src/document.cpp b/src/document.cpp
index 1c38c34faa..a5cd121fe4 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -115,7 +115,6 @@ SPDocument::SPDocument() :
     document_name(nullptr),
     actionkey(),
     object_id_counter(1),
-    _router(std::make_unique<Avoid::Router>(Avoid::PolyLineRouting|Avoid::OrthogonalRouting)),
     current_persp3d(nullptr),
     current_persp3d_impl(nullptr),
     _activexmltree(nullptr)
@@ -135,10 +134,6 @@ SPDocument::SPDocument() :
         _doc2dt[3] = -1;
     }
 
-    // Penalise libavoid for choosing paths with needless extra segments.
-    // This results in much better looking orthogonal connector paths.
-    _router->setRoutingPenalty(Avoid::segmentPenalty);
-
     _serial = next_serial++;
 
     sensitive = false;
@@ -206,7 +201,6 @@ SPDocument::~SPDocument() {
     }
 
     modified_connection.disconnect();
-    rerouting_connection.disconnect();
 
     if (keepalive) {
         inkscape_unref(INKSCAPE);
@@ -1401,12 +1395,6 @@ void SPDocument::requestModified()
             Glib::signal_idle().connect(sigc::mem_fun(*this, &SPDocument::idle_handler),
                                         SP_DOCUMENT_UPDATE_PRIORITY);
     }
-
-    if (rerouting_connection.empty()) {
-        rerouting_connection =
-            Glib::signal_idle().connect(sigc::mem_fun(*this, &SPDocument::rerouting_handler),
-                                        SP_DOCUMENT_REROUTING_PRIORITY);
-    }
 }
 
 void SPDocument::setupViewport(SPItemCtx *ctx)
@@ -1453,40 +1441,22 @@ SPDocument::_updateDocument(int update_flags)
  * more than 32 iterations.  So we bail out if we hit 32 iterations,
  * since this typically indicates we're stuck in an update loop.
  */
-gint SPDocument::ensureUpToDate()
+int SPDocument::ensureUpToDate()
 {
-    // Bring the document up-to-date, specifically via the following:
-    //   1a) Process all document updates.
-    //   1b) When completed, process connector routing changes.
-    //   2a) Process any updates resulting from connector reroutings.
+    // Bring the document up-to-date
     int counter = 32;
-    for (unsigned int pass = 1; pass <= 2; ++pass) {
-        // Process document updates.
-        while (!_updateDocument(0)) {
-            if (counter == 0) {
-                g_warning("More than 32 iteration while updating document '%s'", document_filename);
-                break;
-            }
-            counter--;
-        }
-        if (counter == 0)
-        {
+    while (!_updateDocument(0)) {
+        if (counter == 0) {
+            g_warning("More than 32 iterations while updating document '%s'", document_filename);
             break;
         }
-
-        // After updates on the first pass we get libavoid to process all the
-        // changed objects and provide new routings.  This may cause some objects
-            // to be modified, hence the second update pass.
-        if (pass == 1) {
-            _router->processTransaction();
-        }
+        counter--;
     }
 
-    // Remove handlers
+    // Remove idle handler
     modified_connection.disconnect();
-    rerouting_connection.disconnect();
 
-    return (counter > 0);
+    return counter > 0;
 }
 
 /**
@@ -1503,22 +1473,6 @@ SPDocument::idle_handler()
     return status;
 }
 
-/**
- * An idle handler to reroute connectors in the document.
- */
-bool
-SPDocument::rerouting_handler()
-{
-    // Process any queued movement actions and determine new routings for
-    // object-avoiding connectors.  Callbacks will be used to update and
-    // redraw affected connectors.
-    _router->processTransaction();
-
-    // We don't need to handle rerouting again until there are further
-    // diagram updates.
-    return false;
-}
-
 static bool is_within(Geom::Rect const &area, Geom::Rect const &box)
 {
     return area.contains(box);
@@ -2300,6 +2254,31 @@ SPDocument::install_reference_document::~install_reference_document() {
     _parent->set_reference_document(nullptr);
 }
 
+/**
+ * Generate a libavoid router specific to this document on demand.
+ */
+Avoid::Router *SPDocument::getRouter()
+{
+    if (!_router) {
+        _router = std::make_unique<Avoid::Router>(Avoid::PolyLineRouting | Avoid::OrthogonalRouting);
+    }
+
+    auto prefs = Inkscape::Preferences::get();
+    // Load penalty options from inkscape settings, this could be done via a PrefsObserver instead of
+    // at each read of the router. But this is a quick and dirty way of making sure the prefs are up to date.
+    _router->setRoutingPenalty(Avoid::anglePenalty, prefs->getDouble("/tools/connector/penalty/angle", 0));
+    _router->setRoutingPenalty(Avoid::segmentPenalty, prefs->getDouble("/tools/connector/penalty/segment", 20));
+    _router->setRoutingPenalty(Avoid::crossingPenalty, prefs->getDouble("/tools/connector/penalty/crossing", 0));
+    _router->setRoutingPenalty(Avoid::shapeBufferDistance, prefs->getDouble("/tools/connector/penalty/shape_buffer", 0));
+    _router->setRoutingPenalty(Avoid::portDirectionPenalty, prefs->getDouble("/tools/connector/penalty/port_direction", 1000));
+    _router->setRoutingPenalty(Avoid::idealNudgingDistance, prefs->getDouble("/tools/connector/penalty/ideal_nudge", 4));
+    _router->setRoutingPenalty(Avoid::clusterCrossingPenalty, prefs->getDouble("/tools/connector/penalty/cluster", 4000));
+    _router->setRoutingPenalty(Avoid::fixedSharedPathPenalty, prefs->getDouble("/tools/connector/penalty/shared_path", 0));
+    _router->setRoutingPenalty(Avoid::reverseDirectionPenalty, prefs->getDouble("/tools/connector/penalty/reverse_direction", 50));
+
+    return _router.get();
+}
+
 /*
   Local Variables:
   mode:c++
diff --git a/src/document.h b/src/document.h
index 0b748beed3..5e9f849129 100644
--- a/src/document.h
+++ b/src/document.h
@@ -189,8 +189,8 @@ public:
     /******** Getters and Setters **********/
 
     // Document structure -----------------
-    Avoid::Router* getRouter() const { return _router.get(); }
-    
+    Avoid::Router *getRouter();
+
     /** Returns our SPRoot */
     SPRoot *getRoot() { return root; }
     SPRoot const *getRoot() const { return root; }
@@ -373,7 +373,6 @@ private:
     bool modified_since_save = false;
     bool modified_since_autosave = false;
     sigc::connection modified_connection;
-    sigc::connection rerouting_connection;
 
     // Document structure --------------------
     Inkscape::XML::Document *rdoc; ///< Our Inkscape::XML::Document
diff --git a/src/doxygen-main.dox b/src/doxygen-main.dox
index 6da5449cf1..dd1a17d288 100644
--- a/src/doxygen-main.dox
+++ b/src/doxygen-main.dox
@@ -259,7 +259,6 @@ namespace XML {}
  * - SPDrawContext [\ref draw-context.cpp, \ref draw-context.h]
  *   - PenTool [\ref pen-context.cpp, \ref pen-context.h]
  *   - PencilTool [\ref pencil-context.cpp, \ref pencil-context.h]
- *   - ConnectorTool [\ref connector-context.cpp, \ref connector-context.h, \ref sp-conn-end.cpp, \ref sp-conn-end-pair.cpp]
  * - GradientTool [\ref gradient-context.cpp, \ref gradient-context.h, \ref gradient-drag.cpp, \ref gradient-toolbar.cpp]
  * - RectTool [\ref rect-context.cpp, \ref rect-context.h]
  * - SelectTool [\ref select-context.cpp, \ref select-context.h]
diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index 89703479cc..a8c633ff4d 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -11,6 +11,8 @@ set(live_effects_SRC
 	lpe-circle_3pts.cpp
 	lpe-circle_with_radius.cpp
 	lpe-clone-original.cpp
+	lpe-connector-avoid.cpp
+	lpe-connector-line.cpp
 	lpe-constructgrid.cpp
 	lpe-copy_rotate.cpp
 	lpe-curvestitch.cpp
@@ -71,6 +73,8 @@ set(live_effects_SRC
 	parameter/bool.cpp
 	parameter/colorpicker.cpp
 	parameter/hidden.cpp
+	parameter/item.cpp
+	parameter/item-reference.cpp
 	parameter/satellite.cpp
 	parameter/satellitearray.cpp
 	parameter/satellite-reference.cpp
@@ -108,6 +112,8 @@ set(live_effects_SRC
 	lpe-circle_3pts.h
 	lpe-circle_with_radius.h
 	lpe-clone-original.h
+	lpe-connector-avoid.h
+	lpe-connector-line.h
 	lpe-constructgrid.h
 	lpe-copy_rotate.h
 	lpe-curvestitch.h
@@ -169,6 +175,8 @@ set(live_effects_SRC
 	parameter/bool.h
 	parameter/colorpicker.h
 	parameter/hidden.h
+	parameter/item.h
+	parameter/item-reference.h
 	parameter/enum.h
 	parameter/enumarray.h
 	parameter/satellite.h
diff --git a/src/live_effects/effect-enum.h b/src/live_effects/effect-enum.h
index 0ae38eb414..a6f911b3f6 100644
--- a/src/live_effects/effect-enum.h
+++ b/src/live_effects/effect-enum.h
@@ -78,6 +78,9 @@ enum EffectType {
     RECURSIVE_SKELETON,
     TEXT_LABEL,
     EMBRODERY_STITCH,
+    // 1.2
+    CONNECTOR_AVOID,
+    CONNECTOR_LINE,
     INVALID_LPE // This must be last (I made it such that it is not needed anymore I think..., Don't trust on it being
                 // last. - johan)
 };
@@ -98,6 +101,7 @@ enum ParamType {
     PATH,
     PATH_ARRAY,
     POINT,
+    ITEM,
     POWERSTROKE_POINT_ARRAY,
     RANDOM,
     SATELLITE,
diff --git a/src/live_effects/effect.cpp b/src/live_effects/effect.cpp
index 38127a421d..fe3cd3face 100644
--- a/src/live_effects/effect.cpp
+++ b/src/live_effects/effect.cpp
@@ -30,6 +30,8 @@
 #include "live_effects/lpe-circle_3pts.h"
 #include "live_effects/lpe-circle_with_radius.h"
 #include "live_effects/lpe-clone-original.h"
+#include "live_effects/lpe-connector-avoid.h"
+#include "live_effects/lpe-connector-line.h"
 #include "live_effects/lpe-constructgrid.h"
 #include "live_effects/lpe-copy_rotate.h"
 #include "live_effects/lpe-curvestitch.h"
@@ -908,7 +910,35 @@ const EnumEffectData<EffectType> LPETypeData[] = {
         false ,//experimental
     },
 #endif
-
+    /* 1.2 */
+    {
+        CONNECTOR_AVOID,
+        NC_("path effect", "Connector Avoided") ,//label
+        "connector_avoid" ,//key
+        "connector-avoid" ,//icon
+        N_("Avoid this shape when routing connector lines.") ,//description
+        LPECategory::Generate ,//category
+        false ,//on_path
+        true ,//on_shape
+        true ,//on_group
+        true ,//on_image
+        true ,//on_text
+        false ,//experimental
+    },
+    {
+        CONNECTOR_LINE,
+        NC_("path effect", "Connector Line") ,//label
+        "connector_line" ,//key
+        "connector-line" ,//icon
+        N_("A line connecting two objects, see connector tool.") ,//description
+        LPECategory::Generate ,//category
+        true  ,//on_path
+        false ,//on_shape
+        false ,//on_group
+        false ,//on_image
+        false ,//on_text
+        false ,//experimental
+    },
 };
 
 const EnumEffectDataConverter<EffectType> LPETypeConverter(LPETypeData, sizeof(LPETypeData) / sizeof(*LPETypeData));
@@ -931,6 +961,12 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
 {
     Effect* neweffect = nullptr;
     switch (lpenr) {
+        case CONNECTOR_AVOID:
+            neweffect = new LPEConnectorAvoid(lpeobj);
+            break;
+        case CONNECTOR_LINE:
+            neweffect = new LPEConnectorLine(lpeobj);
+            break;
         case EMBRODERY_STITCH:
             neweffect = static_cast<Effect*> ( new LPEEmbroderyStitch(lpeobj) );
             break;
@@ -1115,24 +1151,45 @@ Effect::New(EffectType lpenr, LivePathEffectObject *lpeobj)
     return neweffect;
 }
 
-void Effect::createAndApply(const char* name, SPDocument *doc, SPItem *item)
+
+/**
+ * Create a path-effect in this document's defs and return its xml repr.
+ * It is not entirely set up yet and you are required to call applyEffect
+ * and release the repr when finished.
+ */
+Inkscape::XML::Node *
+Effect::createEffect(char const *name, SPDocument *doc)
 {
-    // Path effect definition
     Inkscape::XML::Document *xml_doc = doc->getReprDoc();
     Inkscape::XML::Node *repr = xml_doc->createElement("inkscape:path-effect");
     repr->setAttribute("effect", name);
 
-    doc->getDefs()->getRepr()->addChild(repr, nullptr); // adds to <defs> and assigns the 'id' attribute
-    const gchar * repr_id = repr->attribute("id");
-    Inkscape::GC::release(repr);
+    // adds to <defs> and assigns the 'id' attribute
+    doc->getDefs()->getRepr()->addChild(repr, nullptr);
+    return repr;
+}
 
-    gchar *href = g_strdup_printf("#%s", repr_id);
+/**
+ * Adds the given path effect to the item, it MUST be added to defs already
+ * and have a valid id before you call this function, see createEffect.
+ */
+void Effect::applyEffect(Inkscape::XML::Node *repr, SPItem *item)
+{
+    auto repr_id = repr->attribute("id");
+    auto href = g_strdup_printf("#%s", repr_id);
     cast<SPLPEItem>(item)->addPathEffect(href, true);
     g_free(href);
 }
 
-void
-Effect::createAndApply(EffectType type, SPDocument *doc, SPItem *item)
+void Effect::createAndApply(char const *name, SPDocument *doc, SPItem *item)
+{
+    // Path effect definition
+    auto repr = createEffect(name, doc);
+    applyEffect(repr, item);
+    Inkscape::GC::release(repr);
+}
+
+void Effect::createAndApply(EffectType type, SPDocument *doc, SPItem *item)
 {
     createAndApply(LPETypeConverter.get_key(type).c_str(), doc, item);
 }
diff --git a/src/live_effects/effect.h b/src/live_effects/effect.h
index e6501b7b99..49b6af3c16 100644
--- a/src/live_effects/effect.h
+++ b/src/live_effects/effect.h
@@ -76,7 +76,9 @@ inline std::ostream &operator<<(std::ostream &os, LPEItemShapesNumbers const &lp
 class Effect {
 public:
     static Effect* New(EffectType lpenr, LivePathEffectObject *lpeobj);
-    static void createAndApply(const char* name, SPDocument *doc, SPItem *item);
+    static Inkscape::XML::Node *createEffect(const char* name, SPDocument *doc);
+    static void applyEffect(Inkscape::XML::Node *repr, SPItem *item);
+    static void createAndApply(char const *name, SPDocument *doc, SPItem *item);
     static void createAndApply(EffectType type, SPDocument *doc, SPItem *item);
 
     virtual ~Effect();
@@ -131,7 +133,7 @@ public:
 
     // /TODO: providesKnotholder() is currently used as an indicator of whether a nodepath is
     // created for an item or not. When we allow both at the same time, this needs rethinking!
-    bool providesKnotholder() const;
+    virtual bool providesKnotholder() const;
     // /TODO: in view of providesOwnFlashPaths() below, this is somewhat redundant
     //       (but spiro lpe still needs it!)
     virtual LPEPathFlashType pathFlashType() const { return DEFAULT; }
@@ -140,6 +142,9 @@ public:
     void update_helperpath();
     bool has_exception;
 
+    // Should the path's knotholder be suppressed?
+    virtual bool providesOwnKnotholder() const { return false; }
+    // Should the node tool's flash path be suppressed?
     inline bool providesOwnFlashPaths() const {
         return provides_own_flash_paths || show_orig_path;
     }
diff --git a/src/live_effects/lpe-connector-avoid.cpp b/src/live_effects/lpe-connector-avoid.cpp
new file mode 100644
index 0000000000..3be122c3de
--- /dev/null
+++ b/src/live_effects/lpe-connector-avoid.cpp
@@ -0,0 +1,246 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** \file
+ * LPE <connector_line> implementation used by the connector tool
+ * to connect two points together using libavoid.
+ */
+
+/*
+ * Authors:
+ *   Martin Owens <doctormo@geek-2.com>
+ *
+ * Copyright (C) Synopsys, Inc. 2021
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "live_effects/lpe-connector-avoid.h"
+#include "live_effects/lpe-connector-line.h"
+
+#include <glibmm/i18n.h>
+
+#include <2geom/convex-hull.h>
+#include "display/curve.h"
+#include "object/sp-item.h"
+#include "object/sp-item-group.h"
+#include "object/sp-shape.h"
+
+namespace Inkscape::LivePathEffect {
+
+/**
+ * Returns true if item is avoided in the router.
+ */
+bool isAvoided(SPObject const *obj)
+{
+    auto lpeitem = cast<SPLPEItem>(obj);
+    return lpeitem && lpeitem->hasPathEffectOfTypeRecursive(Inkscape::LivePathEffect::CONNECTOR_AVOID);
+}
+
+/**
+ * Gets the LPEConnectorAvoid for the given SPItem.
+ */
+LPEConnectorAvoid *LPEConnectorAvoid::get(SPItem *item)
+{
+    if (auto lpeitem = cast<SPLPEItem>(item)) {
+        return dynamic_cast<LPEConnectorAvoid *>(lpeitem->getCurrentLPE());
+    }
+    return nullptr;
+}
+
+/**
+ * Get all the points from the given SPCurve.
+ *
+ * @param curve - The curve to convert
+ */
+static std::vector<Geom::Point> curvePoints(SPCurve const *curve)
+{
+    // The number of segments to use for curve approximation
+    constexpr int NUM_SEGS = 4;
+    // The step size for sampling curves
+    constexpr double seg_size = 1.0 / NUM_SEGS;
+
+    std::vector<Geom::Point> result;
+
+    // Iterate over all curves, adding the endpoints for linear curves and
+    // sampling the other curves
+    for (auto const &path : curve->get_pathvector()) {
+        if (path.empty()) {
+            continue;
+        }
+        result.push_back(path.initialPoint());
+        for (auto const &curve : path) {
+            if (!curve.isLineSegment()) {
+                for (int i = 1; i < NUM_SEGS; i++) {
+                    result.push_back(curve.pointAt(i * seg_size));
+                }
+            }
+            result.push_back(curve.finalPoint());
+        }
+    }
+
+    return result;
+}
+
+/**
+ * Get a list of points based on the item type.
+ *
+ * @param item - The SPItem, which may be of many types.
+ * @param affine - The item transformation.
+ */
+static std::vector<Geom::Point> itemPoints(SPItem const *item, Geom::Affine const &affine)
+{
+    std::vector<Geom::Point> output_points;
+    SPCurve item_curve;
+
+    auto item_mutable = const_cast<SPItem *>(item);
+
+    if (auto group = cast<SPGroup>(item_mutable)) {
+        // consider all first-order children
+        for (auto child_item : group->item_list()) {
+            auto child_points = itemPoints(child_item, affine * child_item->transform);
+            output_points.insert(output_points.end(), child_points.begin(), child_points.end());
+        }
+    } else if (auto shape = cast<SPShape>(item_mutable)) {
+        shape->set_shape();
+        item_curve = *shape->curve();
+        // apply transformations (up to common ancestor)
+        item_curve.transform(affine);
+    } else if (auto bbox = item->documentPreferredBounds()) {
+        item_curve = SPCurve(*bbox);
+    }
+
+    std::vector<Geom::Point> curve_points = curvePoints(&item_curve);
+    output_points.insert(output_points.end(), curve_points.begin(), curve_points.end());
+    return output_points;
+}
+
+/**
+ * Turn an SPItem into an libavoid shape which can be routed, avoided etc.
+ *
+ * @param points - The vector of all points in the shape.
+ * @param spacing - The amount of space around the plotted item to pad.
+ */
+static Avoid::Polygon getPolygon(std::vector<Geom::Point> const &points, double spacing)
+{
+    // Create convex hull from the points.
+    auto const hull = Geom::ConvexHull{points};
+    if (hull.isDegenerate()) {
+        return {};
+    }
+
+    Avoid::Polygon result;
+    result.ps.resize(hull.size());
+
+    auto prev_v = (hull.front() - hull.back()).normalized();
+
+    for (int i = 0; i < hull.size(); i++) {
+        auto const ip = (i + 1) % hull.size();
+        auto const cur_v = (hull[ip] - hull[i]).normalized();
+        auto const det = Geom::cross(cur_v, prev_v);
+        auto const pt = hull[i] + (spacing / det) * (cur_v - prev_v);
+        result.ps[i] = {pt.x(), pt.y()};
+        prev_v = cur_v;
+    }
+
+    return result;
+}
+
+/**
+ * Creates or destroys the avoid LPE on the item item.
+ *
+ * @returns true if the avoided status was changed.
+ */
+bool LPEConnectorAvoid::toggleAvoid(SPItem *item, bool enable)
+{
+    if (enable && !isAvoided(item)) {
+        // Use a simple avoid lpe (there are no options).
+        Inkscape::XML::Node *lpe_repr = nullptr;
+        auto obj = item->document->getObjectById("standard_avoid");
+        if (obj) {
+            lpe_repr = obj->getRepr();
+        }
+        if (!lpe_repr) {
+            // Create a new connector avoid effect
+            lpe_repr = LivePathEffect::Effect::createEffect("connector_avoid", item->document);
+            lpe_repr->setAttribute("id", "standard_avoid");
+        }
+        LivePathEffect::Effect::applyEffect(lpe_repr, item);
+        return true;
+    }
+    if (!enable && isAvoided(item)) {
+        if (auto lpe_item = cast<SPLPEItem>(item)) {
+            lpe_item->removeCurrentPathEffect(false);
+        }
+        return true;
+    }
+    return false;
+}
+
+LPEConnectorAvoid::LPEConnectorAvoid(LivePathEffectObject *lpeobject)
+    : Effect(lpeobject)
+{}
+
+LPEConnectorAvoid::~LPEConnectorAvoid() = default;
+
+void LPEConnectorAvoid::doAfterEffect(SPLPEItem const *lpe_item, SPCurve *curve)
+{
+    // Remove any references to the past shape.
+    removeRef(lpe_item);
+
+    std::vector<Geom::Point> points;
+    if (curve) {
+        // Shapes, normal LPE items.
+        points = curvePoints(curve);
+    } else {
+        // Groups, images, etc.
+        points = itemPoints(lpe_item, lpe_item->i2doc_affine());
+    }
+
+    auto router = lpe_item->document->getRouter();
+    Avoid::Polygon poly = getPolygon(points, 0.5);
+    if (!poly.empty()) {
+        addRef(lpe_item, new Avoid::ShapeRef(router, poly));
+        router->processTransaction();
+    }
+
+    // Make sure the the lines above this one are up to date.
+    LPEConnectorLine::updateAll(lpe_item->document);
+}
+
+Geom::PathVector LPEConnectorAvoid::doEffect_path(Geom::PathVector const &path_in)
+{
+    return path_in;
+}
+
+void LPEConnectorAvoid::doOnRemove(SPLPEItem const *lpeitem)
+{
+    removeRef(lpeitem);
+}
+
+void LPEConnectorAvoid::addRef(SPItem const *item, Avoid::ShapeRef *avoid_ref)
+{
+    avoid_refs[item] = avoid_ref;
+}
+
+void LPEConnectorAvoid::removeRef(SPItem const *item)
+{
+    auto router = getSPDoc()->getRouter();
+    auto search = avoid_refs.find(item);
+    if (search != avoid_refs.end()) {
+        router->deleteShape(search->second);
+        router->processTransaction();
+        avoid_refs.erase(search);
+    }
+}
+
+} // Inkscape::LivePathEffect
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/lpe-connector-avoid.h b/src/live_effects/lpe-connector-avoid.h
new file mode 100644
index 0000000000..d35594c53f
--- /dev/null
+++ b/src/live_effects/lpe-connector-avoid.h
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifndef INKSCAPE_LPE_CONNECTOR_AVOID_H
+#define INKSCAPE_LPE_CONNECTOR_AVOID_H
+
+/** \file
+ * LPE <connector_avoid> implementation used by the connector tool
+ * to avoid shapes in the document when drawing connector lines.
+ */
+
+/*
+ * Authors:
+ *   Martin Owens <doctormo@geek-2.com>
+ *
+ * Copyright (C) Synopsys, Inc. 2021
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "3rdparty/adaptagrams/libavoid/connector.h"
+#include "3rdparty/adaptagrams/libavoid/router.h"
+#include "3rdparty/adaptagrams/libavoid/shape.h"
+#include "live_effects/effect.h"
+
+namespace Inkscape::LivePathEffect {
+
+bool isAvoided(SPObject const *obj);
+
+class LPEConnectorAvoid : public Effect
+{
+public:
+    LPEConnectorAvoid(LivePathEffectObject *lpeobject);
+    ~LPEConnectorAvoid() override;
+
+    void doAfterEffect(SPLPEItem const *lpe_item, SPCurve *curve) override;
+    void doOnRemove(SPLPEItem const *lpeitem) override;
+
+    Geom::PathVector doEffect_path(Geom::PathVector const &path_in) override;
+
+    static LPEConnectorAvoid *get(SPItem *item);
+    static bool toggleAvoid(SPItem *item, bool enable = true);
+
+private:
+    std::map<SPItem const *, Avoid::ShapeRef *> avoid_refs;
+
+    void addRef(SPItem const *item, Avoid::ShapeRef *avoid_ref);
+    void removeRef(SPItem const *item);
+};
+
+} // namespace Inkscape::LivePathEffect
+
+#endif // INKSCAPE_LPE_CONNECTOR_AVOID_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/lpe-connector-line.cpp b/src/live_effects/lpe-connector-line.cpp
new file mode 100644
index 0000000000..ae748b64cf
--- /dev/null
+++ b/src/live_effects/lpe-connector-line.cpp
@@ -0,0 +1,857 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** \file
+ * LPE <connector_line> implementation used by the connector tool
+ * to connect two points together using libavoid.
+ */
+
+/*
+ * Authors:
+ *   Martin Owens <doctormo@geek-2.com>
+ *
+ * Copyright (C) Synopsys, Inc. 2021
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "live_effects/lpe-connector-line.h"
+#include "live_effects/lpeobject.h"
+
+#include <glibmm/i18n.h>
+
+#include <2geom/circle.h>
+#include <2geom/elliptical-arc.h>
+#include <2geom/path-intersection.h>
+#include "display/curve.h"
+#include "helper/geom.h"
+#include "object/sp-defs.h"
+#include "object/sp-item.h"
+#include "object/sp-point.h"
+#include "object/sp-shape.h"
+#include "svg/svg.h"
+
+namespace Inkscape::LivePathEffect {
+
+static bool updating_all;
+
+/**
+ * Returns true if item is a connector.
+ */
+bool isConnector(SPObject const *obj)
+{
+    auto lpeitem = cast<SPLPEItem>(obj);
+    return lpeitem && lpeitem->hasPathEffectOfTypeRecursive(Inkscape::LivePathEffect::CONNECTOR_LINE);
+}
+
+/**
+ * Gets the LPEConnectorLine for the given SPItem.
+ */
+LPEConnectorLine *LPEConnectorLine::get(SPItem *item)
+{
+    if (auto lpeitem = cast<SPLPEItem>(item)) {
+        return dynamic_cast<LPEConnectorLine *>(lpeitem->getCurrentLPE());
+    }
+    return nullptr;
+}
+
+/**
+ * A checkpoint position is usually the position of it's curve's initial point
+ * but for automatically adjusting lines, it can become something else.
+ *
+ * @param previous - The previous curve with instructions.
+ * @param curve - The curve of the checkpoint who's position is the default.
+ * @param start - The calculated start of the line.
+ * @param end - The calculated end of the line.
+ */
+Geom::Point LPEConnectorLine::getCheckpointPosition(Geom::Curve const *previous, Geom::Curve const *curve,
+                                                    Geom::Point const &start, Geom::Point const &end)
+{
+    auto point = curve->initialPoint();
+    if (auto dynamic = getCheckpointDynamic(previous)) {
+        auto mid = Geom::middle_point(start, end);
+        if (dynamic & DynamicX) {
+            point.x() = mid.x();
+        }
+        if (dynamic & DynamicY) {
+            point.y() = mid.y();
+        }
+    }
+    return point;
+}
+
+/**
+ * Return the automatic relocation dynamic for a given checkpoint curve.
+ *
+ * @param previous - The previous curve with instructions.
+ */
+int LPEConnectorLine::getCheckpointDynamic(Geom::Curve const *previous)
+{
+    int ret = DynamicNone;
+    if (auto bezier = dynamic_cast<Geom::BezierCurve const *>(previous)) {
+        if (bezier->size() == 4) {
+            Geom::Point adj = bezier->controlPoint(3) - bezier->controlPoint(2);
+            if (adj.y() != 0) {
+                ret |= DynamicY;
+            }
+            if (adj.x() != 0) {
+                ret |= DynamicX;
+            }
+        }
+    }
+    return ret;
+}
+
+/**
+ * Get's the orientation of this checkpoint based on the bezier curve.
+ *
+ * @param curve - The curve/point to test.
+ *
+ * @returns ConnDirAll, ConnDirVert or ConnDirHorz
+ */
+int LPEConnectorLine::getCheckpointOrientation(Geom::Curve const *curve)
+{
+    if (auto bezier = dynamic_cast<Geom::BezierCurve const *>(curve)) {
+        if (bezier->order() == 3) {
+            Geom::Point adj = bezier->controlPoint(0) - bezier->controlPoint(1);
+            if (adj.y() != 0) {
+                return Avoid::ConnDirVert;
+            }
+            if (adj.x() != 0) {
+                return Avoid::ConnDirHorz;
+            }
+        }
+    }
+    return Avoid::ConnDirAll;
+}
+
+/**
+ * Detect what orientation this point would have if it's on the generated path.
+ *
+ * @param path - The routed/generated path (not the original one)
+ * @param point - The point on the routed path used as a Checkpoint.
+ *
+ * @returns ConnDirVert or ConnDirHorz, default is ConnDirAll for no detection.
+ */
+int LPEConnectorLine::detectCheckpointOrientation(Geom::PathVector const &pathv, Geom::Point const &point)
+{
+    // Get the nearest section to this point.
+    if (auto const pathvt = pathv.nearestTime(point)) {
+        auto const &curve = pathv[pathvt->path_index].curveAt(pathvt->asPathTime());
+        if (curve.isLineSegment()) {
+            auto const cmp = curve.initialPoint() - curve.finalPoint();
+            if (cmp.x() == 0 && cmp.y() != 0) {
+                return Avoid::ConnDirVert;
+            }
+            if (cmp.y() == 0 && cmp.x() != 0) {
+                return Avoid::ConnDirHorz;
+            }
+        }
+    }
+    return Avoid::ConnDirAll;
+}
+
+/**
+ * Set the checkpoint curve to a specific direction
+ */
+void LPEConnectorLine::setCheckpointOrientation(Geom::BezierCurve &bezier, int dir)
+{
+    auto const p = bezier.controlPoint(0);
+    if (dir == Avoid::ConnDirHorz) {
+        bezier.setPoint(1, p + Geom::Point{10, 0});
+    } else if (dir == Avoid::ConnDirVert) {
+        bezier.setPoint(1, p + Geom::Point{0, 10});
+    } else {
+        bezier.setPoint(1, p);
+    }
+}
+
+/**
+ * Set the checkpoint dynamic, the automatic repositioning of this point based on the connectors.
+ */
+void LPEConnectorLine::setCheckpointDynamic(Geom::BezierCurve &bezier, unsigned dynamic)
+{
+    auto p = bezier.controlPoint(3);
+    if (dynamic & DynamicX) {
+        p += Geom::Point{10, 0};
+    }
+    if (dynamic & DynamicY) {
+        p += Geom::Point{0, 10};
+    }
+    bezier.setPoint(2, p);
+}
+
+/**
+ * Edit the original path and update the LPE routing.
+ *
+ * @param line - The line SPObject being written to (updates original-d attribute of this item)
+ * @param *args - See rewriteLine(path, ...)
+ */
+void LPEConnectorLine::rewriteLine(SPShape *line, int index, Geom::Point p, int dir, unsigned dynamic, RewriteMode indel)
+{
+    if (auto lpe_item = cast<SPLPEItem>(line)) {
+        auto original_pathv = line->curveForEdit()->get_pathvector();
+        auto pathv = LPEConnectorLine::rewriteLine(original_pathv[0], index, p, dir, dynamic, indel);
+        line->setAttribute("inkscape:original-d", sp_svg_write_path(pathv));
+        sp_lpe_item_update_patheffect(lpe_item, false, true);
+    }
+}
+
+/**
+ * Edit an original path at the given index, inserting or moving the point.
+ *
+ * @param path - The Path being modified.
+ * @param index - The index of the point in the path being modified.
+ * @param point - The location the point should be moved to.
+ * @param dir - The directionality of the point (NONE, VERT, HORZ, ALL)
+ * @param dynamic - The dynamic setting (NONE, X, Y, BOTH)
+ * @param indel - Insertion, deletion, or editing (default)
+ */
+Geom::PathVector LPEConnectorLine::rewriteLine(Geom::Path const &path, int index, Geom::Point const &p, int dir, unsigned dynamic, RewriteMode indel)
+{
+    Geom::PathVector pathv;
+    pathv.push_back(Geom::Path{});
+    int j = 0;
+    for (int i = 0; i < path.size(); i++) {
+        if (auto const bezier_orig = dynamic_cast<Geom::BezierCurve const *>(&path[i])) {
+            Geom::BezierCurve *bezier;
+            if (bezier_orig->order() == 1) {
+                // Elevate lines to cubic bezier.
+                bezier = new Geom::CubicBezier(bezier_orig->initialPoint(), bezier_orig->initialPoint(),
+                                               bezier_orig->finalPoint(), bezier_orig->finalPoint());
+            } else {
+                bezier = new Geom::BezierCurve(*bezier_orig);
+            }
+
+            // Record previous point attributes.
+            if (i + 1 == index) {
+                if (indel == RewriteMode::Add) {
+                    auto new_bezier = new Geom::CubicBezier(bezier->controlPoint(0), bezier->controlPoint(1), p, p);
+                    setCheckpointDynamic(*new_bezier, dynamic);
+                    pathv[0].append(new_bezier);
+                    j = 1;
+                } else if (indel == RewriteMode::Delete && index < path.size()) {
+                    if (auto next_bezier = dynamic_cast<Geom::BezierCurve *>(path[i + 1].duplicate())) {
+                        bezier->setPoint(3, next_bezier->controlPoint(3));
+                        bezier->setPoint(2, next_bezier->controlPoint(2));
+                    }
+                } else {
+                    bezier->setFinal(p);
+                    setCheckpointDynamic(*bezier, dynamic);
+                }
+            }
+
+            // Record next point attributes.
+            if (i + j == index) {
+                if (indel == RewriteMode::Delete) {
+                    continue;
+                } else {
+                    bezier->setInitial(p);
+                    setCheckpointOrientation(*bezier, dir);
+                }
+            }
+
+            pathv[0].append(bezier);
+        }
+    }
+    return pathv;
+}
+
+/**
+ * Get's the orientation of this checkpoint based on the bezier curve.
+ *
+ * @param curve - The curve/point to test.
+ *
+ * @returns Avoid::ConnDir type (All, Left, Right, Up, Down)
+ */
+int LPEConnectorLine::getEndpointOrientation(Geom::Curve const *curve, bool is_end)
+{
+    if (auto bezier = dynamic_cast<Geom::BezierCurve const *>(curve)) {
+        if (bezier->size() == 4) {
+            // First or second QuadBezier control point depending on end.
+            Geom::Point adj = bezier->controlPoint(is_end * 3) - bezier->controlPoint(1 + is_end);
+            if (adj[Geom::X] > 0)
+                return Avoid::ConnDirRight;
+            if (adj[Geom::X] < 0)
+                return Avoid::ConnDirLeft;
+            if (adj[Geom::Y] > 0)
+                return Avoid::ConnDirDown;
+            if (adj[Geom::Y] < 0)
+                return Avoid::ConnDirUp;
+        }
+    }
+    return Avoid::ConnDirAll;
+}
+
+/**
+ * Draw a Avoid::ConnRef into a Geom::PathVector object.
+ *
+ * @param connRef - The connector to draw.
+ * @param curvature - The amount of curvature to use
+ * @returns PathVector of routed shape
+ */
+static Geom::PathVector connref_to_pathvector(Avoid::ConnRef &connRef, double curvature)
+{
+    bool straight = curvature < 1e-3;
+
+    Avoid::PolyLine route = connRef.displayRoute();
+    if (!straight) {
+        route = route.curvedPolyline(curvature);
+    }
+    connRef.calcRouteDist();
+
+    if (route.ps.empty()) {
+        g_warning("Route didn't generate any points!");
+        return {};
+    }
+
+    Geom::PathVector pathv;
+    pathv.push_back(Geom::Path(Geom::Point(route.ps[0].x, route.ps[0].y)));
+
+    int pn = route.size();
+    for (int i = 1; i < pn; ++i) {
+        Geom::Point p(route.ps[i].x, route.ps[i].y);
+        if (straight) {
+            pathv.back().appendNew<Geom::LineSegment>(p);
+        } else {
+            switch (route.ts[i]) {
+                case 'M':
+                    // libavoid tells us to move to the same point at a checkpoint, this
+                    // splits up our line and makes adjusting it very complicated.
+                    // So we're going to ignore requests to split up the curve.
+                    // pathv.push_back(Geom::Path(p));
+                    break;
+                case 'L':
+                    pathv.back().appendNew<Geom::LineSegment>(p);
+                    break;
+                case 'C':
+                    assert(i + 2 < pn);
+                    Geom::Point p1(route.ps[i + 1].x, route.ps[i + 1].y);
+                    Geom::Point p2(route.ps[i + 2].x, route.ps[i + 2].y);
+                    pathv.back().appendNew<Geom::CubicBezier>(p, p1, p2);
+                    i += 2;
+                    break;
+            }
+        }
+    }
+
+    return pathv;
+}
+
+/**
+ * Get the object adjustment, which is an amount by which the object
+ * intersects with the given Path line so it can be shortened to meet
+ * the edge of the object.
+ *
+ * @param line - The line object that this adjustment is transformed into
+ * @param path - The path that crosses the edge of the object
+ * @param obj - The object that sits at this end of the line
+ *
+ * @returns A double of how much to cut into the line segment
+ */
+double LPEConnectorLine::getObjectAdjustment(SPObject *line, Geom::Path const &path, SPItem *item)
+{
+    if (!item) {
+        return 0.0;
+    }
+
+    auto outline = item->outline();
+    if (outline.empty()) {
+        return 0.0;
+    }
+
+    auto item_outline = outline * item->getRelativeTransform(line);
+
+    Geom::CrossingSet cross = Geom::crossings(path, item_outline);
+
+    double intersect_pos = 0.0;
+    // iterate over all crossings
+    for (auto const &cr : cross) {
+        for (auto const &cr_pt : cr) {
+            intersect_pos = std::max(intersect_pos, cr_pt.ta);
+        }
+    }
+    return intersect_pos;
+}
+
+/**
+ * Takes a list of time codes on the input path, and returns the gaps given
+ * with the radius size
+ *
+ * @param input - The input path to cut holes into.
+ * @param radius - The radius of the gaps to make.
+ * @param tas - The time-code based locations in the input path to generate.
+ * @returns A vector of LineGap pairs (start and end) timecodes.
+ */
+LineGaps LPEConnectorLine::calculateGaps(Geom::Path const &input, double radius, std::vector<double> tas)
+{
+    auto range = input.timeRange();
+
+    // Path times must be in ascending order.
+    std::sort(tas.begin(), tas.end());
+
+    std::vector<LineGap> gaps;
+    for (double ta : tas) {
+        // To cut a circle out, we must now find a circle of the right radius
+        // put it at the point in the line we want to cut and then find it's
+        // own corssings.
+        auto circle = Geom::Path(Geom::Circle(input.pointAt(ta), radius));
+        Geom::Crossings cy = Geom::crossings(input, circle);
+        Geom::delete_duplicates(cy);
+        if (cy.empty()) {
+            g_warning("Circle on line does not cross given line, magic.");
+            continue;
+        }
+
+        // Image you have a line folding over and over, it's possible it could cross the
+        // radius many times, but we're interested in the closest crossings to cx[i]
+        // This also takes care of single crossings where the radius peeks out of the end
+        // of a line allowing it to jump or cut the final section of the line.
+        double t1 = range.min();
+        double t2 = range.max();
+        for (auto const &cross : cy) {
+            if (cross.ta < ta && cross.ta > t1) {
+                t1 = cross.ta;
+            } else if (cross.ta > ta && cross.ta < t2) {
+                t2 = cross.ta;
+            }
+        }
+
+        if (!gaps.empty() && t1 < gaps.back().second) {
+            // Found overlapping gap! combine them for a mega gap!
+            t1 = gaps.back().first;
+            gaps.pop_back();
+        }
+        gaps.emplace_back(t1, t2);
+    }
+    return gaps;
+}
+
+/**
+ * Add jumps to a given Geom Path as it crosses other connector lines.
+ *
+ * @param line - The line object which the output will be saved.
+ * @param input - The line so far generated before being saved.
+ * @param type - The type of jump, GAP or ARC.
+ * @param size - The size of the jump in document units.
+ *
+ * @returns the input path with the jumps added.
+ */
+Geom::PathVector LPEConnectorLine::addLineJumps(SPObject *line, Geom::Path const &input, JumpMode type, double size)
+{
+    Geom::Crossings cx;
+    // Line comes before this one, modify this line with the crossing from the target.
+    for (SPObject *obj = line->getPrev(); obj; obj = obj->getPrev()) {
+        if (!isConnector(obj)) {
+            continue;
+        }
+        if (auto shape = dynamic_cast<SPShape *>(obj)) {
+            auto transform = shape->getRelativeTransform(line);
+            auto lpe_curve = *shape->curve();
+            lpe_curve.transform(transform);
+
+            Geom::Path path_b = lpe_curve.get_pathvector()[0];
+            Geom::Crossings cy = Geom::crossings(input, path_b);
+            Geom::merge_crossings(cx, cy, 0);
+            // TODO: Remove crossings which merge the lines together
+        }
+        // TODO: Could handle decendant groups here (somehow)
+    }
+    // TODO: Add self-crossings, as the line could jump over itself.
+
+    // Remove dupes, and create a sorted list of timecodes
+    Geom::delete_duplicates(cx);
+    if (cx.empty() || size < 0.01)
+        return input;
+
+    std::vector<double> tas;
+    for (auto const &cross : cx) {
+        tas.push_back(cross.ta);
+    }
+
+    Geom::PathVector output;
+    output.push_back(Geom::Path{});
+    auto radius = size / 2;
+    auto range = input.timeRange();
+    double prev_pos = range.min();
+    for (auto const &jump : calculateGaps(input, radius, tas)) {
+        auto end_point = input.pointAt(jump.second);
+        input.appendPortionTo(output.back(), prev_pos, jump.first);
+        if (type == JumpMode::Gap) {
+            if (!output.back().empty()) {
+                output.push_back(Geom::Path(end_point));
+            }
+        } else if (type == JumpMode::Arc) {
+            // NOTE: It's possible to control the arc flattness by adding a little to radius here.
+            output.back().appendNew<Geom::EllipticalArc>(radius, radius, 0, false, true, end_point);
+        } else {
+            g_warning("Unknown jump type.");
+        }
+        prev_pos = jump.second;
+    }
+    input.appendPortionTo(output.back(), prev_pos, range.max());
+    return output;
+}
+
+/**
+ * Update all the objects next in line who jump over this lpe's line.
+ *
+ * @param line - The line for who's siblings should be updated.
+ */
+void LPEConnectorLine::updateSiblings(SPObject *line)
+{
+    // Line comes after this one, send request to update that line because we might have moved.
+    for (SPObject *obj = line->getNext(); obj; obj = obj->getNext()) {
+        if (isConnector(dynamic_cast<SPItem *>(obj))) {
+            // XXX Check for crossing before calling update?
+            sp_lpe_item_update_patheffect(cast<SPLPEItem>(obj), false, true);
+            // It's very likely that the next item's update will check
+            // all the items in the stack below it, so quit!
+            break;
+        }
+    }
+}
+
+/**
+ * Update all lines in the document (usually because an avoid object is moved)
+ */
+void LPEConnectorLine::updateAll(SPDocument *doc)
+{
+    updating_all = true;
+    for (auto &child: doc->getDefs()->children) {
+        if (auto lpe_obj = dynamic_cast<LivePathEffectObject *>(&child)) {
+            if (auto line_lpe = dynamic_cast<LPEConnectorLine *>(lpe_obj->get_lpe())) {
+                for (auto &lpe_item : line_lpe->getCurrrentLPEItems()) {
+                    sp_lpe_item_update_patheffect(lpe_item, false, true);
+                }
+            }
+        }
+    }
+    updating_all = false;
+}
+
+/**
+ * Get the start or end point from the original path or the linked object.
+ *
+ * @param curve - The const iterator from the original path at the start or end
+ * @param item - The linked item at the same end of the curve (nullptr if none)
+ * @param sub_point - The relative location of the sub-point for this end.
+ * @param target - The target object that will be modified (for transformation)
+ *
+ * @returns The visual Avoid::Point for that end corrected for transforms.
+ */
+Avoid::Point LPEConnectorLine::getConnectorPoint(Geom::Path::const_iterator curve, SPItem *item, Geom::Point *sub_point,
+                                                 SPObject *target)
+{
+    Geom::Point point;
+    if (item && target) {
+        auto transform = item->getRelativeTransform(target);
+        // Get connection points as their own items.
+        if (sub_point) {
+            point = *SPPoint::getItemPoint(item, sub_point) * transform;
+        } else if (auto bbox = item->bbox(transform, SPItem::VISUAL_BBOX)) {
+            point = bbox->midpoint();
+        }
+    } else {
+        point = curve->initialPoint();
+    }
+    return {point.x(), point.y()};
+}
+
+/**
+ * Get the start or end shape which might be useful for routing.
+ *
+ * @param item - The linked item at the same end of the curve (nullptr if none)
+ * @param target - The target object that will be modified (for transformation)
+ *
+ * @returns The visual Avoid::Rectangle for that end corrected for transforms.
+ */
+Avoid::ShapeRef *LPEConnectorLine::getConnectorShape(Avoid::Router *router, Avoid::Point point, SPItem *item,
+                                                     SPObject *target, int orientation)
+{
+    if (!item || !target) {
+        return nullptr;
+    }
+
+    Avoid::ConnEnd conn = Avoid::ConnEnd(point);
+    Avoid::ShapeRef *shape = nullptr;
+
+    SPItem *parent = item;
+    auto transform = item->getRelativeTransform(target);
+    auto bbox = parent->bbox(transform, SPItem::VISUAL_BBOX);
+    if (!bbox) {
+        g_warning("Could not get visual box to connected object!");
+        return nullptr;
+    }
+
+    auto rect =
+        Avoid::Rectangle(Avoid::Point(bbox->left(), bbox->top()), Avoid::Point(bbox->right(), bbox->bottom()));
+
+    shape = new Avoid::ShapeRef(router, rect);
+
+    double x = point.x - rect.ps[3].x;
+    double y = point.y - rect.ps[3].y;
+
+    if (orientation == Avoid::ConnDirAll) {
+        int detected = Avoid::ConnDirNone;
+        auto x_s = x / bbox->width();
+        auto y_s = y / bbox->height();
+        if (x_s > 0.7) {
+            detected |= Avoid::ConnDirRight;
+        } else if (x_s < 0.3) {
+            detected |= Avoid::ConnDirLeft;
+        }
+        if (y_s > 0.7) {
+            detected |= Avoid::ConnDirDown;
+        } else if (y_s < 0.3) {
+            detected |= Avoid::ConnDirUp;
+        }
+        if (detected != Avoid::ConnDirNone) {
+            orientation = detected;
+        }
+    }
+
+    new Avoid::ShapeConnectionPin(shape, 1, x, y, false, 0.0, orientation); // owned by shape
+
+    return shape;
+}
+
+LPEConnectorLine::LPEConnectorLine(LivePathEffectObject *lpeobject)
+    : Effect(lpeobject)
+    , connection_start(_("Start object:"), _("Object line is connected from"), "connection-start", &wr, this)
+    , connection_end(_("End object:"), _("Object line is connected to"), "connection-end", &wr, this)
+    , connector_type(_("Line type:"), _("Determines which line segment type to use."), "line-type", ConnectorType, &wr,
+                     this, Avoid::ConnType_Orthogonal)
+    , spacing(_("Spacing:"), _("Extra spacing from connectors"), "spacing", &wr, this, 0.0)
+    , curvature(_("Curvature:"), _("The amount the route can curve around"), "curvature", &wr, this, 0.0)
+    , jump_size(_("Jump size:"), _("The size of the jump when lines cross"), "jump-size", &wr, this, 1.0)
+    , jump_type(_("Jump type:"), _("The type of jump made when lines corss."), "jump-type", JumpType, &wr, this, JumpMode::Arc)
+    , adjust_for_obj(_("Adjust line to _outline"), _("Moves the line away from a connected object's outside curve."),
+                     "adjust-for-obj", &wr, this, true)
+    , adjust_for_marker(_("Adjust line to _marker"), _("Moves the line so it's marker touches the target coordinates."),
+                        "adjust-for-marker", &wr, this, true)
+{
+    /* register all your parameters here, so Inkscape knows which parameters this effect has: */
+    registerParameter(&connection_start);
+    registerParameter(&connection_end);
+    registerParameter(&connector_type);
+    registerParameter(&spacing);
+    registerParameter(&curvature);
+    registerParameter(&jump_size);
+    registerParameter(&jump_type);
+    registerParameter(&adjust_for_obj);
+    registerParameter(&adjust_for_marker);
+}
+
+void LPEConnectorLine::doAfterEffect(SPLPEItem const *lpe_item, SPCurve *curve)
+{
+    if (!updating_all) {
+        // Make sure the the lines above this one are up to date.
+        updateSiblings(const_cast<SPLPEItem *>(lpe_item));
+    }
+}
+
+Geom::PathVector LPEConnectorLine::doEffect_path(Geom::PathVector const &path_in)
+{
+    // This is the standard router for this document, it keeps references to all the connectors.
+    auto router = getSPDoc()->getRouter();
+
+    // Step 1. Get the locations of the referenced start and end points for the line.
+    auto conn_start = getConnStart();
+    auto conn_end = getConnEnd();
+    auto line = dynamic_cast<SPObject *>(sp_lpe_item);
+
+    // Steps 2, call the static routing process with all the options.
+    auto output = generate_path(path_in, router, line, conn_start, conn_end, connector_type, curvature);
+
+    if (output.empty()) {
+        // No path generated, likely because it's a zero size
+        return output;
+    }
+
+    // Cache the pre-jumps path, so the tool can provide route editing.
+    route_path = output;
+
+    // Step 3. Make line end-adjustments
+    auto range = output[0].timeRange();
+    double adjust_start, adjust_end = 0.0;
+    if (spacing > 0.01) {
+        auto space_gaps = calculateGaps(output[0], spacing, {range.min(), range.max()});
+        if (space_gaps.size() == 2) {
+            adjust_start += (space_gaps[0].second - range.min());
+            adjust_end += (range.max() - space_gaps[1].first);
+        }
+    }
+    if (adjust_for_obj) {
+        adjust_start += getObjectAdjustment(sp_lpe_item, output[0], conn_start);
+        adjust_end += getObjectAdjustment(sp_lpe_item, output[0].reversed(), conn_end);
+    }
+    if (adjust_start > 0.0 || adjust_end > 0.0) {
+        double offset_start = range.min() + adjust_start;
+        double offset_end = range.max() - adjust_end;
+        if (offset_start < offset_end) {
+            Geom::PathVector adjusted_path;
+            adjusted_path.push_back(output[0].portion(offset_start, offset_end));
+            output = adjusted_path;
+        }
+    }
+
+    // Step 4. Add any jumps or gaps to the resulting line
+    return addLineJumps(sp_lpe_item, output[0], jump_type, jump_size);
+}
+
+
+/**
+ * Generate a routed path based just on the information provided (static version)
+ * this version calculates the parentPoints if conn ends are SPPoints.
+ *
+ * @param path_in - A path to use as the default path (including jogs)
+ * @param router - The libavoid router objects (usually from the document)
+ * @param line - The target line to transform the points towards
+ * @param conn_start - The starting connector point, SPItem or SPPoint.
+ * @param conn_end - The ending connector point, SPItem or SPPoint.
+ * @param connector_type - Orthoganal or not option type (see libavoid)
+ * @param curvature - Amount of router curvature to add
+ */
+Geom::PathVector LPEConnectorLine::generate_path(Geom::PathVector const &path_in, Avoid::Router *router, SPObject *line,
+                                                 SPItem *conn_start, SPItem *conn_end, Avoid::ConnType connector_type,
+                                                 double curvature)
+{
+    auto item_start = conn_start;
+    auto point_start = new Geom::Point(0.5, 0.5);
+    if (auto sp_point = dynamic_cast<SPPoint *>(conn_start)) {
+        item_start = dynamic_cast<SPItem *>(sp_point->parent);
+        point_start = sp_point->parentPoint();
+    }
+
+    auto item_end = conn_end;
+    auto point_end = new Geom::Point(0.5, 0.5);
+    if (auto sp_point = dynamic_cast<SPPoint *>(conn_end)) {
+        item_end = dynamic_cast<SPItem *>(sp_point->parent);
+        point_end = sp_point->parentPoint();
+    }
+
+    // Steps 2 & 3, call the static routing process with all the options.
+    return generate_path(path_in, router, line, item_start, point_start, item_end, point_end, connector_type,
+                         curvature);
+}
+
+/**
+ * Static version of doEffect_path that can be used outside of the LPE
+ *
+ * @param path_in - A path to use as the default path (including jogs)
+ * @param router - The libavoid router objects (usually from the document)
+ * @param target - The target object to transform the points towards
+ * @param item_start - Optional starting location object
+ * @param point_start - Optional starting sub-point location (relative)
+ * @param item_end - Optional ending location object. Shape or SPPoint.
+ * @param point_end - Optional ending sub-point location (relative)
+ * @param connector_type - Orthoganal or not option type (see libavoid)
+ * @param curvature - Amount of router curvature to add
+ *
+ * @returns new routed path
+ */
+Geom::PathVector LPEConnectorLine::generate_path(Geom::PathVector const &path_in, Avoid::Router *router,
+                                                 SPObject *target, SPItem *item_start, Geom::Point *point_start,
+                                                 SPItem *item_end, Geom::Point *point_end,
+                                                 Avoid::ConnType connector_type, double curvature)
+{
+    Geom::PathVector output;
+    g_assert(!dynamic_cast<SPPoint *>(item_start));
+    g_assert(!dynamic_cast<SPPoint *>(item_end));
+
+    for (const auto &path_it : path_in) {
+        // Ignore small node segments
+        if (path_it.empty() || count_path_nodes(path_it) < 2) {
+            continue;
+        }
+
+        // Create a new connection reference using the start and end of the line.
+        Geom::Path::const_iterator curve_start = path_it.begin();
+        Geom::Path::const_iterator curve_end = path_it.end_default();
+
+        auto src_dir = getEndpointOrientation(&(*curve_start), false);
+        auto src_point = getConnectorPoint(curve_start, item_start, point_start, target);
+        auto src_shape = getConnectorShape(router, src_point, item_start, target, src_dir);
+        Avoid::ConnEnd src = Avoid::ConnEnd(src_point);
+        if (src_shape) {
+            src = Avoid::ConnEnd(src_shape, 1);
+        }
+
+        auto dst_dir = getEndpointOrientation(&(*curve_end), true);
+        auto dst_point = getConnectorPoint(curve_end, item_end, point_end, target);
+        auto dst_shape = getConnectorShape(router, dst_point, item_end, target, dst_dir);
+        Avoid::ConnEnd dst = Avoid::ConnEnd(dst_point);
+        if (dst_shape) {
+            dst = Avoid::ConnEnd(dst_shape, 1);
+        }
+
+        auto _connRef = new Avoid::ConnRef(router, src, dst);
+        _connRef->setRoutingType(connector_type);
+
+        auto previous = curve_start;
+        ++curve_start;
+
+        // Now we use all in-between points as "checkpoints" for the router.
+        std::vector<Avoid::Checkpoint> checkpoints;
+
+        while (curve_start != curve_end) {
+            // Only process lines that are at least a little bit far apart from each other.
+            if (!Geom::are_near((*curve_start).initialPoint(), (*curve_start).finalPoint())) {
+                // This checkpoint code is most basic, it'd be better to use next/previous instead.
+                Geom::Point src_checkpoint(src_point[Geom::X], src_point[Geom::Y]);
+                Geom::Point dst_checkpoint(dst_point[Geom::X], dst_point[Geom::Y]);
+                Geom::Point real_point = getCheckpointPosition(&(*previous), &(*curve_start), src_checkpoint, dst_checkpoint);
+                Avoid::Point point_mid(real_point[Geom::X], real_point[Geom::Y]);
+                // Checkpoint directionality is controlled by node type
+                int dir = getCheckpointOrientation(&(*curve_start));
+                checkpoints.emplace_back(point_mid, dir, dir);
+            }
+            previous = curve_start;
+            ++curve_start;
+        }
+
+        if (!checkpoints.empty()) {
+            _connRef->setRoutingCheckpoints(checkpoints);
+        }
+
+        // This does the calculation
+        router->processTransaction();
+        output = connref_to_pathvector(*_connRef, curvature);
+        router->deleteConnector(_connRef);
+        if (src_shape) {
+            router->deleteShape(src_shape);
+        }
+        if (dst_shape) {
+            router->deleteShape(dst_shape);
+        }
+
+        // We ONLY care about the first shape
+        break;
+    }
+    return output;
+}
+
+/**
+ * Returns the connection start object, if it exists.
+ */
+SPItem *LPEConnectorLine::getConnStart()
+{
+    return dynamic_cast<SPItem *>(connection_start.getObject());
+}
+
+SPItem *LPEConnectorLine::getConnEnd()
+{
+    return dynamic_cast<SPItem *>(connection_end.getObject());
+}
+
+} // Inkscape::LivePathEffect
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/lpe-connector-line.h b/src/live_effects/lpe-connector-line.h
new file mode 100644
index 0000000000..dae0fedc6a
--- /dev/null
+++ b/src/live_effects/lpe-connector-line.h
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifndef INKSCAPE_LPE_CONNECTOR_LINE_H
+#define INKSCAPE_LPE_CONNECTOR_LINE_H
+
+/** \file
+ * LPE <connector_line> implementation used by the connector tool
+ * to connect two points together using libavoid.
+ */
+
+/*
+ * Authors:
+ *   Martin Owens <doctormo@geek-2.com>
+ *
+ * Copyright (C) Synopsys, Inc. 2021
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "3rdparty/adaptagrams/libavoid/connector.h"
+#include "3rdparty/adaptagrams/libavoid/geomtypes.h"
+#include "3rdparty/adaptagrams/libavoid/router.h"
+#include "3rdparty/adaptagrams/libavoid/shape.h"
+#include "live_effects/effect.h"
+#include "live_effects/parameter/enum.h"
+#include "live_effects/parameter/item.h"
+
+namespace Avoid {
+// Combination directons for checkpoints
+inline constexpr int ConnDirHorz = Avoid::ConnDirLeft | Avoid::ConnDirRight;
+inline constexpr int ConnDirVert = Avoid::ConnDirUp | Avoid::ConnDirDown;
+} // namespace Avoid
+
+namespace Inkscape::LivePathEffect {
+
+using LineGap = std::pair<double, double>;
+using LineGaps = std::vector<LineGap>;
+
+inline auto const ConnectorTypeData = std::to_array<Util::EnumData<Avoid::ConnType>>({
+    {Avoid::ConnType_None, N_("None"), "none"},
+    {Avoid::ConnType_PolyLine, N_("Polyline"), "polyline"},
+    {Avoid::ConnType_Orthogonal, N_("Orthogonal"), "orthogonal"},
+});
+inline auto const ConnectorType = Util::EnumDataConverter<Avoid::ConnType>{ConnectorTypeData.data(), ConnectorTypeData.size()};
+
+enum class RewriteMode
+{
+    Delete,
+    Edit,
+    Add,
+};
+
+enum DynamicMode : unsigned
+{
+    DynamicNone = 0,
+    DynamicX = 0x1,
+    DynamicY = 0x2,
+};
+
+enum class JumpMode
+{
+    Arc,
+    Gap,
+};
+
+inline auto const JumpTypeData = std::to_array<Util::EnumData<JumpMode>>({
+    {JumpMode::Arc, N_("Arc"), "arc"},
+    {JumpMode::Gap, N_("Gap"), "gap"},
+});
+inline auto const JumpType = Util::EnumDataConverter<JumpMode>{JumpTypeData.data(), JumpTypeData.size()};
+
+bool isConnector(SPObject const *obj);
+
+class LPEConnectorLine : public Effect
+{
+public:
+    LPEConnectorLine(LivePathEffectObject *lpeobject);
+
+    void doAfterEffect(SPLPEItem const *lpe_item, SPCurve *curve) override;
+
+    Geom::PathVector doEffect_path(Geom::PathVector const &path_in) override;
+
+    // Static middle part of doEffect_path used in connector-tool.cpp
+    static Geom::PathVector generate_path(Geom::PathVector const &path_in, Avoid::Router *router, SPObject *target,
+                                          SPItem *conn_start, SPItem *conn_end, Avoid::ConnType connector_type,
+                                          double curvature);
+    static Geom::PathVector generate_path(Geom::PathVector const &path_in, Avoid::Router *router, SPObject *target,
+                                          SPItem *item_start, Geom::Point *point_start, SPItem *item_end,
+                                          Geom::Point *point_end, Avoid::ConnType connector_type, double curvature);
+
+    static LPEConnectorLine *get(SPItem *item);
+    static Geom::Point getCheckpointPosition(Geom::Curve const *previous, Geom::Curve const *curve, Geom::Point const &start, Geom::Point const &end);
+    static int getCheckpointDynamic(Geom::Curve const *previous);
+    static int getCheckpointOrientation(Geom::Curve const *curve);
+    static int detectCheckpointOrientation(Geom::PathVector const &pathv, Geom::Point const &on_path);
+    static void setCheckpointOrientation(Geom::BezierCurve &curve, int dir);
+    static void setCheckpointDynamic(Geom::BezierCurve &bezier, unsigned dynamic);
+    static int getEndpointOrientation(Geom::Curve const *curve, bool is_end);
+    static void rewriteLine(SPShape *item, int index, Geom::Point p, int dir, unsigned dynamic, RewriteMode indel = RewriteMode::Edit);
+    static Geom::PathVector rewriteLine(Geom::Path const &path, int index, Geom::Point const &p, int dir, unsigned dynamic, RewriteMode indel = RewriteMode::Edit);
+    static void updateAll(SPDocument *doc);
+
+    bool providesOwnKnotholder() const override { return true; };
+
+    SPItem *getConnStart();
+    SPItem *getConnEnd();
+    Avoid::ConnType getConnType() const { return connector_type; }
+    double getCurvature() const { return curvature; }
+    double getSpacing() const { return spacing; }
+    double getJumpSize() const { return jump_size; }
+    JumpMode getJumpType() const { return jump_type; }
+    bool advancedEditor() { return connector_type == Avoid::ConnType_Orthogonal && curvature == 0.0; }
+    Geom::PathVector const &getRoutePath() const { return route_path; }
+
+private:
+    static Avoid::Point getConnectorPoint(Geom::Path::const_iterator curve, SPItem *item, Geom::Point *sub_point, SPObject *target);
+    static Avoid::ShapeRef *getConnectorShape(Avoid::Router *router, Avoid::Point point, SPItem *item, SPObject *target,
+                                              int orientation = Avoid::ConnDirAll);
+    static double getObjectAdjustment(SPObject *line, Geom::Path const &path, SPItem *item);
+    static LineGaps calculateGaps(Geom::Path const &input, double radius, std::vector<double> tas);
+    static Geom::PathVector addLineJumps(SPObject *line, Geom::Path const &path, JumpMode type, double size);
+    static void updateSiblings(SPObject *line);
+
+    ItemParam connection_start;
+    ItemParam connection_end;
+    EnumParam<Avoid::ConnType> connector_type;
+    EnumParam<JumpMode> jump_type;
+    ScalarParam jump_size;
+    ScalarParam curvature;
+    ScalarParam spacing;
+    BoolParam adjust_for_obj;
+    BoolParam adjust_for_marker;
+
+    Geom::PathVector route_path;
+};
+
+} // namespace Inkscape::LivePathEffect
+
+#endif // INKSCAPE_LPE_CONNECTOR_LINE_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/parameter/item-reference.cpp b/src/live_effects/parameter/item-reference.cpp
new file mode 100644
index 0000000000..69b9da1f55
--- /dev/null
+++ b/src/live_effects/parameter/item-reference.cpp
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * The reference corresponding to href of LPE Item parameter.
+ *
+ * Copyright (C) 2008 Johan Engelen
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "live_effects/parameter/item-reference.h"
+
+#include "object/sp-image.h"
+#include "object/sp-item-group.h"
+#include "object/sp-point.h"
+#include "object/sp-shape.h"
+#include "object/sp-text.h"
+
+namespace Inkscape::LivePathEffect {
+
+bool ItemReference::_acceptObject(SPObject *obj) const
+{
+    if (is<SPShape>(obj) || is<SPText>(obj) || is<SPGroup>(obj) ||
+        is<SPPoint>(obj) || is<SPImage>(obj) || is<SPImage>(obj))
+    {
+        // Refuse references to lpeobject.
+        if (obj == getOwner()) {
+            return false;
+        }
+        // TODO: check whether the referred item has this LPE applied, if so: deny deny deny!
+        return URIReference::_acceptObject(obj);
+    } else {
+        return false;
+    }
+}
+
+} // namespace Inkscape::LivePathEffect
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/parameter/item-reference.h b/src/live_effects/parameter/item-reference.h
new file mode 100644
index 0000000000..f84ee16752
--- /dev/null
+++ b/src/live_effects/parameter/item-reference.h
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifndef SEEN_LPE_ITEM_REFERENCE_H
+#define SEEN_LPE_ITEM_REFERENCE_H
+
+/*
+ * Copyright (C) 2008-2012 Authors
+ * Authors: Johan Engelen
+ *          Abhishek Sharma
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "object/sp-item.h"
+#include "object/uri-references.h"
+
+class SPItem;
+namespace Inkscape::XML { class Node; }
+
+namespace Inkscape::LivePathEffect {
+
+/**
+ * The reference corresponding to href of LPE ItemParam.
+ */
+class ItemReference : public Inkscape::URIReference
+{
+public:
+    ItemReference(SPObject *owner) : URIReference(owner) {}
+
+    ItemReference(ItemReference const &) = delete;
+    ItemReference &operator=(ItemReference const &) = delete;
+
+    SPItem *getObject() const {
+        return static_cast<SPItem *>(URIReference::getObject());
+    }
+
+protected:
+    bool _acceptObject(SPObject *obj) const override;
+};
+
+} // namespace Inkscape::LivePathEffect
+
+#endif // SEEN_LPE_ITEM_REFERENCE_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/parameter/item.cpp b/src/live_effects/parameter/item.cpp
new file mode 100644
index 0000000000..2787e5162e
--- /dev/null
+++ b/src/live_effects/parameter/item.cpp
@@ -0,0 +1,295 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) Johan Engelen 2007 <j.b.c.engelen@utwente.nl>
+ *   Abhishek Sharma
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "live_effects/parameter/item.h"
+
+#include <glibmm/i18n.h>
+
+#include <gtkmm/button.h>
+#include <gtkmm/label.h>
+
+#include "bad-uri-exception.h"
+
+#include "live_effects/effect.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/lpe-clone-original.h"
+
+#include "desktop.h"
+#include "inkscape.h"
+#include "selection.h"
+#include "selection-chemistry.h"
+#include "ui/icon-loader.h"
+
+// clipboard support
+#include "ui/clipboard.h"
+
+// required for linking to other paths
+#include "object/uri.h"
+#include "object/sp-lpe-item.h"
+
+namespace Inkscape::LivePathEffect {
+
+ItemParam::ItemParam(Glib::ustring const &label, Glib::ustring const &tip,
+                     Glib::ustring const &key, Inkscape::UI::Widget::Registry *wr,
+                     Effect *effect, char const *default_value)
+    : Parameter(label, tip, key, wr, effect)
+    , ref(effect->getLPEObj())
+{
+    defvalue = g_strdup(default_value);
+    ref_changed_connection = ref.changedSignal().connect(sigc::mem_fun(*this, &ItemParam::ref_changed));
+}
+
+ItemParam::~ItemParam()
+{
+    remove_link();
+    g_free(defvalue);
+}
+
+void ItemParam::param_set_default()
+{
+    param_readSVGValue(defvalue);
+}
+
+void ItemParam::param_update_default(char const *default_value)
+{
+    defvalue = strdup(default_value);
+}
+
+void ItemParam::param_set_and_write_default()
+{
+    param_write_to_repr(defvalue);
+}
+
+SPObject *ItemParam::param_fork()
+{
+    auto document = param_effect->getSPDoc();
+    if (!document) {
+        return nullptr;
+    }
+
+    auto oldobj = ref.getObject();
+    if (!oldobj) {
+        return nullptr;
+    }
+
+    auto xml_doc = document->getReprDoc();
+    auto fork = oldobj->getRepr()->duplicate(xml_doc);
+    auto newobj = oldobj->parent->appendChildRepr(fork);
+    if (newobj && newobj->getId()) {
+        linkitem(newobj->getId());
+    }
+
+    return newobj;
+}
+
+bool ItemParam::param_readSVGValue(char const *strvalue)
+{
+    if (!strvalue) {
+        return false;
+    }
+
+    remove_link();
+    if (strvalue[0] == '#') {
+        if (href) {
+            g_free(href);
+        }
+        href = g_strdup(strvalue);
+        try {
+            ref.attach(Inkscape::URI(href));
+            //lp:1299948
+            SPItem *i = ref.getObject();
+            if (i) {
+                linked_modified_callback(i, SP_OBJECT_MODIFIED_FLAG);
+            } // else: document still processing new events. Repr of the linked object not created yet.
+        } catch (Inkscape::BadURIException const &e) {
+            g_warning("%s", e.what());
+            ref.detach();
+        }
+    }
+    emit_changed();
+    return true;
+}
+
+Glib::ustring ItemParam::param_getSVGValue() const
+{
+    if (href) {
+        return href;
+    }
+    return "";
+}
+
+Glib::ustring ItemParam::param_getDefaultSVGValue() const
+{
+    return defvalue;
+}
+
+Gtk::Widget *ItemParam::param_newWidget()
+{
+    auto box = Gtk::make_managed<Gtk::Box>(Gtk::Orientation::HORIZONTAL);
+    auto icon = Gtk::manage(sp_get_icon_image("edit-clone", Gtk::IconSize::NORMAL));
+    auto button = Gtk::make_managed<Gtk::Button>();
+    auto label = Gtk::make_managed<Gtk::Label>(param_label);
+    label->set_hexpand();
+    label->set_halign(Gtk::Align::FILL);
+    box->append(*label);
+    label->set_tooltip_text(param_tooltip);
+    button->set_has_frame(false);
+    icon->show();
+    button->set_child(*icon);
+    button->show();
+    button->signal_clicked().connect(sigc::mem_fun(*this, &ItemParam::on_link_button_click));
+    button->set_hexpand();
+    button->set_halign(Gtk::Align::FILL);
+    box->append(*button);
+    button->set_tooltip_text(_("Link to item on clipboard"));
+
+    return box;
+}
+
+void ItemParam::emit_changed()
+{
+    changed = true;
+    signal_item_changed.emit();
+}
+
+
+void ItemParam::addCanvasIndicators(SPLPEItem const *, std::vector<Geom::PathVector> &)
+{
+}
+
+
+void ItemParam::start_listening(SPObject *to)
+{
+    if (!to) {
+        return;
+    }
+    linked_delete_connection = to->connectDelete(sigc::mem_fun(*this, &ItemParam::linked_delete));
+    linked_modified_connection = to->connectModified(sigc::mem_fun(*this, &ItemParam::linked_modified));
+    if (auto item = cast<SPItem>(to)) {
+        linked_transformed_connection = item->connectTransformed(sigc::mem_fun(*this, &ItemParam::linked_transformed));
+    }
+    linked_modified(to, SP_OBJECT_MODIFIED_FLAG); // simulate linked_modified signal, so that path data is updated
+}
+
+void ItemParam::quit_listening()
+{
+    linked_modified_connection.disconnect();
+    linked_delete_connection.disconnect();
+    linked_transformed_connection.disconnect();
+}
+
+void ItemParam::ref_changed(SPObject *, SPObject *new_ref)
+{
+    quit_listening();
+    if (new_ref) {
+        start_listening(new_ref);
+    }
+}
+
+void ItemParam::remove_link()
+{
+    if (href) {
+        ref.detach();
+        g_free(href);
+        href = nullptr;
+    }
+}
+
+void ItemParam::linked_delete(SPObject *)
+{
+    quit_listening();
+    remove_link();
+}
+
+void ItemParam::linked_modified(SPObject *linked_obj, unsigned flags)
+{
+    linked_modified_callback(linked_obj, flags);
+}
+
+void ItemParam::linked_transformed(Geom::Affine const *rel_transf, SPItem *moved_item)
+{
+    linked_transformed_callback(rel_transf, moved_item);
+}
+
+void ItemParam::linked_modified_callback(SPObject *linked_obj, unsigned)
+{
+    emit_changed();
+    param_effect->getLPEObj()->requestModified(SP_OBJECT_MODIFIED_FLAG);
+    last_transform = Geom::identity();
+}
+
+void ItemParam::linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item)
+{
+    last_transform = *rel_transf;
+    param_effect->getLPEObj()->requestModified(SP_OBJECT_MODIFIED_FLAG);
+    if (dynamic_cast<Inkscape::LivePathEffect::LPECloneOriginal *>(param_effect->getLPEObj()->get_lpe())) {
+        auto hreflist = param_effect->getLPEObj()->hrefList;
+        SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+        if (desktop && hreflist.size()) {
+            Inkscape::Selection *selection = desktop->getSelection();
+            SPLPEItem *sp_lpe_item = dynamic_cast<SPLPEItem *>(*hreflist.begin());
+            SPLPEItem *moved_lpeitem = dynamic_cast<SPLPEItem *>(moved_item);
+            // here use moved item because sp_lpe_item never has optimized transforms because clone LPE
+            if (sp_lpe_item && !selection->includes(sp_lpe_item) && moved_lpeitem && !last_transform.isTranslation()) {
+                if (!moved_lpeitem->optimizeTransforms()) {
+                    sp_lpe_item->transform *= last_transform;
+                }
+            } else if (sp_lpe_item && moved_lpeitem && moved_lpeitem->optimizeTransforms() && last_transform.isTranslation()) {
+                Geom::Affine orig = sp_lpe_item->transform;
+                sp_lpe_item->transform *= orig.inverse() * last_transform.inverse() * orig;  
+            }
+            sp_lpe_item->doWriteTransform(sp_lpe_item->transform);
+        }
+    }
+}
+
+
+void ItemParam::linkitem(Glib::ustring itemid)
+{
+    if (itemid.empty()) {
+        return;
+    }
+
+    // add '#' at start to make it an uri.
+    itemid.insert(itemid.begin(), '#');
+    if (href && std::strcmp(itemid.c_str(), href) == 0) {
+        // no change, do nothing
+        return;
+    } else {
+        // TODO:
+        // check if id really exists in document, or only in clipboard document: if only in clipboard then invalid
+        // check if linking to object to which LPE is applied (maybe delegated to PathReference
+
+        param_write_to_repr(itemid.c_str());
+        DocumentUndo::done(param_effect->getSPDoc(), _("Link item parameter to path"), "");
+    }
+}
+
+void ItemParam::on_link_button_click()
+{
+    auto cm = Inkscape::UI::ClipboardManager::get();
+    auto itemid = cm->getFirstObjectID();
+    if (itemid.empty()) {
+        return;
+    }
+    
+    linkitem(itemid);
+}
+
+} // namespace Inkscape::LivePathEffect
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/live_effects/parameter/item.h b/src/live_effects/parameter/item.h
new file mode 100644
index 0000000000..58c9f05a76
--- /dev/null
+++ b/src/live_effects/parameter/item.h
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#ifndef INKSCAPE_LIVEPATHEFFECT_PARAMETER_ITEM_H
+#define INKSCAPE_LIVEPATHEFFECT_PARAMETER_ITEM_H
+
+/*
+ * Inkscape::LivePathEffectParameters
+ *
+ * Copyright (C) Johan Engelen 2007 <j.b.c.engelen@utwente.nl>
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include <glib.h>
+
+#include "live_effects/parameter/parameter.h"
+#include "live_effects/parameter/item-reference.h"
+#include <sigc++/sigc++.h>
+
+namespace Inkscape::LivePathEffect {
+
+class ItemParam : public Parameter
+{
+public:
+    ItemParam(Glib::ustring const &label,
+              Glib::ustring const &tip,
+              Glib::ustring const &key,
+              Inkscape::UI::Widget::Registry *wr,
+              Effect *effect,
+              char const *default_value = "");
+    ~ItemParam() override;
+
+    Gtk::Widget *param_newWidget() override;
+
+    ParamType paramType() const override { return ParamType::ITEM; };
+    bool param_readSVGValue(char const *strvalue) override;
+    Glib::ustring param_getSVGValue() const override;
+    Glib::ustring param_getDefaultSVGValue() const override;
+    void param_set_default() override;
+    void param_update_default(char const *default_value) override;
+    void param_set_and_write_default();
+    SPObject *param_fork();
+    void addCanvasIndicators(SPLPEItem const *lpeitem, std::vector<Geom::PathVector> &hp_vec) override;
+    sigc::signal<void ()> signal_item_pasted;
+    sigc::signal<void ()> signal_item_changed;
+    void linkitem(Glib::ustring itemid);
+    SPItem *getObject() const { return ref.getObject(); }
+
+    friend class LPEBool;
+
+    Geom::Affine last_transform;
+    bool changed = true; /* this gets set whenever the path is changed (this is set to true, and then the signal_item_changed signal is emitted).
+                          * the user must set it back to false if she wants to use it sensibly */
+
+protected:
+    char *href = nullptr; // contains link to other object, e.g. "#path2428", NULL if ItemParam contains pathdata itself
+    ItemReference ref;
+    sigc::connection ref_changed_connection;
+    sigc::connection linked_delete_connection;
+    sigc::connection linked_modified_connection;
+    sigc::connection linked_transformed_connection;
+    void ref_changed(SPObject *old_ref, SPObject *new_ref);
+    void remove_link();
+    void start_listening(SPObject *to);
+    void quit_listening();
+    void linked_delete(SPObject *deleted);
+    void linked_modified(SPObject *linked_obj, unsigned flags);
+    void linked_transformed(Geom::Affine const *rel_transf, SPItem *moved_item);
+    virtual void linked_modified_callback(SPObject *linked_obj, unsigned flags);
+    virtual void linked_transformed_callback(Geom::Affine const *rel_transf, SPItem *moved_item);
+    void on_link_button_click();
+    void emit_changed();
+
+    char *defvalue;
+};
+
+} // namespace Inkscape::LivePathEffect
+
+#endif // INKSCAPE_LIVEPATHEFFECT_PARAMETER_ITEM_H
diff --git a/src/live_effects/parameter/path-reference.cpp b/src/live_effects/parameter/path-reference.cpp
index b1cc41b392..8057dfa09f 100644
--- a/src/live_effects/parameter/path-reference.cpp
+++ b/src/live_effects/parameter/path-reference.cpp
@@ -10,7 +10,6 @@
 #include "live_effects/parameter/path-reference.h"
 
 #include "object/sp-shape.h"
-#include "object/sp-text.h"
 
 namespace Inkscape {
 namespace LivePathEffect {
@@ -22,7 +21,7 @@ SPItem *PathReference::getObject() const
 
 bool PathReference::_acceptObject(SPObject *obj) const
 {
-    if (is<SPShape>(obj) || is<SPText>(obj)) {
+    if (is<SPShape>(obj)) {
         /* Refuse references to lpeobject */
         if (obj == getOwner()) {
             return false;
diff --git a/src/object/CMakeLists.txt b/src/object/CMakeLists.txt
index 2610a9a2b6..dcc3584ae0 100644
--- a/src/object/CMakeLists.txt
+++ b/src/object/CMakeLists.txt
@@ -10,8 +10,6 @@ set(object_SRC
   persp3d.cpp
   sp-anchor.cpp
   sp-clippath.cpp
-  sp-conn-end-pair.cpp
-  sp-conn-end.cpp
   sp-defs.cpp
   sp-desc.cpp
   sp-dimensions.cpp
@@ -55,6 +53,7 @@ set(object_SRC
   sp-page.cpp
   sp-path.cpp
   sp-pattern.cpp
+  sp-point.cpp
   sp-polygon.cpp
   sp-polyline.cpp
   sp-radial-gradient.cpp
@@ -96,8 +95,6 @@ set(object_SRC
   persp3d.h
   sp-anchor.h
   sp-clippath.h
-  sp-conn-end-pair.h
-  sp-conn-end.h
   sp-defs.h
   sp-desc.h
   sp-dimensions.h
@@ -147,6 +144,7 @@ set(object_SRC
   sp-page.h
   sp-path.h
   sp-pattern.h
+  sp-point.h
   sp-polygon.h
   sp-polyline.h
   sp-radial-gradient.h
diff --git a/src/object/README b/src/object/README
index 207c265758..3f4c5de0b0 100644
--- a/src/object/README
+++ b/src/object/README
@@ -92,8 +92,6 @@ Other related files:
 
   object-set.h:
   persp3d-reference.h
-  sp-conn-end-pair.h
-  sp-conn-end.h
   sp-dimensions.h
   sp-factory.h
   sp-filter-reference.h
diff --git a/src/object/algorithms/graphlayout.cpp b/src/object/algorithms/graphlayout.cpp
index 7b067b80c8..3f374461b9 100644
--- a/src/object/algorithms/graphlayout.cpp
+++ b/src/object/algorithms/graphlayout.cpp
@@ -33,21 +33,18 @@
 #include "3rdparty/adaptagrams/libcola/cola.h"
 #include "3rdparty/adaptagrams/libcola/connected_components.h"
 
+#include "live_effects/lpe-connector-line.h"
+
+#include "ui/tools/connector-tool.h"
 #include "object/sp-namedview.h"
 #include "object/sp-path.h"
 #include "style.h"
 
+using namespace Inkscape::UI::Tools;
+using namespace Inkscape::LivePathEffect;
 using namespace cola;
 using namespace vpsc;
 
-/**
- * Returns true if item is a connector
- */
-bool isConnector(SPItem const * const item) {
-    auto path = cast<SPPath>(item);
-    return path && path->connEndPair.isAutoRoutingConn();
-}
-
 struct CheckProgress: TestConvergence {
     CheckProgress(double d, unsigned i, std::list<SPItem*> & selected, Rectangles & rs,
             std::map<std::string, unsigned> & nodelookup)
@@ -57,24 +54,6 @@ struct CheckProgress: TestConvergence {
         , nodelookup(nodelookup)
     {}
     bool operator()(const double new_stress, std::valarray<double> & X, std::valarray<double> & Y) override {
-        /* This is where, if we wanted to animate the layout, we would need to update
-         * the positions of all objects and redraw the canvas and maybe sleep a bit
-         cout << "stress="<<new_stress<<endl;
-        cout << "x[0]="<<rs[0]->getMinX()<<endl;
-        for (std::list<SPItem *>::iterator it(selected.begin());
-            it != selected.end();
-            ++it)
-        {
-            SPItem *u=*it;
-            if(!isConnector(u)) {
-                Rectangle* r=rs[nodelookup[u->id]];
-                Geom::Rect const item_box(sp_item_bbox_desktop(u));
-                Geom::Point const curr(item_box.midpoint());
-                Geom::Point const dest(r->getCentreX(),r->getCentreY());
-                u->move_rel(Geom::Translate(dest - curr));
-            }
-        }
-        */
         return TestConvergence::operator()(new_stress, X, Y);
     }
     std::list<SPItem*> & selected;
@@ -111,9 +90,7 @@ void graphlayout(std::vector<SPItem*> const & items) {
 
     // add the connector spacing to the size of node bounding boxes
     // so that connectors can always be routed between shapes
-    SPDesktop * desktop = SP_ACTIVE_DESKTOP;
     double spacing = 0;
-    if (desktop) spacing = desktop->getNamedView()->connector_spacing + 0.1;
 
     std::map<std::string, unsigned> nodelookup;
     Rectangles rs;
@@ -144,15 +121,30 @@ void graphlayout(std::vector<SPItem*> const & items) {
     bool avoid_overlaps = prefs->getBool("/tools/connector/avoidoverlaplayout");
 
     for (SPItem* conn: connectors) {
-        auto path = cast<SPPath>(conn);
-        std::array<SPItem*, 2> attachedItems;
-        path->connEndPair.getAttachedItems(attachedItems.data());
-        if (attachedItems[0] == nullptr) continue;
-        if (attachedItems[1] == nullptr) continue;
-        std::map<std::string, unsigned>::iterator i_iter=nodelookup.find(attachedItems[0]->getId());
+        auto lpe = LPEConnectorLine::get(conn);
+        if (!lpe) {
+            continue;
+        }
+
+        auto conn_start = lpe->getConnStart();
+        auto conn_end = lpe->getConnEnd();
+
+        // Make sure sp-point connections map to their parent
+        if (auto sp_point = cast<SPPoint>(conn_start)) {
+            conn_start = cast<SPItem>(sp_point->parent);
+        }
+        if (auto sp_point = cast<SPPoint>(conn_end)) {
+            conn_end = cast<SPItem>(sp_point->parent);
+        }
+
+        if (!conn_start || !conn_end) {
+            continue;
+        }
+
+        std::map<std::string, unsigned>::iterator i_iter=nodelookup.find(conn_start->getId());
         if (i_iter == nodelookup.end()) continue;
         unsigned rect_index_first = i_iter->second;
-        i_iter = nodelookup.find(attachedItems[1]->getId());
+        i_iter = nodelookup.find(conn_end->getId());
         if (i_iter == nodelookup.end()) continue;
         unsigned rect_index_second = i_iter->second;
         es.emplace_back(rect_index_first, rect_index_second);
diff --git a/src/object/algorithms/graphlayout.h b/src/object/algorithms/graphlayout.h
index 6c6b601f59..d43263bceb 100644
--- a/src/object/algorithms/graphlayout.h
+++ b/src/object/algorithms/graphlayout.h
@@ -22,8 +22,6 @@ class SPItem;
 
 void graphlayout(std::vector<SPItem*> const &items);
 
-bool isConnector(SPItem const *const item);
-
 void filterConnectors(std::vector<SPItem*> const &items, std::list<SPItem *> &filtered);
 
 #endif // SEEN_GRAPHLAYOUT_H
diff --git a/src/object/sp-conn-end-pair.cpp b/src/object/sp-conn-end-pair.cpp
deleted file mode 100644
index 706a699eb6..0000000000
--- a/src/object/sp-conn-end-pair.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * A class for handling connector endpoint movement and libavoid interaction.
- *
- * Authors:
- *   Peter Moulder <pmoulder@mail.csse.monash.edu.au>
- *   Michael Wybrow <mjwybrow@users.sourceforge.net>
- *   Abhishek Sharma
- *
- *    * Copyright (C) 2004-2005 Monash University
- *
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-#include "sp-conn-end-pair.h"
-
-#include <cstring>
-#include <string>
-#include <glibmm/stringutils.h>
-
-#include "attributes.h"
-#include "document.h"
-#include "sp-conn-end.h"
-#include "sp-item-group.h"
-#include "sp-path.h"
-#include "sp-use.h"
-#include "uri.h"
-
-#include "3rdparty/adaptagrams/libavoid/router.h"
-#include "display/curve.h"
-#include "xml/node.h"
-
-SPConnEndPair::SPConnEndPair(SPPath *const owner)
-    : _path(owner)
-    , _connRef(nullptr)
-    , _connType(SP_CONNECTOR_NOAVOID)
-    , _connCurvature(0.0)
-    , _transformed_connection()
-{
-    for (unsigned handle_ix = 0; handle_ix <= 1; ++handle_ix) {
-        this->_connEnd[handle_ix] = new SPConnEnd(owner);
-        this->_connEnd[handle_ix]->_changed_connection
-            = this->_connEnd[handle_ix]->ref.changedSignal()
-            .connect(sigc::bind(sigc::ptr_fun(sp_conn_end_href_changed),
-                                this->_connEnd[handle_ix], owner, handle_ix));
-    }
-}
-
-SPConnEndPair::~SPConnEndPair()
-{
-    for (auto & handle_ix : this->_connEnd) {
-        delete handle_ix;
-        handle_ix = nullptr;
-    }
-}
-
-void SPConnEndPair::release()
-{
-    for (auto & handle_ix : this->_connEnd) {
-        handle_ix->_changed_connection.disconnect();
-        handle_ix->_delete_connection.disconnect();
-        handle_ix->_transformed_connection.disconnect();
-        g_free(handle_ix->href);
-        handle_ix->href = nullptr;
-        handle_ix->ref.detach();
-    }
-
-    // If the document is being destroyed then the router instance
-    // and the ConnRefs will have been destroyed with it.
-    const bool routerInstanceExists = (_path->document->getRouter() != nullptr);
-
-    if (_connRef && routerInstanceExists) {
-        _connRef->router()->deleteConnector(_connRef);
-    }
-    _connRef = nullptr;
-
-    _transformed_connection.disconnect();
-}
-
-void sp_conn_end_pair_build(SPObject *object)
-{
-    object->readAttr(SPAttr::CONNECTOR_TYPE);
-    object->readAttr(SPAttr::CONNECTION_START);
-    object->readAttr(SPAttr::CONNECTION_START_POINT);
-    object->readAttr(SPAttr::CONNECTION_END);
-    object->readAttr(SPAttr::CONNECTION_END_POINT);
-    object->readAttr(SPAttr::CONNECTOR_CURVATURE);
-}
-
-
-static void avoid_conn_transformed(Geom::Affine const */*mp*/, SPItem *moved_item)
-{
-    auto path = cast<SPPath>(moved_item);
-    if (path->connEndPair.isAutoRoutingConn()) {
-        path->connEndPair.tellLibavoidNewEndpoints();
-    }
-}
-
-
-void SPConnEndPair::setAttr(const SPAttr key, gchar const *const value)
-{
-    switch (key) {
-    case SPAttr::CONNECTOR_TYPE:
-        if (value && (strcmp(value, "polyline") == 0 || strcmp(value, "orthogonal") == 0)) {
-            int new_conn_type = strcmp(value, "polyline") ? SP_CONNECTOR_ORTHOGONAL : SP_CONNECTOR_POLYLINE;
-
-            if (!_connRef) {
-                _connType = new_conn_type;
-                Avoid::Router *router = _path->document->getRouter();
-                _connRef = new Avoid::ConnRef(router);
-                _connRef->setRoutingType(new_conn_type == SP_CONNECTOR_POLYLINE ?
-                    Avoid::ConnType_PolyLine : Avoid::ConnType_Orthogonal);
-                _transformed_connection = _path->connectTransformed(sigc::ptr_fun(&avoid_conn_transformed));
-            } else if (new_conn_type != _connType) {
-                _connType = new_conn_type;
-                _connRef->setRoutingType(new_conn_type == SP_CONNECTOR_POLYLINE ?
-                    Avoid::ConnType_PolyLine : Avoid::ConnType_Orthogonal);
-                sp_conn_reroute_path(_path);
-            }
-        } else {
-            _connType = SP_CONNECTOR_NOAVOID;
-
-            if (_connRef) {
-                _connRef->router()->deleteConnector(_connRef);
-                _connRef = nullptr;
-                _transformed_connection.disconnect();
-            }
-        }
-        break;
-    case SPAttr::CONNECTOR_CURVATURE:
-        if (value) {
-            _connCurvature = g_strtod(value, nullptr);
-            if (_connRef && _connRef->isInitialised()) {
-                // Redraw the connector, but only if it has been initialised.
-                sp_conn_reroute_path(_path);
-            }
-        }
-        break;
-    case SPAttr::CONNECTION_START:
-        this->_connEnd[0]->setAttacherHref(value);
-        break;
-    case SPAttr::CONNECTION_START_POINT:
-        this->_connEnd[0]->setAttacherSubHref(value);
-        break;
-    case SPAttr::CONNECTION_END:
-        this->_connEnd[1]->setAttacherHref(value);
-        break;
-    case SPAttr::CONNECTION_END_POINT:
-        this->_connEnd[1]->setAttacherSubHref(value);
-        break;
-    }
-}
-
-void SPConnEndPair::writeRepr(Inkscape::XML::Node *const repr) const
-{
-    char const * const attrs[] = {
-        "inkscape:connection-start", "inkscape:connection-end"};
-    char const * const point_attrs[] = {
-        "inkscape:connection-start-point", "inkscape:connection-end-point"};
-    for (unsigned handle_ix = 0; handle_ix < 2; ++handle_ix) {
-        const Inkscape::URI* U = this->_connEnd[handle_ix]->ref.getURI();
-        if (U) {
-            auto str = U->str();
-            repr->setAttribute(attrs[handle_ix], str);
-        }
-        const Inkscape::URI* P = this->_connEnd[handle_ix]->sub_ref.getURI();
-        if (P) {
-            auto str = P->str();
-            repr->setAttribute(point_attrs[handle_ix], str);
-        }
-    }
-    if (_connType == SP_CONNECTOR_POLYLINE || _connType == SP_CONNECTOR_ORTHOGONAL) {
-        repr->setAttribute("inkscape:connector-curvature", Glib::Ascii::dtostr(_connCurvature));
-        repr->setAttribute("inkscape:connector-type", _connType == SP_CONNECTOR_POLYLINE ? "polyline" : "orthogonal" );
-    }
-}
-
-void SPConnEndPair::getAttachedItems(SPItem *h2attItem[2]) const {
-    for (unsigned h = 0; h < 2; ++h) {
-        auto obj = this->_connEnd[h]->ref.getObject();
-        auto sub_obj = this->_connEnd[h]->sub_ref.getObject();
-
-        if(sub_obj) {
-            // For sub objects, we have to go fishing for the virtual/shadow
-            // object which has the correct position for this use/symbol
-            auto use = cast<SPUse>(obj);
-            if(use) {
-                auto root = use->root();
-                bool found = false;
-                for (auto& child: root->children) {
-                    if(!g_strcmp0(child.getAttribute("id"), sub_obj->getId())) {
-                        h2attItem[h] = (SPItem *) &child;
-                        found = true;
-                    }
-                }
-                if(!found) {
-                    g_warning("Couldn't find sub connector point!");
-                }
-            }
-        } else {
-            h2attItem[h] = obj;
-        }
-
-        // Deal with the case of the attached object being an empty group.
-        // A group containing no items does not have a valid bbox, so
-        // causes problems for the auto-routing code.  Also, since such a
-        // group no longer has an onscreen representation and can only be
-        // selected through the XML editor, it makes sense just to detach
-        // connectors from them.
-        if (auto group = cast<SPGroup>(h2attItem[h])) {
-            if (group->getItemCount() == 0) {
-                // This group is empty, so detach.
-                sp_conn_end_detach(_path, h);
-                h2attItem[h] = nullptr;
-            }
-        }
-    }
-}
-
-void SPConnEndPair::getEndpoints(Geom::Point endPts[]) const
-{
-    SPCurve const *curve = _path->curveForEdit();
-    SPItem *h2attItem[2] = {nullptr};
-    getAttachedItems(h2attItem);
-    Geom::Affine i2d = _path->i2doc_affine();
-
-    for (unsigned h = 0; h < 2; ++h) {
-        if (h2attItem[h]) {
-            endPts[h] = h2attItem[h]->getAvoidRef().getConnectionPointPos();
-        } else if (!curve->is_empty()) {
-            if (h == 0) {
-                endPts[h] = *(curve->first_point()) * i2d;
-            } else {
-                endPts[h] = *(curve->last_point()) * i2d;
-            }
-        }
-    }
-}
-
-gdouble SPConnEndPair::getCurvature() const
-{
-    return _connCurvature;
-}
-
-SPConnEnd** SPConnEndPair::getConnEnds()
-{
-    return _connEnd;
-}
-
-bool SPConnEndPair::isOrthogonal() const
-{
-    return _connType == SP_CONNECTOR_ORTHOGONAL;
-}
-
-
-static void redrawConnectorCallback(void *ptr)
-{
-    auto path = static_cast<SPPath *>(ptr);
-    if (path->document == nullptr) {
-        // This can happen when the document is being destroyed.
-        return;
-    }
-    sp_conn_redraw_path(path);
-}
-
-void SPConnEndPair::rerouteFromManipulation()
-{
-    sp_conn_reroute_path_immediate(_path);
-}
-
-
-// Called from SPPath::update to initialise the endpoints.
-void SPConnEndPair::update()
-{
-    if (_connType != SP_CONNECTOR_NOAVOID) {
-        g_assert(_connRef != nullptr);
-        if (!_connRef->isInitialised()) {
-            _updateEndPoints();
-            _connRef->setCallback(&redrawConnectorCallback, _path);
-        }
-    }
-}
-
-void SPConnEndPair::_updateEndPoints()
-{
-    Geom::Point endPt[2];
-    getEndpoints(endPt);
-
-    Avoid::Point src(endPt[0][Geom::X], endPt[0][Geom::Y]);
-    Avoid::Point dst(endPt[1][Geom::X], endPt[1][Geom::Y]);
-
-    _connRef->setEndpoints(src, dst);
-}
-
-
-bool SPConnEndPair::isAutoRoutingConn() const
-{
-    return _connType != SP_CONNECTOR_NOAVOID;
-}
-
-void SPConnEndPair::makePathInvalid()
-{
-    g_assert(_connRef != nullptr);
-
-    _connRef->makePathInvalid();
-}
-
-// Redraws the curve along the recalculated route
-// Straight or curved
-SPCurve SPConnEndPair::createCurve(Avoid::ConnRef *connRef, const gdouble curvature)
-{
-    g_assert(connRef != nullptr);
-
-    bool straight = curvature<1e-3;
-
-    Avoid::PolyLine route = connRef->displayRoute();
-    if (!straight) route = route.curvedPolyline(curvature);
-    connRef->calcRouteDist();
-
-    SPCurve curve;
-
-    curve.moveto(Geom::Point(route.ps[0].x, route.ps[0].y));
-    int pn = route.size();
-    for (int i = 1; i < pn; ++i) {
-        Geom::Point p(route.ps[i].x, route.ps[i].y);
-        if (straight) {
-            curve.lineto(p);
-        } else {
-            switch (route.ts[i]) {
-                case 'M':
-                    curve.moveto(p);
-                    break;
-                case 'L':
-                    curve.lineto(p);
-                    break;
-                case 'C':
-                    g_assert(i + 2 < pn);
-                    curve.curveto(p, Geom::Point(route.ps[i+1].x, route.ps[i+1].y),
-                                  Geom::Point(route.ps[i+2].x, route.ps[i+2].y));
-                    i+=2;
-                    break;
-            }
-        }
-    }
-
-    return curve;
-}
-
-void SPConnEndPair::tellLibavoidNewEndpoints(bool const processTransaction)
-{
-    if (_connRef == nullptr || !isAutoRoutingConn()) {
-        // Do nothing
-        return;
-    }
-    makePathInvalid();
-
-    _updateEndPoints();
-    if (processTransaction) {
-        _connRef->router()->processTransaction();
-    }
-    return;
-}
-
-bool SPConnEndPair::reroutePathFromLibavoid()
-{
-    if (!_connRef || !isAutoRoutingConn()) {
-        // Do nothing
-        return false;
-    }
-
-    auto curve = createCurve(_connRef, _connCurvature);
-
-    auto doc2item = _path->i2doc_affine().inverse();
-    curve.transform(doc2item);
-
-    _path->setCurve(std::move(curve));
-
-    return true;
-}
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/object/sp-conn-end-pair.h b/src/object/sp-conn-end-pair.h
deleted file mode 100644
index 64881bc2c7..0000000000
--- a/src/object/sp-conn-end-pair.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#ifndef SEEN_SP_CONN_END_PAIR
-#define SEEN_SP_CONN_END_PAIR
-
-/*
- * A class for handling connector endpoint movement and libavoid interaction.
- *
- * Authors:
- *   Peter Moulder <pmoulder@mail.csse.monash.edu.au>
- *
- *    * Copyright (C) 2004 Monash University
- *
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-#include <cstddef>
-#include <sigc++/sigc++.h>
-
-#include "3rdparty/adaptagrams/libavoid/connector.h"
-#include "attributes.h"
-
-
-class SPConnEnd;
-class SPCurve;
-class SPPath;
-class SPItem;
-class SPObject;
-
-namespace Geom { class Point; }
-namespace Inkscape {
-namespace XML {
-class Node;
-}
-}
-
-class SPConnEndPair {
-public:
-    SPConnEndPair(SPPath *);
-    ~SPConnEndPair();
-    void release();
-    void setAttr(const SPAttr key, char const *const value);
-    void writeRepr(Inkscape::XML::Node *const repr) const;
-    void getAttachedItems(SPItem *[2]) const;
-    void getEndpoints(Geom::Point endPts[]) const;
-    double getCurvature() const;
-    SPConnEnd **getConnEnds();
-    bool isOrthogonal() const;
-    static SPCurve createCurve(Avoid::ConnRef *connRef, double curvature);
-    void tellLibavoidNewEndpoints(bool const processTransaction = false);
-    bool reroutePathFromLibavoid();
-    void makePathInvalid();
-    void update();
-    bool isAutoRoutingConn() const;
-    void rerouteFromManipulation();
-
-private:
-    void _updateEndPoints();
-
-    SPConnEnd *_connEnd[2];
-
-    SPPath *_path;
-
-    // libavoid's internal representation of the item.
-    Avoid::ConnRef *_connRef;
-
-    int _connType;
-    double _connCurvature;
-
-    // A sigc connection for transformed signal.
-    sigc::connection _transformed_connection;
-};
-
-
-void sp_conn_end_pair_build(SPObject *object);
-
-
-// _connType options:
-enum {
-    SP_CONNECTOR_NOAVOID,     // Basic connector - a straight line.
-    SP_CONNECTOR_POLYLINE,    // Object avoiding polyline.
-    SP_CONNECTOR_ORTHOGONAL   // Object avoiding orthogonal polyline (only horizontal and vertical segments).
-};
-
-#endif /* !SEEN_SP_CONN_END_PAIR */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/object/sp-conn-end.cpp b/src/object/sp-conn-end.cpp
deleted file mode 100644
index 2431736228..0000000000
--- a/src/object/sp-conn-end.cpp
+++ /dev/null
@@ -1,275 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/** @file
- * TODO: insert short description here
- *//*
- * Authors: see git history
- *
- * Copyright (C) 2018 Authors
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-#include "sp-conn-end.h"
-
-#include <2geom/path-intersection.h>
-
-#include "sp-item-group.h"
-#include "sp-path.h"
-#include "display/curve.h"
-
-
-static void change_endpts(SPPath *path, double endPos[2]);
-
-SPConnEnd::SPConnEnd(SPObject *const owner)
-    : ref(owner)
-    , sub_ref(owner)
-    , href(nullptr)
-    , sub_href(nullptr)
-    // Default to center connection endpoint
-    , _changed_connection()
-    , _delete_connection()
-    , _transformed_connection()
-{
-}
-
-static SPObject const *get_nearest_common_ancestor(SPObject const *const obj, SPItem const *const objs[2])
-{
-    SPObject const *anc_sofar = obj;
-    for (unsigned i = 0; i < 2; ++i) {
-        if ( objs[i] != nullptr ) {
-            anc_sofar = anc_sofar->nearestCommonAncestor(objs[i]);
-        }
-    }
-    return anc_sofar;
-}
-
-
-static bool try_get_intersect_point_with_item_recursive(Geom::PathVector& conn_pv, SPItem* item,
-        const Geom::Affine& item_transform, double& intersect_pos)
-{
-    double initial_pos = intersect_pos;
-    // if this is a group...
-    if (is<SPGroup>(item)) {
-        auto group = cast<SPGroup>(item);
-
-        // consider all first-order children
-        double child_pos = 0.0;
-        std::vector<SPItem*> g = group->item_list();
-        for (auto child_item : g) {
-            try_get_intersect_point_with_item_recursive(conn_pv, child_item,
-                    item_transform * child_item->transform, child_pos);
-            if (intersect_pos < child_pos)
-                intersect_pos = child_pos;
-        }
-        return intersect_pos != initial_pos;
-    }
-
-    // if this is not a shape, nothing to be done
-    auto shape = cast<SPShape>(item);
-    if (!shape)
-        return false;
-
-    // make sure it has an associated curve
-    if (!shape->curve()) return false;
-
-    // apply transformations (up to common ancestor)
-    auto const curve_pv = shape->curve()->get_pathvector() * item_transform;
-    Geom::CrossingSet cross = crossings(conn_pv, curve_pv);
-    // iterate over all Crossings
-    //TODO: check correctness of the following code: inner loop uses loop variable
-    //      with a name identical to the loop variable of the outer loop. Then rename.
-    for (const auto & cr : cross) {
-        for (const auto & cr_pt : cr) {
-            if ( intersect_pos < cr_pt.ta)
-                intersect_pos = cr_pt.ta;
-        }
-    }
-
-    return intersect_pos != initial_pos;
-}
-
-
-// This function returns the outermost intersection point between the path (a connector)
-// and the item given.  If the item is a group, then the component items are considered.
-// The transforms given should be to a common ancestor of both the path and item.
-//
-static bool try_get_intersect_point_with_item(SPPath* conn, SPItem* item,
-        const Geom::Affine& item_transform, const Geom::Affine& conn_transform,
-        const bool at_start, double& intersect_pos)
-{
-    // Copy the curve and apply transformations up to common ancestor.
-    auto conn_pv = conn->curve()->get_pathvector() * conn_transform;
-
-    // If this is not the starting point, use Geom::Path::reverse() to reverse the path
-    if (!at_start) {
-        // connectors are actually a single path, so consider the first element from a Geom::PathVector
-        conn_pv[0] = conn_pv[0].reversed();
-    }
-
-    // We start with the intersection point at the beginning of the path
-    intersect_pos = 0.0;
-
-    // Find the intersection.
-    bool result = try_get_intersect_point_with_item_recursive(conn_pv, item, item_transform, intersect_pos);
-
-    if (!result) {
-        // No intersection point has been found (why?)
-        // just default to connector end
-        intersect_pos = 0;
-    }
-    // If not at the starting point, recompute position with respect to original path
-    if (!at_start) {
-        intersect_pos = conn_pv[0].size() - intersect_pos;
-    }
-
-    return result;
-}
-
-
-static void sp_conn_get_route_and_redraw(SPPath *const path, const bool updatePathRepr = true)
-{
-    // Get the new route around obstacles.
-    bool rerouted = path->connEndPair.reroutePathFromLibavoid();
-    if (!rerouted) {
-        return;
-    }
-
-    SPItem *h2attItem[2] = {nullptr};
-    path->connEndPair.getAttachedItems(h2attItem);
-
-    SPObject const *const ancestor = get_nearest_common_ancestor(path, h2attItem);
-    Geom::Affine const path2anc(i2anc_affine(path, ancestor));
-
-    // Set sensible values in case there the connector ends are not
-    // attached to any shapes.
-    Geom::PathVector conn_pv = path->curve()->get_pathvector();
-    double endPos[2] = { 0.0, static_cast<double>(conn_pv[0].size()) };
-
-    for (unsigned h = 0; h < 2; ++h) {
-        // Assume center point for all
-        if (h2attItem[h]) {
-            Geom::Affine h2i2anc = i2anc_affine(h2attItem[h], ancestor);
-            try_get_intersect_point_with_item(path, h2attItem[h], h2i2anc, path2anc,
-                        (h == 0), endPos[h]);
-        }
-    }
-    change_endpts(path, endPos);
-    if (updatePathRepr) {
-        path->updateRepr();
-        path->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
-    }
-}
-
-static void sp_conn_end_shape_modified(SPPath *path)
-{
-    if (path->connEndPair.isAutoRoutingConn()) {
-        path->connEndPair.tellLibavoidNewEndpoints();
-    }
-}
-
-void sp_conn_reroute_path(SPPath *const path)
-{
-    if (path->connEndPair.isAutoRoutingConn()) {
-        path->connEndPair.tellLibavoidNewEndpoints();
-    }
-}
-
-
-void sp_conn_reroute_path_immediate(SPPath *const path)
-{
-    if (path->connEndPair.isAutoRoutingConn()) {
-        path->connEndPair.tellLibavoidNewEndpoints(true);
-    }
-    // Don't update the path repr or else connector dragging is slowed by
-    // constant update of values to the xml editor, and each step is also
-    // needlessly remembered by undo/redo.
-    sp_conn_get_route_and_redraw(path, false);
-}
-
-void sp_conn_redraw_path(SPPath *const path)
-{
-    sp_conn_get_route_and_redraw(path);
-}
-
-
-static void change_endpts(SPPath *path, double endPos[2])
-{
-    // Use Geom::Path::portion to cut the curve at the end positions
-    if (endPos[0] > endPos[1]) {
-        // Path is "negative", reset the curve and return
-        path->setCurve({});
-        return;
-    }
-    const Geom::Path& old_path = path->curve()->get_pathvector()[0];
-    Geom::PathVector new_path_vector;
-    new_path_vector.push_back(old_path.portion(endPos[0], endPos[1]));
-    path->setCurve(SPCurve(std::move(new_path_vector)));
-}
-
-static void sp_conn_end_deleted(SPObject *, SPObject *const owner, unsigned const handle_ix)
-{
-    char const * const attrs[] = {
-        "inkscape:connection-start", "inkscape:connection-end"};
-    owner->removeAttribute(attrs[handle_ix]);
-
-    char const * const point_attrs[] = {
-        "inkscape:connection-start-point", "inkscape:connection-end-point"};
-    owner->removeAttribute(point_attrs[handle_ix]);
-    /* I believe this will trigger sp_conn_end_href_changed. */
-}
-
-void sp_conn_end_detach(SPObject *const owner, unsigned const handle_ix)
-{
-    sp_conn_end_deleted(nullptr, owner, handle_ix);
-}
-
-void SPConnEnd::setAttacherHref(gchar const *value)
-{
-    if (g_strcmp0(value, href) != 0) {
-        g_free(href);
-        href = g_strdup(value);
-        if (!ref.try_attach(value)) {
-            g_free(href);
-            href = nullptr;
-        }
-    }
-}
-
-void SPConnEnd::setAttacherSubHref(gchar const *value)
-{
-    // TODO This could check the URI object is actually a sub-object
-    // of the set href. It should be done here and in setAttacherHref
-    if (g_strcmp0(value, sub_href) != 0) {
-        g_free(sub_href);
-        sub_href = g_strdup(value);
-        if (!sub_ref.try_attach(value)) {
-            g_free(sub_href);
-            sub_href = nullptr;
-        }
-    }
-}
-
-void sp_conn_end_href_changed(SPObject */*old_ref*/, SPObject */*ref*/, SPConnEnd *connEnd, SPPath *path, unsigned handle_ix)
-{
-    if (!connEnd) return;
-    connEnd->_delete_connection.disconnect();
-    connEnd->_transformed_connection.disconnect();
-
-    if (connEnd->href) {
-        if (auto refobj = connEnd->ref.getObject()) {
-            connEnd->_delete_connection = refobj->connectDelete(sigc::bind(sigc::ptr_fun(&sp_conn_end_deleted), path, handle_ix));
-            connEnd->_transformed_connection = refobj->connectModified([path] (SPObject *, unsigned) {
-                sp_conn_end_shape_modified(path);
-            });
-        }
-    }
-}
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/object/sp-conn-end.h b/src/object/sp-conn-end.h
deleted file mode 100644
index 5c6a7078ed..0000000000
--- a/src/object/sp-conn-end.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/** @file
- * TODO: insert short description here
- *//*
- * Authors: see git history
- *
- * Copyright (C) 2018 Authors
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-#ifndef SEEN_SP_CONN_END
-#define SEEN_SP_CONN_END
-
-#include <cstddef>
-#include <sigc++/connection.h>
-
-#include "sp-use-reference.h"
-#include "conn-avoid-ref.h"
-
-class SPPath;
-
-class SPConnEnd {
-public:
-    SPConnEnd(SPObject *owner);
-
-    /*
-     * Ref points to the main object the connection end is attached to
-     * while sub_ref points to a sub-object that may be inside a symbol
-     * or clone object id. Sub_ref is optional.
-     */
-    SPUseReference ref;
-    SPUseReference sub_ref;
-    char *href = nullptr;
-    char *sub_href = nullptr;
-
-    /** Change of href string (not a modification of the attributes of the referrent). */
-    sigc::connection _changed_connection;
-
-    /** Called when the attached object gets deleted. */
-    sigc::connection _delete_connection;
-
-    /** A sigc connection for transformed signal, used to do move compensation. */
-    sigc::connection _transformed_connection;
-
-    void setAttacherHref(char const * value);
-    void setAttacherSubHref(char const * value);
-
-
-private:
-    SPConnEnd(SPConnEnd const &) = delete; // no copy
-    SPConnEnd &operator=(SPConnEnd const &) = delete; // no assign
-};
-
-void sp_conn_end_href_changed(SPObject *old_ref, SPObject *ref,
-                              SPConnEnd *connEnd, SPPath *path, unsigned const handle_ix);
-void sp_conn_reroute_path(SPPath *const path);
-void sp_conn_reroute_path_immediate(SPPath *const path);
-void sp_conn_redraw_path(SPPath *const path);
-void sp_conn_end_detach(SPObject *const owner, unsigned const handle_ix);
-
-#endif /* !SEEN_SP_CONN_END */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
diff --git a/src/object/sp-ellipse.cpp b/src/object/sp-ellipse.cpp
index 1db7c0ecd4..a5da42cc6f 100644
--- a/src/object/sp-ellipse.cpp
+++ b/src/object/sp-ellipse.cpp
@@ -614,6 +614,15 @@ void SPGenericEllipse::modified(guint flags)
     SPShape::modified(flags);
 }
 
+/**
+ * Generate a list of virtual points around this ellipse.
+ */
+PointHints SPGenericEllipse::getConnectionHints() const
+{
+    // generate a few basic hints here
+    return {};
+}
+
 void SPGenericEllipse::update_patheffect(bool write) {
     SPShape::update_patheffect(write);
 }
diff --git a/src/object/sp-ellipse.h b/src/object/sp-ellipse.h
index 192ee03fc8..ccdbb3e9f4 100644
--- a/src/object/sp-ellipse.h
+++ b/src/object/sp-ellipse.h
@@ -73,6 +73,8 @@ public:
 
     void modified(unsigned int flags) override;
 
+    PointHints getConnectionHints() const override;
+
     /**
      * @brief Makes sure that start and end lie between 0 and 2 * PI.
      */
diff --git a/src/object/sp-factory.cpp b/src/object/sp-factory.cpp
index ddd9afcb2e..81754cf691 100644
--- a/src/object/sp-factory.cpp
+++ b/src/object/sp-factory.cpp
@@ -49,6 +49,7 @@
 #include "sp-page.h"
 #include "sp-path.h"
 #include "sp-pattern.h"
+#include "sp-point.h"
 #include "sp-polyline.h"
 #include "sp-radial-gradient.h"
 #include "sp-rect.h"
@@ -211,6 +212,7 @@ private:
         { "inkscape:offset", make<SPOffset> },
         { "svg:path", make<SPPath> },
         { "svg:pattern", make<SPPattern> },
+        { "inkscape:point", make<SPPoint> },
         { "svg:polygon", make<SPPolygon> },
         { "svg:polyline", make<SPPolyLine> },
         { "svg:radialGradient", make<SPRadialGradient> },
diff --git a/src/object/sp-item-group.cpp b/src/object/sp-item-group.cpp
index 48e25d3639..b0295a59c4 100644
--- a/src/object/sp-item-group.cpp
+++ b/src/object/sp-item-group.cpp
@@ -24,6 +24,7 @@
 #include "document.h"
 #include "enums.h"
 #include "preferences.h"
+#include "path/path-outline.h"
 #include "style.h"
 
 #include "box3d.h"
@@ -260,6 +261,13 @@ Inkscape::XML::Node* SPGroup::write(Inkscape::XML::Document *xml_doc, Inkscape::
     return repr;
 }
 
+Geom::PathVector SPGroup::outline() const
+{
+    Geom::PathVector pathv;
+    item_to_outline_recursive(this, Geom::identity(), pathv);
+    return pathv;
+}
+
 Geom::OptRect SPGroup::bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const
 {
     Geom::OptRect bbox;
diff --git a/src/object/sp-item-group.h b/src/object/sp-item-group.h
index 9de52f7342..327ef57555 100644
--- a/src/object/sp-item-group.h
+++ b/src/object/sp-item-group.h
@@ -79,6 +79,7 @@ public:
 
     Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override;
 
+    Geom::PathVector outline() const override;
     Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const override;
     void print(SPPrintContext *ctx) override;
     const char* typeName() const override;
diff --git a/src/object/sp-item.cpp b/src/object/sp-item.cpp
index a54547d13f..b04e3ce13a 100644
--- a/src/object/sp-item.cpp
+++ b/src/object/sp-item.cpp
@@ -31,7 +31,6 @@
 #include "inkscape.h"
 #include "desktop.h"
 #include "gradient-chemistry.h"
-#include "conn-avoid-ref.h"
 #include "conditions.h"
 #include "enums.h"
 #include "filter-chemistry.h"
@@ -49,6 +48,7 @@
 #include "sp-textpath.h"
 #include "sp-title.h"
 #include "sp-use.h"
+#include "sp-point.h"
 
 #include "style.h"
 #include "display/nr-filter.h"
@@ -93,8 +93,6 @@ SPItem::SPItem()
     style->signal_fill_ps_changed.connect  ([this] (auto old_obj, auto obj) { fill_ps_ref_changed  (old_obj, obj); });
     style->signal_stroke_ps_changed.connect([this] (auto old_obj, auto obj) { stroke_ps_ref_changed(old_obj, obj); });
     style->signal_filter_changed.connect   ([this] (auto old_obj, auto obj) { filter_ref_changed   (old_obj, obj); });
-
-    avoidRef = nullptr;
 }
 
 SPItem::~SPItem() = default;
@@ -186,14 +184,6 @@ SPClipPathReference &SPItem::getClipRef()
     return *clip_ref;
 }
 
-SPAvoidRef &SPItem::getAvoidRef()
-{
-    if (!avoidRef) {
-        avoidRef = new SPAvoidRef(this);
-    }
-    return *avoidRef;
-}
-
 bool SPItem::isVisibleAndUnlocked() const {
     return !isHidden() && !isLocked();
 }
@@ -509,8 +499,6 @@ void SPItem::build(SPDocument *document, Inkscape::XML::Node *repr) {
     object->readAttr(SPAttr::SODIPODI_INSENSITIVE);
     object->readAttr(SPAttr::TRANSFORM_CENTER_X);
     object->readAttr(SPAttr::TRANSFORM_CENTER_Y);
-    object->readAttr(SPAttr::CONNECTOR_AVOID);
-    object->readAttr(SPAttr::CONNECTION_POINTS);
     object->readAttr(SPAttr::INKSCAPE_HIGHLIGHT_COLOR);
 
     SPObject::build(document, repr);
@@ -521,11 +509,6 @@ void SPItem::build(SPDocument *document, Inkscape::XML::Node *repr) {
 
 void SPItem::release()
 {
-    // Note: do this here before the clip_ref is deleted, since calling
-    // ensureUpToDate() for triggered routing may reference
-    // the deleted clip_ref.
-    delete avoidRef;
-    avoidRef = nullptr;
 
     // we do NOT disconnect from the changed signal of those before deletion.
     // The destructor will call *_ref_changed with NULL as the new value,
@@ -589,11 +572,6 @@ void SPItem::set(SPAttr key, gchar const* value) {
             item->_highlightColor = Inkscape::Colors::Color::parse(value);
             break;
         }
-        case SPAttr::CONNECTOR_AVOID:
-            if (value || item->avoidRef) {
-                item->getAvoidRef().setAvoid(value);
-            }
-            break;
         case SPAttr::TRANSFORM_CENTER_X:
             if (value) {
                 item->transform_center_x = g_strtod(value, nullptr);
@@ -820,11 +798,6 @@ void SPItem::update(SPCtx *ctx, unsigned flags)
             }
         }
     }
-
-    // Update libavoid with item geometry (for connector routing).
-    if (avoidRef && document) {
-        avoidRef->handleSettingChange();
-    }
 }
 
 void SPItem::modified(unsigned int /*flags*/)
@@ -904,6 +877,16 @@ Geom::OptRect SPItem::bbox(Geom::Affine const & /*transform*/, SPItem::BBoxType
     return Geom::OptRect();
 }
 
+/**
+ * Returns a best attempt to get the item outline for the item.
+ * Which could be multiple path shapes combined representing each
+ * of the parts of the shape or a simple bounding box shape.
+ */
+Geom::PathVector SPItem::outline() const
+{
+    return {};
+}
+
 Geom::OptRect SPItem::geometricBounds(Geom::Affine const &transform) const
 {
     return bbox(transform, SPItem::GEOMETRIC_BBOX);
@@ -1942,6 +1925,29 @@ void SPItem::move_rel( Geom::Translate const &tr)
     doWriteTransform(transform);
 }
 
+/**
+ * Return a list of connection point objects (usually children)
+ */
+std::vector<SPPoint *> SPItem::getConnectionPoints()
+{
+    std::vector<SPPoint *> result;
+    for (auto &child : children) {
+        if (auto point = cast<SPPoint>(&child)) {
+            result.push_back(point);
+        }
+    }
+    return result;
+}
+
+/**
+ * Return a list of virtual connection points that act as hints
+ */
+PointHints SPItem::getConnectionHints() const
+{
+    // No default points, put your hints in the sub-class.
+    return {};
+}
+
 /*
   Local Variables:
   mode:c++
diff --git a/src/object/sp-item.h b/src/object/sp-item.h
index 2db03b477b..3762cd51bd 100644
--- a/src/object/sp-item.h
+++ b/src/object/sp-item.h
@@ -23,6 +23,7 @@
 
 #include <cstdint>
 #include <vector>
+#include <map>
 #include <2geom/forward.h>
 #include <2geom/affine.h>
 #include <2geom/rect.h>
@@ -32,17 +33,21 @@
 #include "sp-object.h"
 #include "sp-marker-loc.h"
 #include "display/drawing-item-ptr.h"
+#include "live_effects/effect-enum.h"
 #include "xml/repr.h"
 
 class SPGroup;
+class SPPoint;
 class SPClipPath;
 class SPClipPathReference;
 class SPMask;
 class SPMaskReference;
-class SPAvoidRef;
 class SPPattern;
 struct SPPrintContext;
 
+// Virtual connection point hints map
+using PointHints = std::map<std::string, Geom::Point>;
+
 namespace Inkscape {
 class Drawing;
 class DrawingItem;
@@ -148,16 +153,12 @@ public:
     std::optional<Geom::PathVector> getClipPathVector() const;
     std::optional<Geom::PathVector> getClipPathVector(SPItem const *root) const;
 
-    SPAvoidRef &getAvoidRef();
     std::vector<std::pair <Glib::ustring, Glib::ustring> > rootsatellites;
 
 private:
     SPClipPathReference *clip_ref;
     SPMaskReference *mask_ref;
 
-    // Used for object-avoiding connectors
-    SPAvoidRef *avoidRef;
-
 public:
     std::vector<SPItemView> views;
 
@@ -440,6 +441,7 @@ public:
 	Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override;
 
 	virtual Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType type) const;
+    virtual Geom::PathVector outline() const;
 	virtual void print(SPPrintContext *ctx);
     virtual const char* typeName() const;
     virtual const char* displayName() const;
@@ -451,6 +453,10 @@ public:
     virtual void removeTransformsRecursively(SPObject const *root);
 
     virtual void convert_to_guides() const;
+
+    // Connection tool introspection of points is object specific
+    virtual std::vector<SPPoint *> getConnectionPoints();
+    virtual PointHints getConnectionHints() const;
 };
 
 // Utility
diff --git a/src/object/sp-lpe-item.cpp b/src/object/sp-lpe-item.cpp
index 5bf6a13825..491b5bdb45 100755
--- a/src/object/sp-lpe-item.cpp
+++ b/src/object/sp-lpe-item.cpp
@@ -1075,6 +1075,38 @@ bool SPLPEItem::hasPathEffectOnClipOrMaskRecursive(SPLPEItem * shape) const
     }
 }
 
+bool SPLPEItem::providesOwnFlashPaths() const
+{
+    if (!path_effect_list || path_effect_list->empty()) {
+        return false;
+    }
+    PathEffectList path_effect_list(*this->path_effect_list);
+    for (auto &lperef : path_effect_list) {
+        if (auto lpeobj = lperef->lpeobject) {
+            if (lpeobj->get_lpe()->providesOwnFlashPaths()) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+bool SPLPEItem::providesOwnKnotholder() const
+{
+    if (!path_effect_list || path_effect_list->empty()) {
+        return false;
+    }
+    PathEffectList path_effect_list(*this->path_effect_list);
+    for (auto &lperef : path_effect_list) {
+        if (auto lpeobj = lperef->lpeobject) {
+            if (lpeobj->get_lpe()->providesOwnKnotholder()) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
 bool SPLPEItem::hasPathEffect() const
 {
     if (!path_effect_list || path_effect_list->empty()) {
diff --git a/src/object/sp-lpe-item.h b/src/object/sp-lpe-item.h
index 1c38cfdf2f..def6da9718 100644
--- a/src/object/sp-lpe-item.h
+++ b/src/object/sp-lpe-item.h
@@ -92,6 +92,8 @@ public:
     SPLPEItem const * getTopPathEffect() const;
     bool hasPathEffectOnClipOrMask(SPLPEItem * shape) const;
     bool hasPathEffectOnClipOrMaskRecursive(SPLPEItem * shape) const;
+    bool providesOwnFlashPaths() const;
+    bool providesOwnKnotholder() const;
     std::size_t getLPEIndex(Inkscape::LivePathEffect::Effect *lpe) const;
     std::size_t countLPEOfType(int const type, bool inc_hidden = true, bool is_ready = true) const;
     std::size_t getLPEReferenceIndex(PathEffectSharedPtr const &lperef) const;
diff --git a/src/object/sp-namedview.cpp b/src/object/sp-namedview.cpp
index aff0687964..49eacfd796 100644
--- a/src/object/sp-namedview.cpp
+++ b/src/object/sp-namedview.cpp
@@ -26,7 +26,6 @@
 
 #include "attributes.h"
 #include "colors/manager.h"
-#include "conn-avoid-ref.h" // for defaultConnSpacing.
 #include "desktop.h"
 #include "document-undo.h"
 #include "document.h"
@@ -81,8 +80,6 @@ SPNamedView::SPNamedView()
 
     this->default_layer_id = 0;
 
-    this->connector_spacing = defaultConnSpacing;
-
     this->_viewport = new Inkscape::CanvasPage();
     this->_viewport->hide();
 }
@@ -129,7 +126,6 @@ void SPNamedView::build(SPDocument *document, Inkscape::XML::Node *repr) {
     this->readAttr(SPAttr::INKSCAPE_WINDOW_Y);
     this->readAttr(SPAttr::INKSCAPE_WINDOW_MAXIMIZED);
     this->readAttr(SPAttr::INKSCAPE_CURRENT_LAYER);
-    this->readAttr(SPAttr::INKSCAPE_CONNECTOR_SPACING);
     this->readAttr(SPAttr::INKSCAPE_LOCKGUIDES);
     readAttr(SPAttr::INKSCAPE_CLIP_TO_PAGE_RENDERING);
     readAttr(SPAttr::INKSCAPE_ANTIALIAS_RENDERING);
@@ -378,9 +374,6 @@ void SPNamedView::set(SPAttr key, const gchar* value) {
     case SPAttr::INKSCAPE_CURRENT_LAYER:
         this->default_layer_id = value ? g_quark_from_string(value) : 0;
         break;
-    case SPAttr::INKSCAPE_CONNECTOR_SPACING:
-        this->connector_spacing = value ? g_ascii_strtod(value, nullptr) : defaultConnSpacing;
-        break;
     case SPAttr::INKSCAPE_DOCUMENT_UNITS:
         display_units = sp_parse_document_units(value);
         break;
diff --git a/src/object/sp-namedview.h b/src/object/sp-namedview.h
index 32533975b3..416fb7633c 100644
--- a/src/object/sp-namedview.h
+++ b/src/object/sp-namedview.h
@@ -78,8 +78,6 @@ public:
     
     GQuark default_layer_id;
 
-    double connector_spacing;
-
     std::vector<SPGuide *> guides;
     std::vector<SPGrid *> grids;
     std::vector<SPDesktop *> views;
diff --git a/src/object/sp-object.cpp b/src/object/sp-object.cpp
index 33f1d83f64..4117881693 100644
--- a/src/object/sp-object.cpp
+++ b/src/object/sp-object.cpp
@@ -883,14 +883,14 @@ void SPObject::invoke_build(SPDocument *document, Inkscape::XML::Node *repr, uns
 #endif
 }
 
-int SPObject::getIntAttribute(char const *key, int def)
+int SPObject::getIntAttribute(char const *key, int def) const
 {
     return getRepr()->getAttributeInt(key, def);
 }
 
-unsigned SPObject::getPosition(){
-    g_assert(this->repr);
-
+unsigned SPObject::getPosition() const
+{
+    g_assert(repr);
     return repr->position();
 }
 
diff --git a/src/object/sp-object.h b/src/object/sp-object.h
index 746e8c93a3..c4863216a5 100644
--- a/src/object/sp-object.h
+++ b/src/object/sp-object.h
@@ -747,15 +747,15 @@ public:
 
     void invoke_build(SPDocument *document, Inkscape::XML::Node *repr, unsigned int cloned);
 
-    int getIntAttribute(char const *key, int def);
+    int getIntAttribute(char const *key, int def) const;
 
-    unsigned getPosition();
+    unsigned getPosition() const;
 
-    char const * getAttribute(char const *name) const;
+    char const *getAttribute(char const *name) const;
 
     void appendChild(Inkscape::XML::Node *child);
 
-    void addChild(Inkscape::XML::Node *child,Inkscape::XML::Node *prev=nullptr);
+    void addChild(Inkscape::XML::Node *child, Inkscape::XML::Node *prev = nullptr);
 
     /**
      * Call virtual set() function of object.
diff --git a/src/object/sp-path.cpp b/src/object/sp-path.cpp
index 1fe8d241ec..596a487253 100644
--- a/src/object/sp-path.cpp
+++ b/src/object/sp-path.cpp
@@ -105,8 +105,7 @@ void SPPath::convert_to_guides() const {
     sp_guide_pt_pairs_to_guides(this->document, pts);
 }
 
-SPPath::SPPath() : SPShape(), connEndPair(this) {
-}
+SPPath::SPPath() = default;
 
 SPPath::~SPPath() = default;
 
@@ -117,8 +116,6 @@ void SPPath::build(SPDocument *document, Inkscape::XML::Node *repr) {
     this->readAttr(SPAttr::MARKER_MID);
     this->readAttr(SPAttr::MARKER_END);
 
-    sp_conn_end_pair_build(this);
-
     SPShape::build(document, repr);
     // Our code depends on 'd' being an attribute (LPE's, etc.). To support 'd' as a property, we
     // check it here (after the style property has been evaluated, this allows us to properly
@@ -183,8 +180,6 @@ void SPPath::build(SPDocument *document, Inkscape::XML::Node *repr) {
 }
 
 void SPPath::release() {
-    this->connEndPair.release();
-
     SPShape::release();
 }
 
@@ -223,15 +218,6 @@ void SPPath::set(SPAttr key, const gchar* value) {
             this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
             break;
 
-        case SPAttr::CONNECTOR_TYPE:
-        case SPAttr::CONNECTOR_CURVATURE:
-        case SPAttr::CONNECTION_START:
-        case SPAttr::CONNECTION_END:
-        case SPAttr::CONNECTION_START_POINT:
-        case SPAttr::CONNECTION_END_POINT:
-            this->connEndPair.setAttr(key, value);
-            break;
-
         default:
             SPShape::set(key, value);
             break;
@@ -261,8 +247,6 @@ g_message("sp_path_write writes 'd' attribute");
         }
     }
 
-    this->connEndPair.writeRepr(repr);
-
     SPShape::write(xml_doc, repr, flags);
 
     return repr;
@@ -278,7 +262,6 @@ void SPPath::update(SPCtx *ctx, guint flags) {
     }
 
     SPShape::update(ctx, flags);
-    this->connEndPair.update();
 }
 
 Geom::Affine SPPath::set_transform(Geom::Affine const &transform) {
diff --git a/src/object/sp-path.h b/src/object/sp-path.h
index 0e7d5057e7..2ed21a3c5c 100644
--- a/src/object/sp-path.h
+++ b/src/object/sp-path.h
@@ -18,7 +18,6 @@
  */
 
 #include "sp-shape.h"
-#include "sp-conn-end-pair.h"
 #include "style-internal.h" // For SPStyleSrc
 
 class SPCurve;
@@ -33,8 +32,6 @@ public:
     int tag() const override { return tag_of<decltype(*this)>; }
 
     int nodesInPath() const;
-    friend class SPConnEndPair;
-    SPConnEndPair connEndPair;
 
     void build(SPDocument *document, Inkscape::XML::Node *repr) override;
     void release() override;
diff --git a/src/object/sp-point.cpp b/src/object/sp-point.cpp
new file mode 100644
index 0000000000..2f180ab1dc
--- /dev/null
+++ b/src/object/sp-point.cpp
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Inkscape connector point implementation
+ *
+ * Authors:
+ *   Martin Owens <doctormo@geek-2.com>
+ *
+ * Copyright (C) 2021 Martin Owens
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "object/sp-point.h"
+
+#include <glibmm/i18n.h>
+
+#include "attributes.h"
+#include "document.h"
+
+void SPPoint::build(SPDocument *document, Inkscape::XML::Node *repr)
+{
+    SPItem::build(document, repr);
+
+    readAttr(SPAttr::X);
+    readAttr(SPAttr::Y);
+    readAttr(SPAttr::VIRTUAL_POINT_REF);
+
+    // When the parent moves or changes, connected points need to know this is
+    // passed to the LPE via the connectModified signal which is cascaded.
+    _parent_modified = parent->connectModified(sigc::mem_fun(*this, &SPPoint::parentModified));
+}
+
+void SPPoint::set(SPAttr key, char const *value)
+{
+    switch (key) {
+        case SPAttr::X:
+            if (!x.read(value)) {
+                x.read("50%");
+            }
+            break;
+        case SPAttr::Y:
+            if (!y.read(value)) {
+                y.read("50%");
+            }
+            break;
+        case SPAttr::VIRTUAL_POINT_REF:
+            if (value) {
+                original_point = value;
+            } else {
+                original_point = "";
+            }
+            break;
+        default:
+            SPItem::set(key, value);
+            break;
+    }
+}
+
+Inkscape::XML::Node *SPPoint::write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned flags)
+{
+    if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
+        repr = xml_doc->createElement("inkscape:point");
+    }
+    repr->setAttributeSvgLength("x", x);
+    repr->setAttributeSvgLength("y", y);
+    repr->setAttributeOrRemoveIfEmpty("inkscape:original-point", original_point);
+
+    SPItem::write(xml_doc, repr, flags);
+    return repr;
+}
+
+/**
+ * Create a new sp-point in the given parent object at the given location.
+ *
+ * @param parent - Item to make the point within
+ * @param item_point - The point in item coordinates.
+ *
+ * @returns The new SPPoint object created, or nullptr if outside the bbox
+ */
+SPPoint *SPPoint::makePointAbsolute(SPItem *parent, Geom::Point const *item_point)
+{
+    return makePointRelative(parent, getParentPoint(parent, item_point));
+}
+
+SPPoint *SPPoint::makePointRelative(SPItem *parent, Geom::Point const *parent_point, std::string const &name)
+{
+    auto xml_doc = parent->document->getReprDoc();
+    auto repr = xml_doc->createElement("inkscape:point");
+    auto new_point = cast<SPPoint>(parent->appendChildRepr(repr));
+    assert(new_point);
+    if (!name.empty()) {
+        new_point->setOriginalPointName(name);
+    }
+    new_point->setParentPoint(*parent_point);
+    g_assert(new_point->getId());
+    return new_point;
+}
+
+/**
+ * Convert a set of item coordinates to a relative set inside the parent.
+ *
+ * @param parent - Item the relative points will be made relative to.
+ * @param item_point - Coordinates in absolute item units.
+ *
+ * @returns The position of the point in relative units (%)
+ */
+Geom::Point *SPPoint::getParentPoint(SPItem const *parent, Geom::Point const *item_point)
+{
+    if (parent && item_point) {
+        auto bbox = parent->bbox(Geom::identity(), SPItem::GEOMETRIC_BBOX);
+        if (bbox) {
+            return new Geom::Point{(*item_point - bbox->min()) / bbox->dimensions()};
+        }
+    }
+    return nullptr;
+}
+
+/*
+ * Returns the relative coordinates of this point.
+ */
+Geom::Point *SPPoint::parentPoint() const
+{
+    if (x.unit == SVGLength::PERCENT && y.unit == SVGLength::PERCENT) {
+        return new Geom::Point{x.computed, y.computed};
+    }
+    // Recalculate non-relative coordinates according to the parent object.
+    return getParentPoint(cast<SPItem>(parent), itemPoint());
+}
+
+/**
+ * Convert a relative set of points to an absolute one inside the parent.
+ *
+ * @param parent - Item these relative points are relative to.
+ * @param parent_point - Relative coordinates between 0.0 and 1.0
+ *
+ * @returns The position of the point in item units.
+ */
+Geom::Point *SPPoint::getItemPoint(SPItem const *parent, Geom::Point const *parent_point)
+{
+    if (parent && parent_point) {
+        if (auto bbox = parent->bbox(Geom::identity(), SPItem::GEOMETRIC_BBOX)) {
+            return new Geom::Point{bbox->min() + *parent_point * bbox->dimensions()};
+        }
+    }
+    return nullptr;
+}
+
+/**
+ * Returns the untransformed, absolute coordinates of this point.
+ */
+Geom::Point *SPPoint::itemPoint() const
+{
+    auto point = getItemPoint(cast<SPItem>(parent), new Geom::Point{x.computed, y.computed});
+    if (!point) {
+        return nullptr;
+    }
+
+    // Retrofit absolute units in, non-percent isn't expected, but
+    // we want to support it as it will be parsed as a unit value.
+    if (x.unit != SVGLength::PERCENT) {
+        point->x() = x.computed;
+    }
+    if (y.unit != SVGLength::PERCENT) {
+        point->y() = y.computed;
+    }
+
+    return point;
+}
+
+/**
+ * Set the parent point and request display update.
+ *
+ * @param parent_point - Relative percentage point, must be between 0.0 and 1.0
+ */
+void SPPoint::setParentPoint(Geom::Point const &parent_point)
+{
+    x = std::clamp(parent_point.x(), 0.0, 1.0);
+    y = std::clamp(parent_point.y(), 0.0, 1.0);
+    x.unit = SVGLength::PERCENT;
+    y.unit = SVGLength::PERCENT;
+
+    auto repr = getRepr();
+    write(repr->document(), repr, SP_OBJECT_MODIFIED_FLAG);
+    requestModified(SP_OBJECT_MODIFIED_FLAG);
+}
+
+/**
+ * Set the item point (absolute units), calls setParentPoint
+ *
+ * @param item_point - Abslute position of the point
+ */
+void SPPoint::setItemPoint(Geom::Point const *item_point)
+{
+    auto point = getParentPoint(cast<SPItem>(parent), item_point);
+    if (point) {
+        setParentPoint(*point);
+    }
+}
+
+/**
+ * Returns the original point name, if this point was created from one
+ */
+std::string const &SPPoint::getOriginalPointName() const
+{
+    return original_point;
+}
+
+/**
+ * Set the original point's name (from the hint table)
+ */
+void SPPoint::setOriginalPointName(std::string name)
+{
+    original_point = std::move(name);
+    auto repr = getRepr();
+    write(repr->document(), repr, SP_OBJECT_MODIFIED_FLAG);
+}
+
+/**
+ * Called when the parent owner of this point has been modified.
+ */
+void SPPoint::parentModified(SPObject * /*parent*/, int flags)
+{
+    emitModified(SP_OBJECT_MODIFIED_CASCADE);
+}
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/object/sp-point.h b/src/object/sp-point.h
new file mode 100644
index 0000000000..dce1c59feb
--- /dev/null
+++ b/src/object/sp-point.h
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * SPPoint -- an inkscape point
+ *//*
+ * Authors:
+ *   Martin Owens 2021
+ *
+ * Copyright (C) 2021 Authors
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+#ifndef SEEN_SP_POINT_H
+#define SEEN_SP_POINT_H
+
+#include <2geom/point.h>
+
+#include "sp-item.h"
+#include "helper/auto-connection.h"
+#include "svg/svg-length.h"
+
+class SPPoint final : public SPItem
+{
+public:
+    int tag() const override { return tag_of<decltype(*this)>; }
+
+    // Used API for this SPItem
+    Geom::Point *parentPoint() const;
+    Geom::Point *itemPoint() const;
+    void setParentPoint(Geom::Point const &parent_point);
+    void setItemPoint(Geom::Point const *doc_point);
+
+    std::string const &getOriginalPointName() const;
+    void setOriginalPointName(std::string name);
+
+    // Static API for consistancy
+    static SPPoint *makePointAbsolute(SPItem *parent, Geom::Point const *item_point);
+    static SPPoint *makePointRelative(SPItem *parent, Geom::Point const *parent_point, std::string const &name = "");
+
+    static Geom::Point *getParentPoint(SPItem const *parent, Geom::Point const *item_point);
+    static Geom::Point *getItemPoint(SPItem const *parent, Geom::Point const *parent_point);
+
+protected:
+    void build(SPDocument *doc, Inkscape::XML::Node *repr) override;
+    void set(SPAttr key, char const *value) override;
+
+    Inkscape::XML::Node *write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned flags) override;
+
+    void parentModified(SPObject *parent, int flags);
+
+private:
+    // These lengths are intended to be relative percents, but don't have to be.
+    SVGLength x;
+    SVGLength y;
+
+    // A link to the virtual-point that spawned this point
+    // Allows us to connect the two for automatic adjustment later.
+    std::string original_point;
+
+    Inkscape::auto_connection _parent_modified;
+};
+
+#endif // SEEN_SP_POINT_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/object/sp-rect.cpp b/src/object/sp-rect.cpp
index def363af99..d9dc8a96cc 100644
--- a/src/object/sp-rect.cpp
+++ b/src/object/sp-rect.cpp
@@ -647,6 +647,19 @@ void SPRect::convert_to_guides() const {
     sp_guide_pt_pairs_to_guides(this->document, pts);
 }
 
+/**
+ * Generate a list of virtual points for this rectangle.
+ */
+PointHints SPRect::getConnectionHints() const
+{
+    return {
+        {"top", {0.5, 0.0}},
+        {"right", {1.0, 0.5}},
+        {"bottom", {0.5, 1.0}},
+        {"left", {0.0, 0.5}},
+    };
+}
+
 /*
   Local Variables:
   mode:c++
diff --git a/src/object/sp-rect.h b/src/object/sp-rect.h
index f157e81e10..acdf888fe6 100644
--- a/src/object/sp-rect.h
+++ b/src/object/sp-rect.h
@@ -72,6 +72,8 @@ public:
 
 	void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override;
 	void convert_to_guides() const override;
+
+    PointHints getConnectionHints() const override;
 	GenericRectType type;
 	SVGLength x;
 	SVGLength y;
diff --git a/src/object/sp-shape.cpp b/src/object/sp-shape.cpp
index c21ef4784f..0565a22eb5 100644
--- a/src/object/sp-shape.cpp
+++ b/src/object/sp-shape.cpp
@@ -468,6 +468,10 @@ void SPShape::modified(unsigned int flags) {
     }
 }
 
+Geom::PathVector SPShape::outline() const {
+    return item_to_outline(this, true);
+}
+
 bool SPShape::checkBrokenPathEffect()
 {
     if (hasBrokenPathEffect()) {
@@ -564,11 +568,10 @@ Geom::OptRect SPShape::either_bbox(Geom::Affine const &transform, SPItem::BBoxTy
         // convert the stroke to a path and calculate that path's geometric bbox
 
         if (!this->style->stroke.isNone() && !this->style->stroke_extensions.hairline) {
-            Geom::PathVector *pathv = item_to_outline(this, true);  // calculate bbox_only
+            auto const pathv = outline();  // calculate bbox_only
 
-            if (pathv) {
-                bbox |= bounds_exact_transformed(*pathv, transform);
-                delete pathv;
+            if (!pathv.empty()) {
+                bbox |= bounds_exact_transformed(pathv, transform);
             }
         }
 
diff --git a/src/object/sp-shape.h b/src/object/sp-shape.h
index 9d257290a1..51b02a57c9 100644
--- a/src/object/sp-shape.h
+++ b/src/object/sp-shape.h
@@ -82,6 +82,7 @@ public:
 	void set(SPAttr key, char const* value) override;
 	Inkscape::XML::Node* write(Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, unsigned int flags) override;
 
+    Geom::PathVector outline() const override;
 	Geom::OptRect bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype) const override;
     Geom::OptRect either_bbox(Geom::Affine const &transform, SPItem::BBoxType bboxtype, bool cache_is_valid,
                               Geom::OptRect bbox_cache, Geom::Affine const &transform_cache) const;
diff --git a/src/object/sp-use.cpp b/src/object/sp-use.cpp
index ee6d7f3423..db3ec2c02d 100644
--- a/src/object/sp-use.cpp
+++ b/src/object/sp-use.cpp
@@ -31,6 +31,7 @@
 #include "sp-flowregion.h"
 #include "sp-flowtext.h"
 #include "sp-mask.h"
+#include "sp-point.h"
 #include "sp-root.h"
 #include "sp-shape.h"
 #include "sp-symbol.h"
@@ -873,6 +874,29 @@ void SPUse::getLinked(std::vector<SPObject *> &objects, LinkedObjectNature direc
     SPObject::getLinked(objects, direction);
 }
 
+/**
+ * A clone's virtual points are the actual points of the parent object
+ */
+PointHints SPUse::getConnectionHints() const
+{
+    PointHints ret;
+    if (ref) {
+        int index = 0;
+        for (auto &conn : ref->getObject()->getConnectionPoints()) {
+            std::string name = "sub_point_" + std::to_string(index);
+            index += 1;
+            if (conn->getId()) {
+                name = conn->getId();
+            }
+            if (auto point = conn->parentPoint()) {
+                ret[name] = *point;
+            } else {
+                g_warning("Can't hint point: %s", name.c_str());
+            }
+        }
+    }
+    return ret;
+}
 /*
   Local Variables:
   mode:c++
diff --git a/src/object/sp-use.h b/src/object/sp-use.h
index d52aec7441..055532a7b9 100644
--- a/src/object/sp-use.h
+++ b/src/object/sp-use.h
@@ -61,6 +61,7 @@ public:
 	Inkscape::DrawingItem* show(Inkscape::Drawing &drawing, unsigned int key, unsigned int flags) override;
 	void hide(unsigned int key) override;
 	void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs) const override;
+    PointHints getConnectionHints() const override;
 
 	SPItem *root();
 	SPItem const *root() const;
diff --git a/src/object/tags.h b/src/object/tags.h
index 68cae22b97..935392a2a9 100644
--- a/src/object/tags.h
+++ b/src/object/tags.h
@@ -86,6 +86,7 @@ X(SPObject,\
                 X(SPStar)\
             )\
         )\
+        X(SPPoint)\
         X(SPTRef)\
         X(SPTSpan)\
         X(SPText)\
diff --git a/src/path-chemistry.cpp b/src/path-chemistry.cpp
index cbd8158cd8..d032b93b8e 100644
--- a/src/path-chemistry.cpp
+++ b/src/path-chemistry.cpp
@@ -37,6 +37,7 @@
 #include "object/sp-text.h"
 #include "style.h"
 
+#include "live_effects/lpe-connector-line.h"
 #include "ui/icon-names.h"
 
 #include "svg/svg.h"
@@ -677,6 +678,14 @@ ObjectSet::pathReverse()
             path->setAttribute("d", str);
         }
 
+        // Reverse connection, start and end
+        if (auto connector = dynamic_cast<Inkscape::LivePathEffect::LPEConnectorLine *>(path->getCurrentLPE())) {
+            auto repr = connector->getRepr();
+            auto start = repr->attribute("connection-start");
+            repr->setAttributeOrRemoveIfEmpty("connection-start", repr->attribute("connection-end"));
+            repr->setAttributeOrRemoveIfEmpty("connection-end", start);
+        }
+
         // reverse nodetypes order (Bug #179866)
         gchar *nodetypes = g_strdup(path->getRepr()->attribute("sodipodi:nodetypes"));
         if ( nodetypes ) {
diff --git a/src/path/path-outline.cpp b/src/path/path-outline.cpp
index 69d788b74b..7f620f8150 100644
--- a/src/path/path-outline.cpp
+++ b/src/path/path-outline.cpp
@@ -182,8 +182,7 @@ item_find_paths(const SPItem *item, Geom::PathVector& fill, Geom::PathVector& st
 
 // ======================== Item to Outline ===================== //
 
-static
-void item_to_outline_add_marker_child( SPItem const *item, Geom::Affine marker_transform, Geom::PathVector* pathv_in )
+void item_to_outline_recursive(SPItem const *item, Geom::Affine const &marker_transform, Geom::PathVector &pathv_in)
 {
     Geom::Affine tr(marker_transform);
     tr = item->transform * tr;
@@ -193,24 +192,23 @@ void item_to_outline_add_marker_child( SPItem const *item, Geom::Affine marker_t
         // recurse through all childs:
         for (auto& o: item->children) {
             if (auto childitem = cast<SPItem>(&o)) {
-                item_to_outline_add_marker_child(childitem, tr, pathv_in);
+                item_to_outline_recursive(childitem, tr, pathv_in);
             }
         }
     } else {
-        Geom::PathVector* marker_pathv = item_to_outline(item);
+        auto const marker_pathv = item_to_outline(item);
 
-        if (marker_pathv) {
-            for (const auto & j : *marker_pathv) {
-                pathv_in->push_back(j * tr);
+        if (!marker_pathv.empty()) {
+            for (auto const &path : marker_pathv) {
+                pathv_in.push_back(path * tr);
             }
-            delete marker_pathv;
         }
     }
 }
 
 static
-void item_to_outline_add_marker( SPObject const *marker_object, Geom::Affine marker_transform,
-                              Geom::Scale stroke_scale, Geom::PathVector* pathv_in )
+void item_to_outline_add_marker(SPObject const *marker_object, Geom::Affine marker_transform,
+                              Geom::Scale stroke_scale, Geom::PathVector &pathv_in)
 {
     SPMarker const * marker = cast<SPMarker>(marker_object);
 
@@ -223,7 +221,7 @@ void item_to_outline_add_marker( SPObject const *marker_object, Geom::Affine mar
 
     SPItem const * marker_item = sp_item_first_item_child(marker_object); // why only consider the first item? can a marker only consist of a single item (that may be a group)?
     if (marker_item) {
-        item_to_outline_add_marker_child(marker_item, tr, pathv_in);
+        item_to_outline_recursive(marker_item, tr, pathv_in);
     }
 }
 
@@ -235,24 +233,24 @@ void item_to_outline_add_marker( SPObject const *marker_object, Geom::Affine mar
  *  TODO: See if SPShape::either_bbox's union with markers is the same as one would get
  *  with bbox_only false.
  */
-Geom::PathVector* item_to_outline(SPItem const *item, bool exclude_markers)
+Geom::PathVector item_to_outline(SPItem const *item, bool exclude_markers)
 {
     Geom::PathVector fill;   // Used for locating markers.
     Geom::PathVector stroke; // Used for creating outline (and finding bbox).
     item_find_paths(item, fill, stroke, true); // Skip cleaning up stroke shape.
 
-    Geom::PathVector *ret_pathv = nullptr;
-
     if (fill.curveCount() == 0) {
         std::cerr << "item_to_outline: fill path has no segments!" << std::endl;
-        return ret_pathv;
+        return {};
     }
 
-    if (stroke.size() > 0) {
-        ret_pathv = new Geom::PathVector(stroke);
+    Geom::PathVector ret_pathv;
+
+    if (!stroke.empty()) {
+        ret_pathv = stroke;
     } else {
         // No stroke, use fill path.
-        ret_pathv = new Geom::PathVector(fill);
+        ret_pathv = fill;
     }
 
     if (exclude_markers) {
@@ -267,9 +265,9 @@ Geom::PathVector* item_to_outline(SPItem const *item, bool exclude_markers)
 
         // START marker
         for (int i = 0; i < 2; i++) {  // SP_MARKER_LOC and SP_MARKER_LOC_START
-            if ( SPObject *marker_obj = shape->_marker[i] ) {
-                Geom::Affine const m (sp_shape_marker_get_transform_at_start(fill.front().front()));
-                item_to_outline_add_marker( marker_obj, m, scale, ret_pathv );
+            if (auto marker_obj = shape->_marker[i]) {
+                auto const m = sp_shape_marker_get_transform_at_start(fill.front().front());
+                item_to_outline_add_marker(marker_obj, m, scale, ret_pathv);
             }
         }
 
@@ -283,8 +281,8 @@ Geom::PathVector* item_to_outline(SPItem const *item, bool exclude_markers)
                 if ( path_it != fill.begin() &&
                      ! ((path_it == (fill.end()-1)) && (path_it->size_default() == 0)) ) // if this is the last path and it is a moveto-only, there is no mid marker there
                 {
-                    Geom::Affine const m (sp_shape_marker_get_transform_at_start(path_it->front()));
-                    item_to_outline_add_marker( midmarker_obj, m, scale, ret_pathv);
+                    auto const m = sp_shape_marker_get_transform_at_start(path_it->front());
+                    item_to_outline_add_marker(midmarker_obj, m, scale, ret_pathv);
                 }
 
                 // MID position
@@ -297,8 +295,8 @@ Geom::PathVector* item_to_outline(SPItem const *item, bool exclude_markers)
                          * Loop to end_default (so including closing segment), because when a path is closed,
                          * there should be a midpoint marker between last segment and closing straight line segment
                          */
-                        Geom::Affine const m (sp_shape_marker_get_transform(*curve_it1, *curve_it2));
-                        item_to_outline_add_marker( midmarker_obj, m, scale, ret_pathv);
+                        auto const m = sp_shape_marker_get_transform(*curve_it1, *curve_it2);
+                        item_to_outline_add_marker(midmarker_obj, m, scale, ret_pathv);
 
                         ++curve_it1;
                         ++curve_it2;
@@ -308,8 +306,8 @@ Geom::PathVector* item_to_outline(SPItem const *item, bool exclude_markers)
                 // END position
                 if ( path_it != (fill.end()-1) && !path_it->empty()) {
                     Geom::Curve const &lastcurve = path_it->back_default();
-                    Geom::Affine const m = sp_shape_marker_get_transform_at_end(lastcurve);
-                    item_to_outline_add_marker( midmarker_obj, m, scale, ret_pathv );
+                    auto const m = sp_shape_marker_get_transform_at_end(lastcurve);
+                    item_to_outline_add_marker(midmarker_obj, m, scale, ret_pathv);
                 }
             }
         }
@@ -326,8 +324,8 @@ Geom::PathVector* item_to_outline(SPItem const *item, bool exclude_markers)
                 }
                 Geom::Curve const &lastcurve = path_last[index];
 
-                Geom::Affine const m = sp_shape_marker_get_transform_at_end(lastcurve);
-                item_to_outline_add_marker( marker_obj, m, scale, ret_pathv );
+                auto const m = sp_shape_marker_get_transform_at_end(lastcurve);
+                item_to_outline_add_marker(marker_obj, m, scale, ret_pathv);
             }
         }
     }
diff --git a/src/path/path-outline.h b/src/path/path-outline.h
index 873df58022..c04c3c55a4 100644
--- a/src/path/path-outline.h
+++ b/src/path/path-outline.h
@@ -16,6 +16,8 @@
 #ifndef SEEN_PATH_OUTLINE_H
 #define SEEN_PATH_OUTLINE_H
 
+#include <2geom/affine.h>
+
 class SPDesktop;
 class SPItem;
 
@@ -32,12 +34,17 @@ namespace XML {
 /**
  * Find the fill and stroke of the given item.
  */
-bool item_find_paths(const SPItem *item, Geom::PathVector& fill, Geom::PathVector& stroke, bool bbox_only = false);
+bool item_find_paths(SPItem const *item, Geom::PathVector &fill, Geom::PathVector &stroke, bool bbox_only = false);
 
 /**
  * Find an outline that represents an item.
  */
-Geom::PathVector* item_to_outline (SPItem const *item, bool exclude_markers = false);
+Geom::PathVector item_to_outline(SPItem const *item, bool exclude_markers = false);
+
+/**
+ * Find an outline recursivly, for groups for example.
+ */
+void item_to_outline_recursive(SPItem const *item, Geom::Affine const &transform, Geom::PathVector &pathv_in);
 
 /**
  * Replace item by path objects (a.k.a. stroke to path).
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index 208a982750..c8d69c5cb4 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -52,7 +52,6 @@
 #include "object/object-set.h"
 #include "object/persp3d.h"
 #include "object/sp-clippath.h"
-#include "object/sp-conn-end.h"
 #include "object/sp-defs.h"
 #include "object/sp-ellipse.h"
 #include "object/sp-flowregion.h"
@@ -555,20 +554,6 @@ void ObjectSet::duplicate(bool suppressDone, bool duplicateLayer)
                         doc->getObjectById(new_ids[i])->firstChild()->setAttribute("xlink:href", Glib::ustring("#") + new_ids[j]);
                     }
                 }
-            } else if (path) {
-                if (old_clone->getAttribute("inkscape:connection-start") != nullptr) {
-                    const char *old_start = old_clone->getAttribute("inkscape:connection-start");
-                    const char *old_end = old_clone->getAttribute("inkscape:connection-end");
-                    SPObject *new_clone = doc->getObjectById(new_ids[i]);
-                    for (guint j = 0; j < old_ids.size(); j++) {
-                        if(old_start == Glib::ustring("#") + old_ids[j]) {
-                            new_clone->setAttribute("inkscape:connection-start", Glib::ustring("#") + new_ids[j]);
-                        }
-                        if(old_end == Glib::ustring("#") + old_ids[j]) {
-                            new_clone->setAttribute("inkscape:connection-end", Glib::ustring("#") + new_ids[j]);
-                        }
-                    }
-                }
             }
         }
     }
@@ -1710,24 +1695,6 @@ void ObjectSet::applyAffine(Geom::Affine const &affine, bool set_i2d, bool compe
         if (set_i2d && item->isCenterSet())
             old_center = item->getCenter();
 
-        // If we're moving a connector, we want to detach it
-        // from shapes that aren't part of the selection, but
-        // leave it attached if they are
-        if (Inkscape::UI::Tools::cc_item_is_connector(item)) {
-            auto path = cast<SPPath>(item);
-            if (path) {
-                SPItem *attItem[2] = {nullptr, nullptr};
-                path->connEndPair.getAttachedItems(attItem);
-                for (int n = 0; n < 2; ++n) {
-                    if (!includes(attItem[n])) {
-                        sp_conn_end_detach(item, n);
-                    }
-                }
-            } else {
-                g_assert_not_reached();
-            }
-        }
-
         // "clones are unmoved when original is moved" preference
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         int compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
diff --git a/src/snap.cpp b/src/snap.cpp
index 9b80dea872..d4628659a1 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -846,14 +846,18 @@ void SnapManager::_findCandidates(SPObject* parent,
     for (auto& o: parent->children) {
         auto item = cast<SPItem>(&o);
         if (item && !(dt->itemIsHidden(item) && !clip_or_mask)) {
-            // Fix LPE boolops self-snapping
+            // Fix LPE boolops and connector lines self-snaping
+            auto lpeitem = cast<SPLPEItem>(item);
             bool stop = false;
+            // We're not snapping to Connector lines.
+            if (lpeitem && lpeitem->hasPathEffectOfType(Inkscape::LivePathEffect::EffectType::CONNECTOR_LINE)) {
+                continue;
+            }
             if (item->style) {
                 SPFilter *filt = item->style->getFilter();
                 if (filt && filt->getId() && strcmp(filt->getId(), "selectable_hidder_filter") == 0) {
                     stop = true;
                 }
-                auto lpeitem = cast<SPLPEItem>(item);
                 if (lpeitem && lpeitem->hasPathEffectOfType(Inkscape::LivePathEffect::EffectType::BOOL_OP)) {
                     stop = true;
                 }
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 14fcf9ad17..8685f1e51c 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -80,6 +80,7 @@ set(ui_SRC
 	tools/box3d-tool.cpp
 	tools/calligraphic-tool.cpp
 	tools/connector-tool.cpp
+        tools/connector-tool-knotholders.cpp
 	tools/dropper-tool.cpp
 	tools/dynamic-base.cpp
 	tools/eraser-tool.cpp
@@ -433,6 +434,7 @@ set(ui_SRC
 	tools/box3d-tool.h
 	tools/calligraphic-tool.h
 	tools/connector-tool.h
+        tools/connector-tool-knotholders.h
 	tools/dropper-tool.h
 	tools/dynamic-base.h
 	tools/eraser-tool.h
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 9551ab6763..51b1328374 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -800,6 +800,12 @@ void InkscapePreferences::AddBaseSimplifySpinbutton(DialogPage &p, Glib::ustring
                        false );
 }
 
+void InkscapePreferences::AddRouterPenaltySpinbutton(DialogPage &p, Glib::ustring const &pref, Glib::ustring const &name, Glib::ustring const &tip, double def_value)
+{
+    auto const sb = Gtk::make_managed<PrefSpinButton>();
+    sb->init("/tools/connector/penalty/" + pref, 0.0, 1000.0, 0.1, 10.0, def_value, false, false);
+    p.add_line(false, name, *sb, "", tip, false);
+}
 
 static void StyleFromSelectionToTool(Glib::ustring const &prefs_path, StyleSwatch *swatch)
 {
@@ -858,9 +864,8 @@ void InkscapePreferences::AddNewObjectsStyle(DialogPage &p, Glib::ustring const
     else
         p.add_group_header( _("Style of new objects"));
     auto const current = Gtk::make_managed<PrefRadioButton>();
-    current->init ( _("Last used style"), prefs_path + "/usecurrent", 1, true, nullptr);
-    p.add_line( true, "", *current, "",
-                _("Apply the style you last set on an object"));
+    current->init(_("Last used style"), prefs_path + "/usecurrent", 1, true, nullptr);
+    p.add_line( true, "", *current, "", _("Apply the style you last set on an object"));
 
     auto const own = Gtk::make_managed<PrefRadioButton>();
     auto const hb = Gtk::make_managed<Gtk::Box>();
@@ -1137,9 +1142,34 @@ void InkscapePreferences::initPageTools()
 
     //Connector
     this->AddSelcueCheckbox(_page_connector, "/tools/connector", true);
+    this->AddNewObjectsStyle(_page_connector, "/tools/connector");
     _page_connector.add_line(false, "", _connector_ignore_text, "",
             _("If on, connector attachment points will not be shown for text objects"));
 
+    PrefSpinButton* sb = Gtk::manage( new PrefSpinButton);
+    sb->init("/tools/connector/checkpoint/tolerance", 0, 500, 1, 10, 0, false, false);
+    _page_connector.add_line(false, "Drag Checkpoint Tolerance", *sb, "", "Automatic unlocking of checkpoint nodes when dragging (0 means do not unlock)", false);
+
+    _page_connector.add_group_header( _("Router Penalties"));
+    AddRouterPenaltySpinbutton(_page_connector, "angle", _("Acute Angles:"),
+        _("This penalty increases as the angle of the bend increases to an acute angle. "), 0);
+    AddRouterPenaltySpinbutton(_page_connector, "segment", _("Multiple Segments:"),
+        _("This penalty is applied for each segment in the connector. Required for orthogonal routing."), 20);
+    AddRouterPenaltySpinbutton(_page_connector, "crossing", _("Crossing Lines:"),
+        _("This penalty is applied whenever a connector path crosses another connector path."), 0);
+    AddRouterPenaltySpinbutton(_page_connector, "shape_buffer", _("Shape buffer:"),
+        _("This parameter defines the spacing distance that will be added to the sides of each shape when determining obstacle sizes."), 0);
+    AddRouterPenaltySpinbutton(_page_connector, "port_direction", _("Port Direction:"),
+        _("This penalty is applied to port selection choice when the other end of the connector being routed does not appear in any of the 90 degree visibility cones centered on the visibility directions for the port."), 1000);
+    AddRouterPenaltySpinbutton(_page_connector, "ideal_nudge", _("Ideal Nudge:"),
+        _("This parameter defines the spacing distance that will be used for nudging apart overlapping corners."), 4);
+    AddRouterPenaltySpinbutton(_page_connector, "cluster", _("Cluster Crossing:"),
+        _("This penalty is applied whenever a connector path crosses a cluster boundary."), 4000);
+    AddRouterPenaltySpinbutton(_page_connector, "shared_path", _("Shared Path:"),
+        _("This penalty is applied whenever a connector path shares some segments with an immovable portion of an existing connector route"), 0);
+    AddRouterPenaltySpinbutton(_page_connector, "reverse_direction", _("Reverse Direction:"),
+        _("This penalty is applied whenever a connector path travels in the direction opposite of the destination from the source endpoint."), 50);
+
 #ifdef WITH_LPETOOL
     //LPETool
     //disabled, because the LPETool is not finished yet.
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 5822362f6d..c6a8bf3126 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -650,6 +650,7 @@ protected:
     static void AddDotSizeSpinbutton(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, double def_value);
     static void AddBaseSimplifySpinbutton(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, double def_value);
     static void AddNewObjectsStyle(UI::Widget::DialogPage& p, Glib::ustring const &prefs_path, const gchar* banner = nullptr);
+    static void AddRouterPenaltySpinbutton(UI::Widget::DialogPage &p, Glib::ustring const &pref, Glib::ustring const &name, Glib::ustring const &tip, double def_value);
 
     void on_pagelist_selection_changed();
     void show_not_found();
diff --git a/src/ui/knot/knot-holder-entity.cpp b/src/ui/knot/knot-holder-entity.cpp
index ccc3837648..36139cec5e 100644
--- a/src/ui/knot/knot-holder-entity.cpp
+++ b/src/ui/knot/knot-holder-entity.cpp
@@ -59,6 +59,9 @@ void KnotHolderEntity::create(SPDesktop *desktop, SPItem *item, KnotHolder *pare
     _moved_connection = knot->moved_signal.connect(sigc::mem_fun(*parent_holder, &KnotHolder::knot_moved_handler));
     _click_connection = knot->click_signal.connect(sigc::mem_fun(*parent_holder, &KnotHolder::knot_clicked_handler));
     _ungrabbed_connection = knot->ungrabbed_signal.connect(sigc::mem_fun(*parent_holder, &KnotHolder::knot_ungrabbed_handler));
+    _enter_connection = knot->enter_signal.connect(sigc::mem_fun(*parent_holder, &KnotHolder::knot_enter_handler));
+    _leave_connection = knot->leave_signal.connect(sigc::mem_fun(*parent_holder, &KnotHolder::knot_leave_handler));
+    _event_connection = knot->event_signal.connect(sigc::mem_fun(*parent_holder, &KnotHolder::knot_event_handler));
 }
 
 KnotHolderEntity::~KnotHolderEntity()
diff --git a/src/ui/knot/knot-holder-entity.h b/src/ui/knot/knot-holder-entity.h
index ceff689c5f..af3f2b1f80 100644
--- a/src/ui/knot/knot-holder-entity.h
+++ b/src/ui/knot/knot-holder-entity.h
@@ -59,6 +59,9 @@ public:
     virtual bool knot_missing() const { return false; }
     virtual Geom::Point knot_get() const = 0;
     virtual void knot_click(unsigned /*state*/) {}
+    virtual void knot_enter(unsigned /*state*/) {}
+    virtual void knot_leave(unsigned /*state*/) {}
+    virtual bool knot_event(Inkscape::CanvasEvent const &event) { return false; }
     virtual bool set_item_clickpos(Geom::Point loc) { return false; }
 
     virtual void on_created() {}
@@ -78,6 +81,9 @@ private:
     Inkscape::auto_connection _moved_connection;
     Inkscape::auto_connection _click_connection;
     Inkscape::auto_connection _ungrabbed_connection;
+    Inkscape::auto_connection _enter_connection;
+    Inkscape::auto_connection _leave_connection;
+    Inkscape::auto_connection _event_connection;
 };
 
 // LPEs
diff --git a/src/ui/knot/knot-holder.cpp b/src/ui/knot/knot-holder.cpp
index 6d8043c96b..d72c68ccfd 100644
--- a/src/ui/knot/knot-holder.cpp
+++ b/src/ui/knot/knot-holder.cpp
@@ -40,6 +40,7 @@
 #include "ui/tools/node-tool.h"
 #include "ui/tools/rect-tool.h"
 #include "ui/tools/spiral-tool.h"
+#include "ui/widget/events/canvas-event.h"
 
 using Inkscape::DocumentUndo;
 
@@ -203,6 +204,34 @@ KnotHolder::knot_clicked_handler(SPKnot *knot, guint state)
     }
 }
 
+void KnotHolder::knot_enter_handler(SPKnot *knot, unsigned state)
+{
+    for(auto e : entity) {
+        if (e->knot == knot) {
+            e->knot_enter(state);
+        }
+    }
+}
+
+void KnotHolder::knot_leave_handler(SPKnot *knot, unsigned state)
+{
+    for(auto e : entity) {
+        if (e->knot == knot) {
+            e->knot_leave(state);
+        }
+    }
+}
+
+bool KnotHolder::knot_event_handler(SPKnot *knot, Inkscape::CanvasEvent const &event)
+{
+    for(auto e : entity) {
+        if (e->knot == knot) {
+            return e->knot_event(event);
+        }
+    }
+    return false;
+}
+
 void
 KnotHolder::transform_selected(Geom::Affine transform){
     for (auto & i : entity) {
diff --git a/src/ui/knot/knot-holder.h b/src/ui/knot/knot-holder.h
index 9627699230..550c995f57 100644
--- a/src/ui/knot/knot-holder.h
+++ b/src/ui/knot/knot-holder.h
@@ -15,6 +15,7 @@
  *
  */
 
+#include <gdk/gdk.h>
 #include <2geom/forward.h>
 #include <2geom/affine.h>
 #include <list>
@@ -25,7 +26,7 @@
 #define SEEN_SP_KNOTHOLDER_H
 
 namespace Inkscape {
-
+class CanvasEvent;
 namespace UI {
 class ShapeEditor;
 } // namespace UI
@@ -61,6 +62,9 @@ public:
     void knot_clicked_handler(SPKnot *knot, unsigned int state);
     void knot_grabbed_handler(SPKnot *knot, unsigned state);
     void knot_ungrabbed_handler(SPKnot *knot, unsigned int state);
+    void knot_enter_handler(SPKnot *knot, unsigned state);
+    void knot_leave_handler(SPKnot *knot, unsigned state);
+    bool knot_event_handler(SPKnot *knot, Inkscape::CanvasEvent const &event);
     void transform_selected(Geom::Affine transform);
     void add(KnotHolderEntity *e);
     void remove(KnotHolderEntity *e);
diff --git a/src/ui/knot/knot.cpp b/src/ui/knot/knot.cpp
index 121ae126cd..828ab85033 100644
--- a/src/ui/knot/knot.cpp
+++ b/src/ui/knot/knot.cpp
@@ -234,6 +234,7 @@ bool SPKnot::eventHandler(Inkscape::CanvasEvent const &event)
     [&] (Inkscape::EnterEvent const &event) {
         setFlag(SP_KNOT_MOUSEOVER, true);
         setFlag(SP_KNOT_GRABBED, false);
+        enter_signal.emit(this, event.modifiers);
 
         if (!_tip.empty() && desktop && desktop->getTool()) {
             desktop->getTool()->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _tip.c_str());
@@ -248,6 +249,7 @@ bool SPKnot::eventHandler(Inkscape::CanvasEvent const &event)
     [&] (Inkscape::LeaveEvent const &event) {
         setFlag(SP_KNOT_MOUSEOVER, false);
         setFlag(SP_KNOT_GRABBED, false);
+        leave_signal.emit(this, event.modifiers);
 
         if (!_tip.empty() && desktop && desktop->getTool()) {
             desktop->getTool()->defaultMessageContext()->clear();
diff --git a/src/ui/knot/knot.h b/src/ui/knot/knot.h
index 72f8a675e8..34f16ac33a 100644
--- a/src/ui/knot/knot.h
+++ b/src/ui/knot/knot.h
@@ -93,6 +93,8 @@ public:
     sigc::signal<void (SPKnot *, unsigned int)> click_signal;
     sigc::signal<void (SPKnot*, unsigned int)> doubleclicked_signal;
     sigc::signal<void (SPKnot*, unsigned int)> mousedown_signal;
+    sigc::signal<void (SPKnot*, unsigned int)> enter_signal;
+    sigc::signal<void (SPKnot*, unsigned int)> leave_signal;
     sigc::signal<void (SPKnot*, unsigned int)> grabbed_signal;
     sigc::signal<void (SPKnot *, unsigned int)> ungrabbed_signal;
     sigc::signal<void (SPKnot *, Geom::Point const &, unsigned int)> moved_signal;
diff --git a/src/ui/shape-editor-knotholders.cpp b/src/ui/shape-editor-knotholders.cpp
index 77cb213333..73692e14d8 100644
--- a/src/ui/shape-editor-knotholders.cpp
+++ b/src/ui/shape-editor-knotholders.cpp
@@ -20,6 +20,8 @@
 #include "desktop.h"
 #include "document.h"
 #include "live_effects/effect.h"
+#include "live_effects/lpe-connector-line.h"
+
 #include "object/box3d.h"
 #include "object/sp-ellipse.h"
 #include "object/sp-flowtext.h"
@@ -37,6 +39,9 @@
 #include "svg/css-ostringstream.h"
 #include "ui/knot/knot-holder-entity.h"
 #include "ui/knot/knot-holder.h"
+#include "ui/tools/connector-tool-knotholders.h"
+
+using Inkscape::UI::Tools::ConnectorLineKnotHolder;
 
 class RectKnotHolder : public KnotHolder {
 public:
@@ -142,6 +147,8 @@ std::unique_ptr<KnotHolder> create_knot_holder(SPItem *item, SPDesktop *desktop,
         if (!is_on_path) {
             knotholder = std::make_unique<TextKnotHolder>(desktop, item);
         }
+    } else if (Inkscape::LivePathEffect::isConnector(item)) {
+        knotholder = std::make_unique<ConnectorLineKnotHolder>(desktop, item);
     } else {
         auto flowtext = cast<SPFlowtext>(item);
         if (flowtext && flowtext->has_internal_frame()) {
diff --git a/src/ui/toolbar/connector-toolbar.cpp b/src/ui/toolbar/connector-toolbar.cpp
index ee5ced8611..b58b69d0a9 100644
--- a/src/ui/toolbar/connector-toolbar.cpp
+++ b/src/ui/toolbar/connector-toolbar.cpp
@@ -29,312 +29,207 @@
 #include "connector-toolbar.h"
 
 #include <glibmm/i18n.h>
-#include <gtkmm/adjustment.h>
-#include <gtkmm/builder.h>
-#include <gtkmm/togglebutton.h>
+#include <gtkmm/separator.h>
 
-#include "conn-avoid-ref.h"
 #include "desktop.h"
 #include "document-undo.h"
-#include "enums.h"
-#include "layer-manager.h"
-#include "object/algorithms/graphlayout.h"
-#include "object/sp-namedview.h"
-#include "object/sp-path.h"
+#include "live_effects/lpe-connector-line.h"
+#include "live_effects/lpe-connector-avoid.h"
 #include "selection.h"
 #include "ui/builder-utils.h"
-#include "ui/icon-names.h"
 #include "ui/tools/connector-tool.h"
 #include "ui/widget/canvas.h"
 #include "ui/widget/spinbutton.h"
 
 using Inkscape::DocumentUndo;
+using Inkscape::LivePathEffect::LPEConnectorAvoid;
+using Inkscape::UI::Tools::ConnectorTool;
 
 namespace Inkscape::UI::Toolbar {
 
 ConnectorToolbar::ConnectorToolbar(SPDesktop *desktop)
     : Toolbar(desktop)
     , _builder(create_builder("toolbar-connector.ui"))
-    , _orthogonal_btn(get_widget<Gtk::ToggleButton>             (_builder, "_orthogonal_btn"))
-    , _curvature_item(get_derived_widget<UI::Widget::SpinButton>(_builder, "_curvature_item"))
-    , _spacing_item  (get_derived_widget<UI::Widget::SpinButton>(_builder, "_spacing_item"))
-    , _length_item   (get_derived_widget<UI::Widget::SpinButton>(_builder, "_length_item"))
-    , _directed_btn  (get_widget<Gtk::ToggleButton>             (_builder, "_directed_btn"))
-    , _overlap_btn   (get_widget<Gtk::ToggleButton>             (_builder, "_overlap_btn"))
+    , _line_tool(get_widget<Gtk::ToggleButton>(_builder, "line_tool"))
+    , _point_tool(get_widget<Gtk::ToggleButton>(_builder, "point_tool"))
+    , _avoid(get_widget<Gtk::ToggleButton>(_builder, "avoid"))
+    , _orthogonal(get_widget<Gtk::ToggleButton>(_builder, "orthogonal"))
+    , _jump_type(get_widget<Gtk::ToggleButton>(_builder, "jump_type"))
 {
-    auto prefs = Inkscape::Preferences::get();
-
-    setup_derived_spin_button(_curvature_item, "curvature", defaultConnCurvature, &ConnectorToolbar::curvature_changed);
-    setup_derived_spin_button(_spacing_item, "spacing", defaultConnSpacing, &ConnectorToolbar::spacing_changed);
-    setup_derived_spin_button(_length_item, "length", 100, &ConnectorToolbar::length_changed);
+    auto prefs = Preferences::get();
 
     _toolbar = &get_widget<Gtk::Box>(_builder, "connector-toolbar");
     set_child(*_toolbar);
-    init_menu_btns();
-
-    // Orthogonal connectors toggle button
-    bool tbuttonstate = prefs->getBool("/tools/connector/orthogonal");
-    _orthogonal_btn.set_active((tbuttonstate ? TRUE : FALSE));
-
-    // Directed edges toggle button
-    tbuttonstate = prefs->getBool("/tools/connector/directedlayout");
-    _directed_btn.set_active(tbuttonstate ? TRUE : FALSE);
-
-    // Avoid overlaps toggle button
-    tbuttonstate = prefs->getBool("/tools/connector/avoidoverlaplayout");
-    _overlap_btn.set_active(tbuttonstate ? TRUE : FALSE);
-
-    // Signals.
-    get_widget<Gtk::Button>(_builder, "avoid_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &ConnectorToolbar::path_set_avoid));
-    get_widget<Gtk::Button>(_builder, "ignore_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &ConnectorToolbar::path_set_ignore));
-    get_widget<Gtk::Button>(_builder, "graph_btn")
-        .signal_clicked()
-        .connect(sigc::mem_fun(*this, &ConnectorToolbar::graph_layout));
-
-    _orthogonal_btn.signal_toggled().connect(sigc::mem_fun(*this, &ConnectorToolbar::orthogonal_toggled));
-    _directed_btn.signal_toggled().connect(sigc::mem_fun(*this, &ConnectorToolbar::directed_graph_layout_toggled));
-    _overlap_btn.signal_toggled().connect(sigc::mem_fun(*this, &ConnectorToolbar::nooverlaps_graph_layout_toggled));
-    desktop->getSelection()->connectChanged(sigc::mem_fun(*this, &ConnectorToolbar::selection_changed));
-
-    // Code to watch for changes to the connector-spacing attribute in
-    // the XML.
-    Inkscape::XML::Node *repr = desktop->getNamedView()->getRepr();
-    g_assert(repr != nullptr);
-
-    if(_repr) {
-        _repr->removeObserver(*this);
-        Inkscape::GC::release(_repr);
-        _repr = nullptr;
-    }
-
-    if (repr) {
-        _repr = repr;
-        Inkscape::GC::anchor(_repr);
-        _repr->addObserver(*this);
-        _repr->synthesizeEvents(*this);
-    }
-}
-
-ConnectorToolbar::~ConnectorToolbar() = default;
 
-void ConnectorToolbar::setup_derived_spin_button(UI::Widget::SpinButton &btn, Glib::ustring const &name,
-                                                 double default_value, ValueChangedMemFun const value_changed_mem_fun)
-{
-    auto adj = btn.get_adjustment();
-    const Glib::ustring path = "/tools/connector/" + name;
-    auto const val = Preferences::get()->getDouble(path, default_value);
-    adj->set_value(val);
-    adj->signal_value_changed().connect(sigc::mem_fun(*this, value_changed_mem_fun));
-
-    btn.set_defocus_widget(_desktop->getCanvas());
-}
+    _line_tool.signal_toggled().connect(sigc::mem_fun(*this, &ConnectorToolbar::tool_toggled));
+    _point_tool.signal_toggled().connect(sigc::mem_fun(*this, &ConnectorToolbar::tool_toggled));
+    _avoid.signal_toggled().connect(sigc::mem_fun(*this, &ConnectorToolbar::path_set_avoid));
 
-void ConnectorToolbar::path_set_avoid()
-{
-    Inkscape::UI::Tools::cc_selection_set_avoid(_desktop, true);
+    // Orthogonal connectors toggle button
+    _orthogonal.set_active(prefs->getBool("/tools/connector/orthogonal"));
+    _orthogonal.signal_toggled().connect(sigc::mem_fun(*this, &ConnectorToolbar::orthogonal_toggled));
+
+    // Curvature spinbox
+    auto &curvature_item = get_derived_widget<UI::Widget::SpinButton>(_builder, "curvature_item");
+    curvature_item.set_defocus_widget(desktop->getCanvas());
+    _curvature_adj = curvature_item.get_adjustment();
+    _curvature_adj->set_value(prefs->getDouble("/tools/connector/curvature", 1.0));
+    _curvature_adj->signal_value_changed().connect(sigc::mem_fun(*this, &ConnectorToolbar::curvature_changed));
+
+    // Steps spinbox
+    auto &steps_val = get_derived_widget<UI::Widget::SpinButton>(_builder, "steps_item");
+    steps_val.set_defocus_widget(desktop->getCanvas());
+    _steps_adj = steps_val.get_adjustment();
+    _steps_adj->set_value(prefs->getDouble("/tools/connector/steps", 1.0));
+    _steps_adj->signal_value_changed().connect(sigc::mem_fun(*this, &ConnectorToolbar::steps_changed));
+
+    // Spacing spinbox
+    auto &spacing_item = get_derived_widget<UI::Widget::SpinButton>(_builder, "spacing_item");
+    spacing_item.set_defocus_widget(desktop->getCanvas());
+    _spacing_adj = spacing_item.get_adjustment();
+    _spacing_adj->set_value(prefs->getDouble("/tools/connector/spacing", 0.0));
+    _spacing_adj->signal_value_changed().connect(sigc::mem_fun(*this, &ConnectorToolbar::spacing_changed));
+
+    // Jump size spinbox
+    auto &jump_item = get_derived_widget<UI::Widget::SpinButton>(_builder, "jump_item");
+    jump_item.set_defocus_widget(desktop->getCanvas());
+    _jump_size_adj = jump_item.get_adjustment();
+    _jump_size_adj->set_value(prefs->getDouble("/tools/connector/jump-size", 4.0));
+    _jump_size_adj->signal_value_changed().connect(sigc::mem_fun(*this, &ConnectorToolbar::jump_size_changed));
+
+    // Jump type toggle
+    _jump_type.set_active(prefs->getBool("/tools/connector/jump-type"));
+    _jump_type.signal_toggled().connect(sigc::mem_fun(*this, &ConnectorToolbar::jump_type_toggled));
+
+    // Code to watch for changes to the connector-spacing attribute in the XML.
+    _repr = _desktop->getDocument()->getReprNamedView();
+    assert(_repr);
+    Inkscape::GC::anchor(_repr);
+    _repr->addObserver(*this);
+    _repr->synthesizeEvents(*this);
 }
 
-void ConnectorToolbar::path_set_ignore()
+ConnectorToolbar::~ConnectorToolbar()
 {
-    Inkscape::UI::Tools::cc_selection_set_avoid(_desktop, false);
+    _repr->removeObserver(*this);
+    Inkscape::GC::release(_repr);
 }
 
-void ConnectorToolbar::orthogonal_toggled()
+void ConnectorToolbar::tool_toggled()
 {
-    auto doc = _desktop->getDocument();
-
-    if (!DocumentUndo::getUndoSensitive(doc)) {
+    auto tool = dynamic_cast<ConnectorTool *>(_desktop->getTool());
+    if (!tool) {
         return;
     }
 
-    // quit if run by the _changed callbacks
-    if (_freeze) {
-        return;
+    if (_line_tool.get_active() && tool->tool_mode != Tools::CONNECTOR_LINE_MODE) {
+        _point_tool.set_active(false);
+        tool->setToolMode(Tools::CONNECTOR_LINE_MODE);
     }
-
-    // in turn, prevent callbacks from responding
-    _freeze = true;
-
-    bool is_orthog = _orthogonal_btn.get_active();
-    gchar orthog_str[] = "orthogonal";
-    gchar polyline_str[] = "polyline";
-    gchar *value = is_orthog ? orthog_str : polyline_str ;
-
-    bool modmade = false;
-    auto itemlist= _desktop->getSelection()->items();
-    for(auto i=itemlist.begin();i!=itemlist.end();++i){
-        SPItem *item = *i;
-
-        if (Inkscape::UI::Tools::cc_item_is_connector(item)) {
-            item->setAttribute( "inkscape:connector-type", value);
-            item->getAvoidRef().handleSettingChange();
-            modmade = true;
-        }
+    if (_point_tool.get_active() && tool->tool_mode != Tools::CONNECTOR_POINT_MODE) {
+        _line_tool.set_active(false);
+        tool->setToolMode(Tools::CONNECTOR_POINT_MODE);
     }
-
-    if (!modmade) {
-        Preferences::get()->setBool("/tools/connector/orthogonal", is_orthog);
-    } else {
-
-        DocumentUndo::done(doc, is_orthog ? _("Set connector type: orthogonal"): _("Set connector type: polyline"), INKSCAPE_ICON("draw-connector"));
-    }
-
-    _freeze = false;
 }
 
-void ConnectorToolbar::curvature_changed()
+void ConnectorToolbar::path_set_avoid()
 {
-    SPDocument *doc = _desktop->getDocument();
-
-    if (!DocumentUndo::getUndoSensitive(doc)) {
-        return;
-    }
-
-
-    // quit if run by the _changed callbacks
-    if (_freeze) {
+    if (!_desktop) {
         return;
     }
 
-    // in turn, prevent callbacks from responding
-    _freeze = true;
-
-    auto newValue = _curvature_item.get_adjustment()->get_value();
-    gchar value[G_ASCII_DTOSTR_BUF_SIZE];
-    g_ascii_dtostr(value, G_ASCII_DTOSTR_BUF_SIZE, newValue);
+    bool set_avoid = _avoid.get_active();
+    auto document = _desktop->getDocument();
+    auto selection = _desktop->getSelection();
 
-    bool modmade = false;
-    auto itemlist= _desktop->getSelection()->items();
-    for(auto i=itemlist.begin();i!=itemlist.end();++i){
-        SPItem *item = *i;
-
-        if (Inkscape::UI::Tools::cc_item_is_connector(item)) {
-            item->setAttribute( "inkscape:connector-curvature", value);
-            item->getAvoidRef().handleSettingChange();
-            modmade = true;
-        }
+    int changed = false;
+    for (auto item : selection->items()) {
+        changed |= LPEConnectorAvoid::toggleAvoid(item, set_avoid);
     }
-
-    if (!modmade) {
-        Preferences::get()->setDouble(Glib::ustring("/tools/connector/curvature"), newValue);
-    }
-    else {
-        DocumentUndo::done(doc, _("Change connector curvature"), INKSCAPE_ICON("draw-connector"));
+    if (changed && set_avoid) {
+        DocumentUndo::done(document, _("Make connectors avoid selected objects"), "");
+    } else if (changed && !set_avoid) {
+        DocumentUndo::done(document, _("Make connectors ignore selected objects"), "");
+    } else {
+        _desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE,
+                                        _("Select <b>at least one non-connector object</b>."));
     }
-
-    _freeze = false;
 }
 
-void ConnectorToolbar::spacing_changed()
+void ConnectorToolbar::orthogonal_toggled()
 {
-    SPDocument *doc = _desktop->getDocument();
-
-    if (!DocumentUndo::getUndoSensitive(doc)) {
-        return;
-    }
-
-    Inkscape::XML::Node *repr = _desktop->getNamedView()->getRepr();
-
-    if (!repr->attribute("inkscape:connector-spacing") &&
-        (_spacing_item.get_adjustment()->get_value() == defaultConnSpacing)) {
-        // Don't need to update the repr if the attribute doesn't
-        // exist and it is being set to the default value -- as will
-        // happen at startup.
-        return;
-    }
-
-    // quit if run by the attr_changed listener
-    if (_freeze) {
-        return;
-    }
-
-    // in turn, prevent listener from responding
-    _freeze = true;
-
-    repr->setAttributeCssDouble("inkscape:connector-spacing", _spacing_item.get_adjustment()->get_value());
-    _desktop->getNamedView()->updateRepr();
-    bool modmade = false;
-
-    auto items = get_avoided_items(_desktop->layerManager().currentRoot(), _desktop);
-    for (auto item : items) {
-        Geom::Affine m = Geom::identity();
-        avoid_item_move(&m, item);
-        modmade = true;
-    }
-
-    if(modmade) {
-        DocumentUndo::done(doc, _("Change connector spacing"), INKSCAPE_ICON("draw-connector"));
-    }
-    _freeze = false;
+    Preferences::get()->setBool("/tools/connector/orthogonal", _orthogonal.get_active());
 }
 
-void ConnectorToolbar::graph_layout()
+void ConnectorToolbar::curvature_changed()
 {
-    assert(_desktop);
-    if (!_desktop) {
-        return;
-    }
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-
-    // hack for clones, see comment in align-and-distribute.cpp
-    int saved_compensation = prefs->getInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
-    prefs->setInt("/options/clonecompensation/value", SP_CLONE_COMPENSATION_UNMOVED);
-
-    auto tmp = _desktop->getSelection()->items();
-    std::vector<SPItem *> vec(tmp.begin(), tmp.end());
-    graphlayout(vec);
-
-    prefs->setInt("/options/clonecompensation/value", saved_compensation);
-
-    DocumentUndo::done(_desktop->getDocument(), _("Arrange connector network"), INKSCAPE_ICON("dialog-align-and-distribute"));
+    Preferences::get()->setDouble(Glib::ustring("/tools/connector/curvature"), _curvature_adj->get_value());
 }
 
-void ConnectorToolbar::length_changed()
+void ConnectorToolbar::steps_changed()
 {
-    Preferences::get()->setDouble("/tools/connector/length", _length_item.get_adjustment()->get_value());
+    Preferences::get()->setDouble(Glib::ustring("/tools/connector/steps"), _steps_adj->get_value());
 }
 
-void ConnectorToolbar::directed_graph_layout_toggled()
+void ConnectorToolbar::spacing_changed()
 {
-    Preferences::get()->setBool("/tools/connector/directedlayout", _directed_btn.get_active());
+    Preferences::get()->setDouble(Glib::ustring("/tools/connector/spacing"), _spacing_adj->get_value());
 }
 
-void ConnectorToolbar::selection_changed(Inkscape::Selection *selection)
+void ConnectorToolbar::jump_size_changed()
 {
-    SPItem *item = selection->singleItem();
-    if (is<SPPath>(item))
-    {
-        gdouble curvature = cast<SPPath>(item)->connEndPair.getCurvature();
-        bool is_orthog = cast<SPPath>(item)->connEndPair.isOrthogonal();
-        _orthogonal_btn.set_active(is_orthog);
-        _curvature_item.get_adjustment()->set_value(curvature);
-    }
-
+    Preferences::get()->setDouble(Glib::ustring("/tools/connector/jump-size"), _jump_size_adj->get_value());
 }
 
-void ConnectorToolbar::nooverlaps_graph_layout_toggled()
+void ConnectorToolbar::jump_type_toggled()
 {
-    Preferences::get()->setBool("/tools/connector/avoidoverlaplayout", _overlap_btn.get_active());
+    Preferences::get()->setBool("/tools/connector/jump-type", _jump_type.get_active());
 }
 
-void ConnectorToolbar::notifyAttributeChanged(Inkscape::XML::Node &repr, GQuark name_,
-                                              Inkscape::Util::ptr_shared,
-                                              Inkscape::Util::ptr_shared)
+/**
+ * Set the selected avoided (or not avoided) shapes.
+ */
+void ConnectorToolbar::select_avoided(Inkscape::Selection *selection)
 {
-    auto const name = g_quark_to_string(name_);
-    if (!_freeze && (strcmp(name, "inkscape:connector-spacing") == 0) ) {
-        gdouble spacing = repr.getAttributeDouble("inkscape:connector-spacing", defaultConnSpacing);
-
-        _spacing_item.get_adjustment()->set_value(spacing);
+    bool avoided = false;
+    for (auto item : selection->items()) {
+        if (!LivePathEffect::isConnector(item)) {
+            avoided |= LivePathEffect::isAvoided(item);
+        }
+    }
+    //set_toggle_active(_avoid, avoided);
+}
 
-        if (_desktop->getCanvas()) {
-            _desktop->getCanvas()->grab_focus();
+/**
+ * Set the selected lines (called from connector-tool.cpp)
+ */
+void ConnectorToolbar::select_lines(std::vector<SPShape *> const &lines)
+{
+    // Set the toolbar icons to the average of the selected items.
+    bool conn_type = false;
+    bool jump_type = false;
+    int curve_count = 0;
+    double spacing = 0.0;
+    double curvature = 0.0;
+    double jump_size = 0.0;
+    for (auto item : lines) {
+        if (LivePathEffect::isConnector(item)) {
+            auto lpe = LivePathEffect::LPEConnectorLine::get(item);
+            curve_count++;
+            spacing += lpe->getSpacing();
+            curvature += lpe->getCurvature();
+            jump_size += lpe->getJumpSize();
+            jump_type |= lpe->getJumpType() == LivePathEffect::JumpMode::Arc;
+            conn_type |= lpe->getConnType() == Avoid::ConnType_Orthogonal;
         }
     }
+    if (curve_count) {
+        _spacing_adj->set_value(spacing / curve_count);
+        _curvature_adj->set_value(curvature / curve_count);
+        _jump_size_adj->set_value(jump_size / curve_count);
+        //set_toggle_active(_jump_type, jump_type);
+        //set_toggle_active(_orthogonal, conn_type);
+    }
 }
 
 } // namespace Inkscape::UI::Toolbar
diff --git a/src/ui/toolbar/connector-toolbar.h b/src/ui/toolbar/connector-toolbar.h
index fca90b8cba..3240e55e20 100644
--- a/src/ui/toolbar/connector-toolbar.h
+++ b/src/ui/toolbar/connector-toolbar.h
@@ -4,7 +4,7 @@
 
 /**
  * @file
- * Connector aux toolbar
+ * Connector toolbar
  */
 /* Authors:
  *   MenTaLguY <mental@rydia.net>
@@ -29,16 +29,18 @@
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
+#include <gtkmm/adjustment.h>
+
 #include "toolbar.h"
-#include "ui/widget/spinbutton.h"
+#include "object/sp-shape.h"
+
 #include "xml/node-observer.h"
 
+class SPDesktop;
+
 namespace Gtk {
-class Builder;
 class ToggleButton;
-} // namespace Gtk
-
-class SPDesktop;
+}
 
 namespace Inkscape {
 class Selection;
@@ -50,59 +52,53 @@ class Node;
 namespace UI {
 namespace Toolbar {
 
-class ConnectorToolbar final
-    : public Toolbar
+class ConnectorToolbar
+	: public Toolbar
     , private XML::NodeObserver
 {
 public:
     ConnectorToolbar(SPDesktop *desktop);
     ~ConnectorToolbar() override;
 
-private:
-    using ValueChangedMemFun = void (ConnectorToolbar::*)();
+    void select_avoided(Inkscape::Selection *selection);
+    void select_lines(std::vector<SPShape *> const &lines);
 
+private:
     Glib::RefPtr<Gtk::Builder> _builder;
 
-    Gtk::ToggleButton &_orthogonal_btn;
-    Gtk::ToggleButton &_directed_btn;
-    Gtk::ToggleButton &_overlap_btn;
+public:
+    Gtk::ToggleButton &_line_tool;
+    Gtk::ToggleButton &_point_tool;
+
+private:
+    Gtk::ToggleButton &_avoid;
+    Gtk::ToggleButton &_orthogonal;
 
-    UI::Widget::SpinButton &_curvature_item;
-    UI::Widget::SpinButton &_spacing_item;
-    UI::Widget::SpinButton &_length_item;
+    Glib::RefPtr<Gtk::Adjustment> _curvature_adj;
+    Glib::RefPtr<Gtk::Adjustment> _steps_adj;
+    Glib::RefPtr<Gtk::Adjustment> _spacing_adj;
+    Glib::RefPtr<Gtk::Adjustment> _jump_size_adj;
 
-    bool _freeze{false};
+    Gtk::ToggleButton &_jump_type;
 
-    Inkscape::XML::Node *_repr{nullptr};
+    Inkscape::XML::Node *_repr = nullptr;
 
-    void setup_derived_spin_button(UI::Widget::SpinButton &btn, Glib::ustring const &name, double default_value,
-                                   ValueChangedMemFun const value_changed_mem_fun);
+    void tool_toggled();
     void path_set_avoid();
-    void path_set_ignore();
     void orthogonal_toggled();
     void graph_layout();
     void directed_graph_layout_toggled();
     void nooverlaps_graph_layout_toggled();
     void curvature_changed();
+    void steps_changed();
     void spacing_changed();
+    void jump_size_changed();
+    void jump_type_toggled();
     void length_changed();
-    void selection_changed(Inkscape::Selection *selection);
-
-	void notifyAttributeChanged(Inkscape::XML::Node &node, GQuark name,
-								Inkscape::Util::ptr_shared old_value,
-								Inkscape::Util::ptr_shared new_value) final;
-
-public:
-    static void event_attr_changed(Inkscape::XML::Node *repr,
-                                   gchar const         *name,
-                                   gchar const         * /*old_value*/,
-                                   gchar const         * /*new_value*/,
-                                   bool                  /*is_interactive*/,
-                                   gpointer             data);
 };
 
 }
 }
 }
 
-#endif /* !SEEN_CONNECTOR_TOOLBAR_H */
+#endif // SEEN_CONNECTOR_TOOLBAR_H
diff --git a/src/ui/tools/connector-tool-knotholders.cpp b/src/ui/tools/connector-tool-knotholders.cpp
new file mode 100644
index 0000000000..beb49536ba
--- /dev/null
+++ b/src/ui/tools/connector-tool-knotholders.cpp
@@ -0,0 +1,491 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Node editing extension to connection tool
+ *
+ * Authors:
+ *   Martin Owens <doctormo@geek-2.com>
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+
+#include "ui/tools/connector-tool-knotholders.h"
+
+#include <glibmm/i18n.h>
+#include <utility>
+
+#include "ui/widget/events/canvas-event.h"
+#include "live_effects/lpe-connector-line.h"
+#include "display/curve.h"
+#include "object/sp-point.h"
+#include "object/sp-root.h"
+#include "object/sp-shape.h"
+#include "svg/svg.h"
+
+using namespace Inkscape::LivePathEffect;
+
+namespace Inkscape::UI::Tools {
+
+ConnectorObjectKnotHolder::ConnectorObjectKnotHolder(SPDesktop *desktop, SPItem *item)
+    : KnotHolder(desktop, item)
+{
+    // Adds point knotholders, editable this time.
+    for (auto &sp_point : item->getConnectionPoints()) {
+        ConnectorKnotEditPoint *point = new ConnectorKnotEditPoint(sp_point);
+        point->create(desktop, item, this, Inkscape::CANVAS_ITEM_CTRL_TYPE_CONNECT_POINT, "point:edit",
+                      _("Connection point in objct, drag to move this point."));
+        entity.push_back(point);
+    }
+}
+
+ConnectorKnotEditPoint::ConnectorKnotEditPoint(SPPoint *sub_point)
+    : sub_point(sub_point)
+{}
+
+Geom::Point ConnectorKnotEditPoint::knot_get() const
+{
+    return *sub_point->itemPoint();
+}
+
+void ConnectorKnotEditPoint::knot_set(Geom::Point const &raw, Geom::Point const &origin, unsigned int state)
+{
+    Geom::Point p = snap_knot_position(raw, state);
+    sub_point->setItemPoint(&p);
+}
+
+bool ConnectorKnotEditPoint::knot_event(Inkscape::CanvasEvent const &event)
+{
+    if (event.type() == EventType::BUTTON_PRESS) {
+        auto &button_event = static_cast<ButtonPressEvent const &>(event);
+        if (button_event.button == 1 && button_event.num_press == 2) {
+            sub_point->deleteObject();
+            tool()->selectionChange();
+            return true;
+        }
+    }
+    return false;
+}
+
+ConnectorLineKnotHolder::ConnectorLineKnotHolder(SPDesktop *desktop, SPItem *item)
+    : KnotHolder(desktop, item)
+    , i2dt(desktop->getDocument()->getRoot()->i2dt_affine())
+{
+    auto lpe = LPEConnectorLine::get(item);
+    auto original_pathv = cast<SPShape>(item)->curveForEdit()->get_pathvector();
+    auto const &route_pathv = lpe->getRoutePath();
+
+    if (original_pathv.size() == 1) {
+        ConnectorKnotEnd *src = new ConnectorKnotEnd(false);
+        src->create(desktop, item, this, Inkscape::CANVAS_ITEM_CTRL_TYPE_CONNECTION, "end:src",
+                    _("Move the connected line to a new connection."));
+        entity.push_back(src);
+
+        ConnectorKnotEnd *dst = new ConnectorKnotEnd(true);
+        dst->create(desktop, item, this, Inkscape::CANVAS_ITEM_CTRL_TYPE_CONNECTION, "end:dst",
+                    _("Move the connected line to a new connection."));
+        entity.push_back(dst);
+
+        if (lpe->advancedEditor()) {
+            advanced_line = make_canvasitem<CanvasItemBpath>(desktop->getCanvasSketch());
+            advanced_line->set_stroke(0x3465a479); // blue
+            advanced_line->set_fill(0x0, SP_WIND_RULE_NONZERO);
+            advanced_path = route_pathv[0];
+            advanced_start = advanced_path.initialPoint();
+            advanced_end = advanced_path.finalPoint();
+
+            // we need to loop through all the segments (line segments) in the target line
+            for (int i = 0; i < advanced_path.size(); i++) {
+                if (advanced_path[i].length() < 0.01 || !advanced_path[i].isLineSegment()) {
+                    continue;
+                }
+
+                // Each segment defines a mid point which always sits on that line's middle
+                auto mid = new ConnectorKnotMidpoint(i);
+                mid->create(desktop, item, this, Inkscape::CANVAS_ITEM_CTRL_TYPE_CONNECT_MIDPOINT, "midpoint",
+                            _("Move the mid-point to a new location"), 0x3465a400);
+                entity.push_back(mid);
+            }
+            updateAdvancedLine();
+        } else {
+            // Raw checkpoint editing, usually of directional lines.
+            for (int i = 1; i < original_pathv[0].size(); i++) {
+                int dir = LPEConnectorLine::getCheckpointOrientation(&original_pathv[0][i]);
+                int dynamic = LPEConnectorLine::getCheckpointDynamic(&original_pathv[0][i-1]);
+                auto check = new ConnectorKnotCheckpoint(i, dir, dynamic);
+                check->create(desktop, item, this, Inkscape::CANVAS_ITEM_CTRL_TYPE_CONNECT_CHECKPOINT, "checkpoint",
+                              _("Move the checkpoint to a new location"), 0xffffff00);
+                entity.push_back(check);
+            }
+        }
+    }
+}
+
+/**
+ * Show a preview to the user of what their edit will do to the line.
+ */
+void ConnectorLineKnotHolder::updateAdvancedLine()
+{
+    Geom::PathVector pathv;
+    pathv.push_back(getNewRoutePath());
+
+    advanced_line->set_bpath(pathv * i2dt, true);
+    advanced_line->set_visible(true);
+}
+
+Geom::Path ConnectorLineKnotHolder::getNewRoutePath()
+{
+    Geom::Path path;
+    if (advanced_path.initialPoint() != advanced_start) {
+        path = Geom::Path(advanced_start);
+        path.appendNew<Geom::LineSegment>(advanced_path.initialPoint());
+    }
+    for (auto const &i : advanced_path) {
+        path.append(i);
+    }
+    if (path.finalPoint() != advanced_end) {
+        path.appendNew<Geom::LineSegment>(advanced_end);
+    }
+    return path;
+}
+
+/**
+ * Actually change the line route configuration now.
+ */
+void ConnectorLineKnotHolder::commitAdvancedLine()
+{
+    // Remove unneeded elements from the path, healing and so forth.
+    Geom::Path route_path = getNewRoutePath();
+    Geom::Path path;
+    bool last_vert = false;
+    for (int i = 0; i < route_path.size(); i++) {
+        auto bezier = dynamic_cast<Geom::BezierCurve *>(route_path[i].duplicate());
+        bool vert = Geom::are_near(bezier->initialPoint()[Geom::X], bezier->finalPoint()[Geom::X]);
+        bool horz = Geom::are_near(bezier->initialPoint()[Geom::Y], bezier->finalPoint()[Geom::Y]);
+
+        // Line has been removed.
+        if (horz && vert) {
+            continue;
+        }
+
+        if (!path.empty()) {
+            if (vert == last_vert) {
+                // Skip lines that go in the same direction (healing)!
+                path.setFinal(bezier->finalPoint());
+                continue;
+            }
+            // Make sure the initial point is linked to the previous.
+            bezier->setInitial(path[i-1].finalPoint());
+        }
+
+        last_vert = vert;
+        path.append(bezier);
+    }
+
+    // Build all the checkmarks from all the mind points.
+    Geom::PathVector pathv;
+    pathv.push_back(Geom::Path(advanced_start));
+    for (int i = 1; i < route_path.size() - 1; i++) {
+        pathv.back().appendNew<Geom::LineSegment>(
+            Geom::middle_point(path[i].initialPoint(), path[i].finalPoint())
+        );
+    }
+    pathv.back().appendNew<Geom::LineSegment>(advanced_end);
+
+    // Re-populate the directionality and dynamics (ineffecient method)
+    for (int i = 1; i < pathv[0].size(); i++) {
+        auto dir = LPEConnectorLine::detectCheckpointOrientation(route_path, pathv[0].nodes()[i]);
+
+        int dynamic = DynamicNone;
+        if (i == 1 || 1 == pathv[0].size() - 1) {
+            if (dir & Avoid::ConnDirVert) {
+                dynamic += DynamicY;
+            }
+            if (dir & Avoid::ConnDirHorz) {
+                dynamic += DynamicX;
+            }
+        }
+        pathv = LPEConnectorLine::rewriteLine(pathv[0], i, pathv[0].nodes()[i], dir, dynamic);
+    }
+
+    if (auto lpe_item = dynamic_cast<SPLPEItem *>(item)) {
+        item->setAttribute("inkscape:original-d", sp_svg_write_path(pathv));
+        sp_lpe_item_update_patheffect(lpe_item, false, true);
+        DocumentUndo::done(desktop->getDocument(), _("Move orthoganal midpoint"), "");
+    }
+
+    if (auto tool = dynamic_cast<ConnectorTool *>(desktop->getTool())) {
+        tool->selectionChange();
+    }
+}
+
+ConnectorLineKnotHolder::~ConnectorLineKnotHolder() = default;
+
+ConnectorKnotMidpoint::ConnectorKnotMidpoint(int index)
+    : _index(index)
+{}
+
+// Always return the mid point of the target line
+Geom::Point ConnectorKnotMidpoint::knot_get() const
+{
+    auto path = holder()->advanced_path;
+    return Geom::middle_point(path[_index].initialPoint(), path[_index].finalPoint());
+}
+
+Geom::Point ConnectorKnotMidpoint::moveOneAxis(bool vert, Geom::Point origin, Geom::Point raw)
+{
+    if (vert) {
+        return Geom::Point(raw.x(), origin.y());
+    }
+    return Geom::Point(origin.x(), raw.y());
+}
+
+// Update the route line in the parent as we re-draw it
+void ConnectorKnotMidpoint::knot_set(Geom::Point const &raw, Geom::Point const &origin, unsigned state)
+{
+    auto snap_point = snap_knot_position(raw, state);
+    auto path = holder()->advanced_path;
+    bool vert = path[_index].initialPoint()[Geom::X] == path[_index].finalPoint()[Geom::X];
+
+    Geom::Path new_path;
+    for (int i = 0; i < path.size(); i++) {
+        auto bezier = dynamic_cast<Geom::BezierCurve *>(path[i].duplicate());
+        if (i == _index || i == _index - 1) {
+            bezier->setFinal(moveOneAxis(vert, bezier->finalPoint(), snap_point));
+        }
+        if (i == _index || i == _index + 1) {
+            bezier->setInitial(moveOneAxis(vert, bezier->initialPoint(), snap_point));
+        }
+        new_path.append(bezier);
+    }
+
+    holder()->advanced_path = new_path;
+    holder()->updateAdvancedLine();
+}
+
+// Commit any changes to the midpoint and ALWAYS destroy the knotholder and re-request everything
+void ConnectorKnotMidpoint::knot_ungrabbed(Geom::Point const &p, Geom::Point const &origin, unsigned state)
+{
+    holder()->commitAdvancedLine();
+}
+
+ConnectorKnotCheckpoint::ConnectorKnotCheckpoint(int index, int dir, unsigned dynamic)
+    : ConnectorKnot()
+    , index(index)
+    , dir(dir)
+    , dynamic(dynamic)
+{}
+
+Geom::Point ConnectorKnotCheckpoint::knot_get() const
+{
+    // Called by update_knot, so we sandwhich this in here.
+    auto original_pathv = cast<SPShape>(item)->curveForEdit()->get_pathvector();
+    if (dynamic) {
+        auto route_pathv = LPEConnectorLine::get(item)->getRoutePath();
+        return LPEConnectorLine::getCheckpointPosition(
+               &(original_pathv[0][index-1]), &(original_pathv[0][index]),
+               route_pathv.initialPoint(), route_pathv.finalPoint());
+    }
+    return original_pathv[0].nodes()[index];
+}
+
+void ConnectorKnotCheckpoint::knot_set(Geom::Point const &raw, Geom::Point const &origin, unsigned state)
+{
+    auto snap_point = snap_knot_position(raw, state);
+
+    auto prefs = Inkscape::Preferences::get();
+    int tolerance = prefs->getInt("/tools/connector/checkpoint/tolerance", 0);
+
+    if (tolerance > 0) {
+        // Remove dynamic if we stray far away from the original point.
+        if (dynamic & DynamicX && std::abs(snap_point.x() - origin.x()) > tolerance) {
+            dynamic -= DynamicX;
+        }
+        if (dynamic & DynamicY && std::abs(snap_point.y() - origin.y()) > tolerance) {
+            dynamic -= DynamicY;
+        }
+    }
+    // OptionalFuture: if we want a more dynamic update we could create a blue
+    // routing line in connector-tool and only run this on mouse release.
+    // Setting the dynamic here could be interesting. If we move it too far out for example.
+    LPEConnectorLine::rewriteLine(cast<SPShape>(item), index, snap_point, dir, dynamic);
+    DocumentUndo::done(desktop->getDocument(), _("Move connector checkpoint"), "");
+}
+
+bool ConnectorKnotCheckpoint::knot_event(Inkscape::CanvasEvent const &event)
+{
+    if (event.type() == EventType::BUTTON_PRESS) {
+        auto &button_event = static_cast<ButtonPressEvent const &>(event);
+        if (button_event.button == 1 && button_event.num_press == 2) {
+            // Delete the checkpoint from the connector guide line
+            LPEConnectorLine::rewriteLine(cast<SPShape>(item), index, Geom::Point(), 0, DynamicNone, RewriteMode::Delete);
+            DocumentUndo::done(desktop->getDocument(), _("Delete connector checkpoint"), "");
+            tool()->selectionChange();
+            return true;
+        }
+    }
+    return false;
+}
+
+void ConnectorKnotCheckpoint::knot_click(unsigned int state)
+{
+    if (state & GDK_SHIFT_MASK) {
+        if (dir == Avoid::ConnDirHorz) {
+            dir = Avoid::ConnDirVert;
+        } else { // ConnDirVert or Avoid::ConnDirAll
+            dir = Avoid::ConnDirHorz;
+        }
+        // Remove dynamic from point
+        dynamic = DynamicNone;
+        // Update direction and dynamic
+        knot_set(knot_get(), Geom::Point(), GDK_SHIFT_MASK);
+    }
+}
+
+ConnectorKnotEnd::ConnectorKnotEnd(bool end)
+    : is_end(end)
+{}
+
+Geom::Point ConnectorKnotEnd::knot_get() const
+{
+    // Using the route_pathv here will confuse users putting center
+    // connections in the center of objects far from their visible lines
+    auto pathv = cast<SPShape>(item)->curve()->get_pathvector();
+    if (is_end) {
+        return pathv.finalPoint();
+    }
+    return pathv.initialPoint();
+}
+
+bool ConnectorKnotEnd::knot_event(Inkscape::CanvasEvent const &event)
+{
+    // This allows both click and drag re-connecting of lines.
+    if (event.type() == EventType::BUTTON_PRESS) {
+        auto &button_event = static_cast<ButtonPressEvent const &>(event);
+        if (button_event.button == 1 && button_event.num_press == 1) {
+            tool()->activateLine(cast<SPShape>(item), is_end);
+            return true;
+        }
+    }
+    // Fixed transparent point.
+    return tool()->root_handler(event);
+}
+
+/**
+ * ConnectorPointsKnotHolder is used when the mouse is hovering over an object, loading all
+ * the possible locations where the user may like to connect a line.
+ */
+ConnectorPointsKnotHolder::ConnectorPointsKnotHolder(SPDesktop *desktop, SPItem *item)
+    : KnotHolder(desktop, item)
+{
+    auto tool = dynamic_cast<ConnectorTool *>(desktop->getTool());
+
+    // Add 'center' knot which is always shown as activated unless one of the other nodes is active
+    if (item->bbox(Geom::identity(), SPItem::VISUAL_BBOX)) {
+        ConnectorKnotCenterPoint *point = new ConnectorKnotCenterPoint();
+        point->create(desktop, item, this, Inkscape::CANVAS_ITEM_CTRL_TYPE_CONNECT_ITEM, "point:center",
+                      _("Center of the object, connect lines to this object."));
+        entity.push_back(point);
+    }
+
+    // Add each defined point
+    for (auto &sp_point : item->getConnectionPoints()) {
+        // Find points that are already selected, so we avoid over-lapping knots
+        auto p = tool->selected_points;
+        if (std::find(p.begin(), p.end(), sp_point) != p.end()) {
+            continue;
+        }
+        ConnectorKnotSubPoint *point = new ConnectorKnotSubPoint(sp_point);
+        point->create(desktop, item, this, Inkscape::CANVAS_ITEM_CTRL_TYPE_CONNECT_POINT, "point:real",
+                      _("Connection point in object, connect lines to this point."), 0xffffff00);
+        entity.push_back(point);
+    }
+
+    for (auto &vt_point : item->getConnectionHints()) {
+        // Don't add virtual points for the existing points, avoiding overlapping knots.
+        bool exists = false;
+        for (auto &sp_point : item->getConnectionPoints()) {
+            if (sp_point->getOriginalPointName() == vt_point.first) {
+                exists = true;
+            }
+        }
+        if (!exists) {
+            ConnectorKnotVirtualPoint *point = new ConnectorKnotVirtualPoint(vt_point.first, vt_point.second);
+            point->create(desktop, item, this, Inkscape::CANVAS_ITEM_CTRL_TYPE_CONNECT_HINT, "point:hint",
+                          _("Possible connection point in object, connect lines to this point."), 0xffffff88);
+            entity.push_back(point);
+        }
+    }
+}
+
+/**
+ * This makes these nodes a "hover" item only, but otherwise transparent to the tool events.
+ */
+bool ConnectorPointKnot::knot_event(Inkscape::CanvasEvent const &event)
+{
+    if (event.type() != EventType::MOTION) {
+        return tool()->root_handler(event);
+    }
+    return false;
+}
+
+/**
+ * Center point is the knot which prepr' connecting to the whole object.
+ */
+Geom::Point ConnectorKnotCenterPoint::knot_get() const
+{
+    auto bbox = item->bbox(Geom::identity(), SPItem::VISUAL_BBOX);
+    g_assert(bbox);
+    return bbox->midpoint();
+}
+
+void ConnectorKnotCenterPoint::knot_enter(unsigned int state)
+{
+    tool()->highlightPoint(item);
+}
+
+/**
+ * A SubPoint is a sp-point which actually exists inside sp-item.
+ */
+ConnectorKnotSubPoint::ConnectorKnotSubPoint(SPPoint *sub_point)
+    : sub_point(sub_point)
+{}
+
+Geom::Point ConnectorKnotSubPoint::knot_get() const
+{
+    return *sub_point->itemPoint();
+}
+
+void ConnectorKnotSubPoint::knot_enter(unsigned int state)
+{
+    tool()->highlightPoint(item, sub_point);
+}
+
+/**
+ * A virtual point is a hint of where a point *might* like to be created on an object.
+ */
+ConnectorKnotVirtualPoint::ConnectorKnotVirtualPoint(std::string name, Geom::Point coord)
+    : name(std::move(name))
+    , coord(coord)
+{}
+
+Geom::Point ConnectorKnotVirtualPoint::knot_get() const
+{
+    return *SPPoint::getItemPoint(item, &coord);
+}
+
+void ConnectorKnotVirtualPoint::knot_enter(unsigned state)
+{
+    tool()->highlightPoint(item, name, coord);
+}
+
+} // namespace Inkscape::UI::Tools
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tools/connector-tool-knotholders.h b/src/ui/tools/connector-tool-knotholders.h
new file mode 100644
index 0000000000..524c6a5410
--- /dev/null
+++ b/src/ui/tools/connector-tool-knotholders.h
@@ -0,0 +1,180 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/** @file
+ * Inkscape::UI::Tools::
+ * This is a container class which contains a knotholder for connector shapes.
+ *
+ *//*
+ * Authors:
+ *   Martin Owens <doctormo@gmail.com>
+ *
+ * Copyright (C) 2021 Martin Owens
+ *
+ * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+ */
+#ifndef SEEN_CONNECTOR_TOOL_KNOTHOLDERS_H
+#define SEEN_CONNECTOR_TOOL_KNOTHOLDERS_H
+
+#include "desktop.h"
+#include "live_effects/lpe-connector-line.h"
+#include "object/sp-item.h"
+#include "ui/knot/knot-holder-entity.h"
+#include "ui/knot/knot-holder.h"
+#include "ui/tools/connector-tool.h"
+#include "ui/tools/tool-base.h"
+
+using Inkscape::LivePathEffect::LPEConnectorLine;
+
+namespace Inkscape {
+class CanvasEvent;
+
+namespace UI {
+namespace Tools {
+
+class ConnectorKnot : public KnotHolderEntity
+{
+public:
+    ConnectorTool *tool() { return dynamic_cast<ConnectorTool *>(desktop->getTool()); };
+};
+
+class ConnectorObjectKnotHolder : public KnotHolder
+{
+public:
+    ConnectorObjectKnotHolder(SPDesktop *desktop, SPItem *item);
+};
+
+class ConnectorKnotEditPoint : public ConnectorKnot
+{
+public:
+    ConnectorKnotEditPoint(SPPoint *sub_point);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned state) override;
+    void knot_ungrabbed(Geom::Point const &p, Geom::Point const &origin, unsigned state) override{};
+    bool knot_event(CanvasEvent const &event) override;
+
+private:
+    SPPoint *sub_point;
+};
+
+class ConnectorLineKnotHolder : public KnotHolder
+{
+public:
+    ConnectorLineKnotHolder(SPDesktop *desktop, SPItem *item);
+    ~ConnectorLineKnotHolder() override;
+
+    Geom::Path getNewRoutePath();
+    void updateAdvancedLine();
+    void commitAdvancedLine();
+
+    Geom::Path advanced_path;
+private:
+    Geom::Affine i2dt;
+    Geom::Point advanced_start;
+    Geom::Point advanced_end;
+    CanvasItemPtr<CanvasItemBpath> advanced_line;
+};
+
+class ConnectorKnotMidpoint : public ConnectorKnot
+{
+public:
+    ConnectorKnotMidpoint(int index);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned state) override;
+    void knot_ungrabbed(Geom::Point const &p, Geom::Point const &origin, unsigned state) override;
+    void knot_click(guint state) override {};
+
+private:
+    Geom::Point moveOneAxis(bool vert, Geom::Point origin, Geom::Point raw);
+    ConnectorLineKnotHolder *holder() const { return dynamic_cast<ConnectorLineKnotHolder *>(parent_holder); };
+    int _index;
+};
+
+class ConnectorKnotCheckpoint : public ConnectorKnot
+{
+public:
+    ConnectorKnotCheckpoint(int index, int dir, unsigned dynamic);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned state) override;
+    void knot_ungrabbed(Geom::Point const &p, Geom::Point const &origin, unsigned state) override{};
+    void knot_click(guint state) override;
+    bool knot_event(CanvasEvent const &event) override;
+
+private:
+    int index;
+    int dir;
+    unsigned dynamic;
+};
+
+class ConnectorKnotEnd : public ConnectorKnot
+{
+public:
+    ConnectorKnotEnd(bool end);
+    Geom::Point knot_get() const override;
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned state) override{};
+    void knot_ungrabbed(Geom::Point const &p, Geom::Point const &origin, unsigned state) override{};
+    bool knot_event(CanvasEvent const &event) override;
+
+private:
+    bool is_end;
+};
+
+class ConnectorPointsKnotHolder : public KnotHolder
+{
+public:
+    ConnectorPointsKnotHolder(SPDesktop *desktop, SPItem *item);
+};
+
+class ConnectorPointKnot : public ConnectorKnot
+{
+public:
+    void knot_set(Geom::Point const &p, Geom::Point const &origin, unsigned state) override{};
+    void knot_ungrabbed(Geom::Point const &p, Geom::Point const &origin, unsigned state) override{};
+    bool knot_event(CanvasEvent const &event) override;
+};
+
+class ConnectorKnotCenterPoint : public ConnectorPointKnot
+{
+public:
+    Geom::Point knot_get() const override;
+    void knot_enter(unsigned state) override;
+};
+
+class ConnectorKnotSubPoint : public ConnectorPointKnot
+{
+public:
+    ConnectorKnotSubPoint(SPPoint *sub_point);
+    Geom::Point knot_get() const override;
+    void knot_enter(unsigned state) override;
+
+private:
+    SPPoint *sub_point;
+};
+
+class ConnectorKnotVirtualPoint : public ConnectorPointKnot
+{
+public:
+    ConnectorKnotVirtualPoint(std::string point_name, Geom::Point coord);
+    Geom::Point knot_get() const override;
+    void knot_enter(unsigned state) override;
+    std::string const &getName() const { return name; };
+
+private:
+    std::string name;
+    Geom::Point coord;
+};
+
+} // namespace Tools
+} // namespace UI
+} // namespace Inkscape
+
+#endif // SEEN_CONNECTOR_TOOL_KNOTHOLDERS_H
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 1f8a40ddd5..6d02beaadb 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -3,1264 +3,810 @@
  * Connector creation tool
  *
  * Authors:
- *   Michael Wybrow <mjwybrow@users.sourceforge.net>
- *   Abhishek Sharma
- *   Jon A. Cruz <jon@joncruz.org>
  *   Martin Owens <doctormo@gmail.com>
  *
- * Copyright (C) 2005-2008  Michael Wybrow
- * Copyright (C) 2009  Monash University
- * Copyright (C) 2012  Authors
+ * Copyright (C) 2023 Martin Owens
  *
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  *
- * TODO:
- *  o  Show a visual indicator for objects with the 'avoid' property set.
- *  o  Allow user to change a object between a path and connector through
- *     the interface.
- *  o  Create an interface for setting markers (arrow heads).
- *  o  Better distinguish between paths and connectors to prevent problems
- *     in the node tool and paths accidentally being turned into connectors
- *     in the connector tool.  Perhaps have a way to convert between.
- *  o  Only call libavoid's updateEndPoint as required.  Currently we do it
- *     for both endpoints, even if only one is moving.
- *  o  Deal sanely with connectors with both endpoints attached to the
- *     same connection point, and drawing of connectors attaching
- *     overlapping shapes (currently tries to adjust connector to be
- *     outside both bounding boxes).
- *  o  Fix many special cases related to connectors updating,
- *     e.g., copying a couple of shapes and a connector that are
- *           attached to each other.
- *     e.g., detach connector when it is moved or transformed in
- *           one of the other contexts.
- *  o  Cope with shapes whose ids change when they have attached
- *     connectors.
- *  o  During dragging motion, gobble up to and use the final motion event.
- *     Gobbling away all duplicates after the current can occasionally result
- *     in the path lagging behind the mouse cursor if it is no longer being
- *     dragged.
- *  o  Fix up libavoid's representation after undo actions.  It doesn't see
- *     any transform signals and hence doesn't know shapes have moved back to
- *     there earlier positions.
- *
- * ----------------------------------------------------------------------------
- *
- * Notes:
- *
- *  Much of the way connectors work for user-defined points has been
- *  changed so that it no longer defines special attributes to record
- *  the points. Instead it uses single node paths to define points
- *  who are then separate objects that can be fixed on the canvas,
- *  grouped into objects and take full advantage of all transform, snap
- *  and align functionality of all other objects.
- *
- *     I think that the style change between polyline and orthogonal
- *     would be much clearer with two buttons (radio behaviour -- just
- *     one is true).
- *
- *     The other tools show a label change from "New:" to "Change:"
- *     depending on whether an object is selected.  We could consider
- *     this but there may not be space.
- *
- *     Likewise for the avoid/ignore shapes buttons.  These should be
- *     inactive when a shape is not selected in the connector context.
- *
  */
 
-#include "connector-tool.h"
+#include "ui/tools/connector-tool.h"
 
-#include <string>
 #include <cstring>
-
-#include <glibmm/i18n.h>
-#include <glibmm/stringutils.h>
 #include <gdk/gdkkeysyms.h>
+#include <string>
 
-#include "context-fns.h"
 #include "desktop-style.h"
-#include "desktop.h"
-#include "document-undo.h"
-#include "document.h"
-#include "message-context.h"
-#include "message-stack.h"
-#include "selection.h"
-#include "snap.h"
-
-#include "display/control/canvas-item-bpath.h"
-#include "display/control/canvas-item-ctrl.h"
 #include "display/curve.h"
-
-#include "3rdparty/adaptagrams/libavoid/router.h"
-
-#include "object/sp-conn-end.h"
-#include "object/sp-flowtext.h"
-#include "object/sp-namedview.h"
-#include "object/sp-path.h"
-#include "object/sp-text.h"
-#include "object/sp-use.h"
-
-#include "ui/icon-names.h"
-#include "ui/knot/knot.h"
-#include "ui/widget/canvas.h"  // Enter events hack
+#include "layer-manager.h"
+#include "live_effects/effect.h"
+#include "live_effects/lpeobject.h"
+#include "object/sp-root.h"
+#include "svg/svg.h"
+#include "ui/modifiers.h"
+#include "ui/shape-editor.h"
+#include "ui/toolbar/connector-toolbar.h"
+#include "ui/tools/connector-tool-knotholders.h"
 #include "ui/widget/events/canvas-event.h"
 
-#include "xml/node.h"
-
-#include "svg/svg.h"
+using namespace Inkscape::LivePathEffect;
+using Inkscape::Modifiers::Modifier;
 
 namespace Inkscape::UI::Tools {
 
-void CCToolShapeNodeObserver::notifyAttributeChanged(Inkscape::XML::Node &repr, GQuark name_, Util::ptr_shared, Util::ptr_shared)
+LPEConnectorLine *ConnectorTool::getLPE(SPShape *line)
 {
-    auto tool = static_cast<ConnectorTool*>(this);
-
-    auto const name = g_quark_to_string(name_);
-    // Look for changes that result in onscreen movement.
-    if (!strcmp(name, "d") || !strcmp(name, "x") || !strcmp(name, "y") ||
-        !strcmp(name, "width") || !strcmp(name, "height") ||
-        !strcmp(name, "transform")) {
-        if (&repr == tool->active_shape_repr) {
-            // Active shape has moved. Clear active shape.
-            tool->cc_clear_active_shape();
-        } else if (&repr == tool->active_conn_repr) {
-            // The active conn has been moved.
-            // Set it again, which just sets new handle positions.
-            tool->cc_set_active_conn(tool->active_conn);
-        }
-    }
+    return dynamic_cast<LPEConnectorLine *>(line->getCurrentLPE());
 }
 
-void CCToolLayerNodeObserver::notifyChildRemoved(Inkscape::XML::Node&, Inkscape::XML::Node &child, Inkscape::XML::Node*)
-{
-    auto tool = static_cast<ConnectorTool*>(this);
-
-    if (&child == tool->active_shape_repr) {
-        // The active shape has been deleted. Clear active shape.
-        tool->cc_clear_active_shape();
-    }
-}
-
-using Inkscape::DocumentUndo;
-
-static void cc_clear_active_knots(SPKnotList k);
-
-static void cc_select_handle(SPKnot* knot);
-static void cc_deselect_handle(SPKnot* knot);
-static bool cc_item_is_shape(SPItem *item);
-
-/*static Geom::Point connector_drag_origin_w(0, 0);
-static bool connector_within_tolerance = false;*/
-
 ConnectorTool::ConnectorTool(SPDesktop *desktop)
     : ToolBase(desktop, "/tools/connector", "connector.svg")
-    , state {SP_CONNECTOR_CONTEXT_IDLE}
 {
-    this->selection = desktop->getSelection();
-
-    this->sel_changed_connection.disconnect();
-    this->sel_changed_connection = this->selection->connectChanged(
-        sigc::mem_fun(*this, &ConnectorTool::_selectionChanged)
-    );
-
-    /* Create red bpath */
-    red_bpath = new Inkscape::CanvasItemBpath(desktop->getCanvasSketch());
-    red_bpath->set_stroke(red_color);
-    red_bpath->set_fill(0x0, SP_WIND_RULE_NONZERO);
-
-    /* Create red curve */
-    red_curve.emplace();
-
-    /* Create green curve */
-    green_curve.emplace();
-
-    // Notice the initial selection.
-    //cc_selection_changed(this->selection, (gpointer) this);
-    this->_selectionChanged(this->selection);
-
-    this->within_tolerance = false;
-
     sp_event_context_read(this, "curvature");
     sp_event_context_read(this, "orthogonal");
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (prefs->getBool("/tools/connector/selcue", false)) {
-        this->enableSelectionCue();
-    }
-
-    // Make sure we see all enter events for canvas items,
-    // even if a mouse button is depressed.
-    desktop->getCanvas()->set_all_enter_events(true);
+    sp_event_context_read(this, "jump-size");
+    sp_event_context_read(this, "jump-type");
+    sp_event_context_read(this, "spacing");
+    sp_event_context_read(this, "steps");
+
+    shape_editor = new ShapeEditor(desktop);
+
+    drawn_line = make_canvasitem<CanvasItemBpath>(desktop->getCanvasSketch());
+    drawn_line->set_stroke(0x0000ff7f); // blue
+    drawn_line->set_fill(0x0, SP_WIND_RULE_NONZERO);
+    drawn_line->set_visible(false);
+
+    // We'd like to be able to make the stroke line fatter, but canvas-item-rect is fixed width atm
+    highlight_a = make_canvasitem<CanvasItemRect>(desktop->getCanvasSketch());
+    highlight_a->set_stroke(0x00ff007f); // green
+    highlight_a->set_stroke_width(3);
+    highlight_a->set_fill(0x0);
+    highlight_a->set_visible(false);
+
+    highlight_b = make_canvasitem<CanvasItemRect>(desktop->getCanvasSketch());
+    highlight_b->set_stroke(0x0066667f); // cyan
+    highlight_b->set_stroke_width(3);
+    highlight_b->set_fill(0x0);
+    highlight_b->set_visible(false);
+
+    point_editing_rect = make_canvasitem<CanvasItemRect>(desktop->getCanvasSketch());
+    point_editing_rect->set_stroke(0xff33337f);
+    point_editing_rect->set_fill(0x0);
+    point_editing_rect->set_dashed(true);
+    point_editing_rect->set_visible(false);
+
+    tool_mode = CONNECTOR_LINE_MODE;
+    toolbar = dynamic_cast<Toolbar::ConnectorToolbar *>(desktop->get_toolbar_by_name("ConnectorToolbar"));
+    toolbar->_line_tool.set_active(true);
+
+    sel_changed_connection =
+        desktop->getSelection()->connectChanged(sigc::mem_fun(*this, &ConnectorTool::selectionChanged));
+    selectionChange();
 }
 
 ConnectorTool::~ConnectorTool()
 {
-    this->_finish();
-    this->state = SP_CONNECTOR_CONTEXT_IDLE;
-
-    if (this->selection) {
-        this->selection = nullptr;
-    }
-
-    this->cc_clear_active_shape();
-    this->cc_clear_active_conn();
-
-    // Restore the default event generating behaviour.
-    _desktop->getCanvas()->set_all_enter_events(false);
-
-    this->sel_changed_connection.disconnect();
-
-    for (auto &i : endpt_handle) {
-        if (i) {
-            SPKnot::unref(i);
-            i = nullptr;
+    if (hover_knots) {
+        delete hover_knots;
+        hover_knots = nullptr;
+    }
+
+    selectionClear();
+    deactivateLineDrawing();
+    last_route = Geom::PathVector();
+    drawn_line = nullptr;
+    highlight_a = nullptr;
+    highlight_b = nullptr;
+    point_editing_rect = nullptr;
+}
+
+void ConnectorTool::set(Inkscape::Preferences::Entry const &val)
+{
+    std::string select_name = val.getEntryName();
+    std::string select_value = val.getString();
+
+    if (val.getEntryName() == "curvature") {
+        curvature = val.getDoubleLimited();
+    } else if (val.getEntryName() == "orthogonal") {
+        conn_type = val.getBool() ? Avoid::ConnType_Orthogonal : Avoid::ConnType_PolyLine;
+        select_name = "line-type";
+        select_value = ConnectorType.get_key(conn_type);
+    } else if (val.getEntryName() == "jump-size") {
+        jump_size = val.getDoubleLimited();
+    } else if (val.getEntryName() == "jump-type") {
+        if (val.getBool()) {
+            jump_type = JumpMode::Arc;
+            select_value = "arc";
+        } else {
+            jump_type = JumpMode::Gap;
+            select_value = "gap";
+        }
+    } else if (val.getEntryName() == "spacing") {
+        spacing = val.getDoubleLimited();
+    } else if (val.getEntryName() == "steps") {
+        steps = val.getUInt();
+        select_name = "";
+    }
+    // Update selected lines.
+    if (!select_name.empty()) {
+        bool modified = false;
+        for (auto &line : selected_lines) {
+            auto repr = getLPE(line)->getRepr();
+            auto attr = repr->attribute(select_name.c_str());
+            if ((!attr) || select_value != attr) {
+                modified = true;
+                getLPE(line)->getRepr()->setAttribute(select_name, select_value);
+            }
         }
-    }
-
-    if (this->shref) {
-        g_free(this->shref);
-        this->shref = nullptr;
-    }
-
-    if (this->ehref) {
-        g_free(this->shref);
-        this->shref = nullptr;
-    }
-
-    g_assert(this->newConnRef == nullptr);
-}
-
-void ConnectorTool::set(const Inkscape::Preferences::Entry &val)
-{
-    /* fixme: Proper error handling for non-numeric data.  Use a locale-independent function like
-     * g_ascii_strtod (or a thin wrapper that does the right thing for invalid values inf/nan). */
-    Glib::ustring name = val.getEntryName();
-
-    if (name == "curvature") {
-        this->curvature = val.getDoubleLimited(); // prevents NaN and +/-Inf from messing up
-    } else if (name == "orthogonal") {
-        this->isOrthogonal = val.getBool();
-    }
-}
-
-//-----------------------------------------------------------------------------
-
-
-void ConnectorTool::cc_clear_active_shape()
-{
-    if (this->active_shape == nullptr) {
-        return;
-    }
-    g_assert( this->active_shape_repr );
-    g_assert( this->active_shape_layer_repr );
-
-    this->active_shape = nullptr;
-
-    if (this->active_shape_repr) {
-        this->active_shape_repr->removeObserver(shapeNodeObserver());
-        Inkscape::GC::release(this->active_shape_repr);
-        this->active_shape_repr = nullptr;
-
-        this->active_shape_layer_repr->removeObserver(layerNodeObserver());
-        Inkscape::GC::release(this->active_shape_layer_repr);
-        this->active_shape_layer_repr = nullptr;
-    }
-
-    cc_clear_active_knots(this->knots);
-}
-
-static void cc_clear_active_knots(SPKnotList k)
-{
-    // Hide the connection points if they exist.
-    if (k.size()) {
-        for (auto & it : k) {
-            it.first->hide();
+        if (modified) {
+            auto document = _desktop->getDocument();
+            DocumentUndo::maybeDone(document, "connect-setting", _("Change connector setting"), "");
         }
     }
 }
 
-void ConnectorTool::cc_clear_active_conn()
+/**
+ * Finds the shape at the given point, excluding Connector Lines.
+ */
+SPItem *ConnectorTool::findShapeAtPoint(Geom::Point w_point, bool ignore_lines)
 {
-    if (this->active_conn == nullptr) {
-        return;
-    }
-    g_assert( this->active_conn_repr );
-
-    this->active_conn = nullptr;
-
-    if (this->active_conn_repr) {
-        this->active_conn_repr->removeObserver(shapeNodeObserver());
-        Inkscape::GC::release(this->active_conn_repr);
-        this->active_conn_repr = nullptr;
-    }
-
-    // Hide the endpoint handles.
-    for (auto & i : this->endpt_handle) {
-        if (i) {
-            i->hide();
+    for (auto child : _desktop->getDocument()->getItemsAtPoints(_desktop->dkey, {w_point}, false, false)) {
+        if (!is<SPPoint>(child) && (!ignore_lines || !isConnector(child))) {
+            return child;
         }
     }
+    return nullptr;
 }
 
-
-bool ConnectorTool::_ptHandleTest(Geom::Point& p, gchar **href, gchar **subhref)
+/**
+ * Like findShapeAtPoint, but includes a distance from the point.
+ */
+SPItem *ConnectorTool::findShapeNearPoint(Geom::Point dt_point, int distance)
 {
-    if (this->active_handle && (this->knots.find(this->active_handle) != this->knots.end())) {
-        p = this->active_handle->pos;
-        *href = g_strdup_printf("#%s", this->active_handle->owner->getId());
-        if(this->active_handle->sub_owner) {
-            auto id = this->active_handle->sub_owner->getAttribute("id");
-            if(id) {
-                *subhref = g_strdup_printf("#%s", id);
-            }
-        } else {
-            *subhref = nullptr;
-        }
-        return true;
+    auto box = Geom::Rect(dt_point, dt_point);
+    box.expandBy(distance);
+    for (auto &child : _desktop->getDocument()->getItemsPartiallyInBox(_desktop->dkey, box)) {
+        return child;
     }
-    *href = nullptr;
-    *subhref = nullptr;
-    return false;
-}
-
-static void cc_select_handle(SPKnot* knot)
-{
-    knot->ctrl->set_selected(true);
-    knot->setSize(HandleSize::LARGE);
-    knot->setAnchor(SP_ANCHOR_CENTER);
-    knot->updateCtrl();
+    return nullptr;
 }
 
-static void cc_deselect_handle(SPKnot* knot)
+bool ConnectorTool::root_handler(CanvasEvent const &event)
 {
-    knot->ctrl->set_selected(false);
-    knot->setSize(HandleSize::NORMAL);
-    knot->setAnchor(SP_ANCHOR_CENTER);
-    knot->updateCtrl();
-}
+    bool const line_mode = tool_mode == CONNECTOR_LINE_MODE;
+    bool const point_mode = tool_mode == CONNECTOR_POINT_MODE;
 
-bool ConnectorTool::item_handler(SPItem *item, CanvasEvent const &event)
-{
     bool ret = false;
 
     inspect_event(event,
-    [&] (ButtonReleaseEvent const &event) {
-        if (event.button == 1) {
-            if ((this->state == SP_CONNECTOR_CONTEXT_DRAGGING) && this->within_tolerance) {
-                this->_resetColors();
-                this->state = SP_CONNECTOR_CONTEXT_IDLE;
-            }
+        [&] (ButtonPressEvent const &event) {
+            if (event.num_press == 1 && event.button == 1) {
+                if (line_mode) {
+                    ret = activateHoverPoint();
+                }
+            } else if (event.num_press == 2) {
+                if (line_mode) {
+                    // Attempt to add a new checkpoint with double click
+                    for (auto &line : selected_lines) {
+                        auto affine = line->i2dt_affine().inverse();
+                        if (addCheckpoint(line, _desktop->w2d(event.pos) * affine)) {
+                            ret = true;
+                            selectionChange();
+                            break;
+                        }
+                    }
+                    // Double click non-line object selects it.
+                    if (!ret) {
+                        if (auto item = findShapeAtPoint(event.pos)) {
+                            _desktop->getSelection()->set(item);
+                            deactivateLineDrawing();
+                            ret = true;
+                        }
+                    }
+                }
+                auto item = _desktop->getSelection()->singleItem();
+                if (point_mode && item) {
+                    auto affine = item->i2dt_affine().inverse();
+                    auto point = new Geom::Point(_desktop->w2d(event.pos) * affine);
+                    if (SPPoint::makePointAbsolute(item, point)) {
+                        selectionChange();
+                    }
+                    ret = true;
+                }
 
-            if (this->state != SP_CONNECTOR_CONTEXT_IDLE) {
-                // Doing something else like rerouting.
-                return;
             }
-
-            // find out clicked item, honoring Alt
-            auto const item = sp_event_context_find_item(_desktop, event.pos, event.modifiers & GDK_ALT_MASK, false);
-
-            if (event.modifiers & GDK_SHIFT_MASK) {
-                this->selection->toggle(item);
-            } else {
-                this->selection->set(item);
-                /* When selecting a new item, do not allow showing
-                   connection points on connectors. (yet?)
-                */
-
-                if (item != this->active_shape && !cc_item_is_connector(item)) {
-                    this->_setActiveShape(item);
+        },
+        [&] (ButtonReleaseEvent const &event) {
+            if (event.button == 1) {
+                if (point_mode || !hover_item) {
+                    if (auto item = findShapeNearPoint(_desktop->w2d(event.pos), 6.0)) {
+                        if (Modifier::get(Modifiers::Type::SELECT_ADD_TO)->active(event.modifiers)) {
+                            _desktop->getSelection()->add(item);
+                        } else {
+                            _desktop->getSelection()->set(item);
+                        }
+                    }
+                    ret = true;
+                } else if (line_mode) {
+                    ret = activateHoverPoint();
                 }
             }
-
-            ret = true;
-        }
-    },
-    [&] (MotionEvent const &event) {
-        auto const item = _desktop->getItemAtPoint(event.pos, false);
-        if (cc_item_is_shape(item)) {
-            _setActiveShape(item);
-        }
-    },
-    [&] (CanvasEvent const &event) {}
+        },
+        [&] (MotionEvent const &event) {
+            // Ignore middle-button scrolling
+            if (!(event.modifiers & (GDK_BUTTON2_MASK | GDK_BUTTON3_MASK))) {
+                auto point_dt = _desktop->w2d(event.pos);
+                auto point_doc = _desktop->dt2doc(point_dt);
+
+                auto const item = findShapeAtPoint(event.pos, true);
+
+                /// This removes the knotholder when item is nullptr too
+                if (hover_knots && hover_knots->getItem() != item) {
+                    // We're going to check that the mouse point is within the bounding box
+                    // for the old item, we don't change objects unless we stray outside
+                    auto bbox_doc = hover_knots->getItem()->documentVisualBounds();
+                    // Expand the bounding box to make it a little easier to hit nodes right on the edge
+                    if (bbox_doc) {
+                        bbox_doc->expandBy(3.0);
+                    }
+                    // Either we are over a new object (inside the old one) or we don't want to unhover.
+                    if (item || !(bbox_doc && bbox_doc->contains(point_doc))) {
+                        delete hover_knots;
+                        hover_knots = nullptr;
+                        unhighlightPoint();
+                    }
+                }
+                // Conversely only create one when the item is defined
+                if (line_mode && !hover_knots && item) {
+                    highlightPoint(item);
+                    hover_knots = new ConnectorPointsKnotHolder(_desktop, item);
+                }
+                if ((drawn_start || modify_line) && !hover_item) {
+                    // Free flowing line, usually not needed.
+                    moveDrawnLine(&point_dt);
+                }
+                // Update cursor
+                if (active_item || hover_item || modify_line) {
+                    set_cursor("connector.svg");
+                } else {
+                    set_cursor("select.svg");
+                }
+            }
+        },
+        [&] (KeyPressEvent const &event) {
+            switch (get_latin_keyval(event)) {
+                case GDK_KEY_Escape:
+                    if (drawn_start || modify_line) {
+                        deactivateLineDrawing();
+                        ret = true;
+                    }
+                    break;
+                default:
+                    break;
+            }
+        },
+        [&] (CanvasEvent const &event) {}
     );
 
-    return ret;
+    return ret || ToolBase::root_handler(event);
 }
 
-bool ConnectorTool::root_handler(CanvasEvent const &event)
+/**
+ * Deactivate any ongoing connection.
+ */
+void ConnectorTool::deactivateLineDrawing()
 {
-    bool ret = false;
+    // when drawing a new line, start point
+    active_item = nullptr;
+    active_point = nullptr;
+    active_hint_name = "";
+    active_hint_point = nullptr;
 
-    inspect_event(event,
-    [&] (ButtonPressEvent const &event) {
-        if (event.num_press == 1) {
-            ret = _handleButtonPress(event);
-        }
-    },
-    [&] (MotionEvent const &event) {
-        ret = _handleMotionNotify(event);
-    },
-    [&] (ButtonReleaseEvent const &event) {
-        ret = _handleButtonRelease(event);
-    },
-    [&] (KeyPressEvent const &event) {
-        ret = _handleKeyPress(get_latin_keyval(event));
-    },
-    [&] (CanvasEvent const &event) {}
-    );
+    // Hovering item for either new or reconnection
+    hover_item = nullptr;
+    hover_point = nullptr;
+    hover_hint_name = "";
+    hover_hint_point = nullptr;
 
-    return ret || ToolBase::root_handler(event);
+    // When modifying a line connection
+    modify_line = nullptr;
+    modify_end = false;
+
+    // Visual elements
+    drawn_start.reset();
+    drawn_line->set_visible(false);
+    highlight_a->set_visible(false);
+    highlight_b->set_visible(false);
+    point_editing_rect->set_visible(false);
 }
 
-bool ConnectorTool::_handleButtonPress(ButtonPressEvent const &bevent)
+/**
+ * Highlight the whole bounding box of the item or point, plus a few pixels.
+ *
+ * @param rect - The canvas rectangle to reshape
+ * @param item - The parent item the point belongs to
+ * @param point - (optional) The relative position in the parent of the highlight.
+ */
+void ConnectorTool::setHighlightArea(CanvasItemPtr<CanvasItemRect> &rect, SPItem *item, Geom::Point *point)
 {
-    Geom::Point const event_w = bevent.pos;
-    /* Find desktop coordinates */
-    Geom::Point p = _desktop->w2d(event_w);
+    g_assert(rect);
+    g_assert(item);
 
-    bool ret = false;
+    rect->set_visible(false);
+    auto bounds = item->desktopVisualBounds();
+    if (!bounds) {
+        return;
+    }
 
-    if (bevent.button == 1) {
-        if (Inkscape::have_viable_layer(_desktop, defaultMessageContext()) == false) {
-            return true;
+    // Default is highlight whole object
+    Geom::Rect box = *bounds;
+
+    // But then if we have a point to make, highlight that instead.
+    if (point) {
+        auto item_point = SPPoint::getItemPoint(item, point);
+        if (!item_point) {
+            return; // Show nothing.
         }
 
-        auto const event_w = bevent.pos;
+        // Adjust item units to _desktop units so they appear in the right places.
+        auto dt_point = *item_point * item->i2dt_affine();
+        box = Geom::Rect(dt_point, dt_point);
+        box.expandBy(4.0); // Must be even
+    }
 
-        saveDragOrigin(event_w);
+    // Grow end box slightly.
+    box.expandBy(3.0);
+    rect->set_rect(box);
+    rect->set_visible(true);
+}
 
-        Geom::Point const event_dt = _desktop->w2d(event_w);
+/**
+ * Called to re-draw the in-progress line with point being the furthest element.
+ */
+void ConnectorTool::moveDrawnLine(Geom::Point *drawn_end, Geom::Point *hover_sub_point)
+{
+    if (modify_line) {
+        return moveReconnectLine(drawn_end, hover_sub_point);
+    }
 
-        SnapManager &m = _desktop->getNamedView()->snap_manager;
+    if (!drawn_start || !drawn_end || *drawn_end == *drawn_start) {
+        return;
+    }
 
-        switch (this->state) {
-        case SP_CONNECTOR_CONTEXT_STOP:
+    auto router = _desktop->getDocument()->getRouter();
+    auto document = _desktop->getDocument();
+    auto i2dt = document->getRoot()->i2dt_affine();
 
-            /* This is allowed, if we just canceled curve */
-        case SP_CONNECTOR_CONTEXT_IDLE:
-        {
-            if ( this->npoints == 0 ) {
-                this->cc_clear_active_conn();
+    // Put _desktop path into document for routing
+    auto pathv = drawSimpleLine(*drawn_end) * i2dt.inverse();
 
-                _desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Creating new connector"));
+    // Get a sub point from whatever is active to feed to drawn router
+    Geom::Point *active_sub_point = nullptr;
+    if (active_item) {
+        if (active_point) {
+            active_sub_point = active_point->parentPoint();
+        } else if (active_hint_point) {
+            active_sub_point = active_hint_point;
+        } else {
+            active_sub_point = new Geom::Point(0.5, 0.5);
+        }
+    }
 
-                /* Set start anchor */
-                /* Create green anchor */
-                Geom::Point p = event_dt;
+    // Create a routed line so the user can see what this line would look like
+    // Even though start and end are correct, the routing depends on the bounding box
+    // so we still need to feed in the prospective objects we're connecting to.
+    last_route =
+        LPEConnectorLine::generate_path(pathv, router, document->getRoot(), active_item, active_sub_point, hover_item,
+                                        hover_sub_point, conn_type, curvature);
 
-                // Test whether we clicked on a connection point
-                bool found = this->_ptHandleTest(p, &this->shref, &this->sub_shref);
+    // Now routng is done, put new path back into _desktop path for display
+    drawn_line->set_bpath(last_route * i2dt, true);
+    drawn_line->set_visible(true);
+}
 
-                if (!found) {
-                    // This is the first point, so just snap it to the grid
-                    // as there's no other points to go off.
-                    m.setup(_desktop);
-                    m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-                    m.unSetup();
-                }
-                this->_setInitialPoint(p);
+void ConnectorTool::moveReconnectLine(Geom::Point *point, Geom::Point *hover_sub_point)
+{
+    auto document = _desktop->getDocument();
+    auto router = document->getRouter();
 
-            }
-            this->state = SP_CONNECTOR_CONTEXT_DRAGGING;
-            ret = true;
-            break;
-        }
-        case SP_CONNECTOR_CONTEXT_DRAGGING:
-        {
-            // This is the second click of a connector creation.
-            m.setup(_desktop);
-            m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-            m.unSetup();
-
-            this->_setSubsequentPoint(p);
-            this->_finishSegment(p);
-
-            this->_ptHandleTest(p, &this->ehref, &this->sub_ehref);
-            if (this->npoints != 0) {
-                this->_finish();
-            }
-            this->cc_set_active_conn(this->newconn);
-            this->state = SP_CONNECTOR_CONTEXT_IDLE;
-            ret = true;
-            break;
-        }
-        case SP_CONNECTOR_CONTEXT_CLOSE:
-        {
-            g_warning("Button down in CLOSE state");
-            break;
-        }
-        default:
-            break;
-        }
-    } else if (bevent.button == 3) {
-        if (this->state == SP_CONNECTOR_CONTEXT_REROUTING) {
-            // A context menu is going to be triggered here,
-            // so end the rerouting operation.
-            this->_reroutingFinish(&p);
-
-            this->state = SP_CONNECTOR_CONTEXT_IDLE;
-
-            // Don't set ret to TRUE, so we drop through to the
-            // parent handler which will open the context menu.
-        } else if (this->npoints != 0) {
-            this->_finish();
-            this->state = SP_CONNECTOR_CONTEXT_IDLE;
-            ret = true;
+    // Get original pathv from item.
+    auto pathv = modify_line->curveForEdit()->get_pathvector();
+    auto i2dt = modify_line->i2dt_affine();
+
+    auto lpe_effect = getLPE(modify_line);
+    auto static_item = modify_end ? lpe_effect->getConnStart() : lpe_effect->getConnEnd();
+    Geom::Point *static_sub_point = nullptr;
+
+    if (static_item) {
+        if (auto static_point = cast<SPPoint>(static_item)) {
+            static_sub_point = static_point->parentPoint();
+            static_item = cast<SPItem>(static_point->parent);
+        } else {
+            static_sub_point = new Geom::Point(0.5, 0.5);
         }
     }
 
-    return ret;
+    // Reposition one end of the path
+    // XXX We may want to reset the initial and final curves to remove directionality.
+    if (modify_end) {
+        pathv[0].setFinal(*point * i2dt.inverse());
+        pathv = LPEConnectorLine::generate_path(pathv, router, document->getRoot(), static_item, static_sub_point,
+                                                hover_item, hover_sub_point, lpe_effect->getConnType(),
+                                                lpe_effect->getCurvature());
+
+    } else {
+        pathv[0].setInitial(*point * i2dt.inverse());
+        pathv = LPEConnectorLine::generate_path(pathv, router, document->getRoot(), hover_item, hover_sub_point,
+                                                static_item, static_sub_point, lpe_effect->getConnType(),
+                                                lpe_effect->getCurvature());
+    }
+
+    // Don't store pathv, it's not a clean route.
+    last_route = Geom::PathVector();
+    // Show the routed path on the screen for the user to review as they draw.
+    drawn_line->set_bpath(pathv * i2dt, true);
+    drawn_line->set_visible(true);
 }
 
-bool ConnectorTool::_handleMotionNotify(MotionEvent const &mevent)
+/**
+ * Calculate a simple vector between the active start and the given end.
+ */
+Geom::PathVector ConnectorTool::drawSimpleLine(Geom::Point drawn_end)
 {
-    bool ret = false;
+    g_assert(drawn_start);
+    // Draw a basic three part line.
+    Geom::PathVector pathv;
+    pathv.push_back(Geom::Path(*drawn_start));
+    for (int i = 0; i < steps; ++i) {
+        double time = (1.0 / (steps + 1)) * (i + 1);
+        pathv.back().appendNew<Geom::LineSegment>(Geom::lerp(time, *drawn_start, drawn_end));
+    }
+    pathv.back().appendNew<Geom::LineSegment>(drawn_end);
+    return pathv;
+}
 
-    if (mevent.modifiers & (GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) {
-        // allow middle-button scrolling
-        return false;
+/**
+ * Called when we're completing the drawing of the line.
+ */
+void ConnectorTool::finishDrawnLine(SPItem *end_item, SPPoint *end_point)
+{
+    if (modify_line) {
+        return finishReconnectLine(end_item, end_point);
     }
 
-    auto const event_w = mevent.pos;
+    auto document = _desktop->getDocument();
 
-    if (!checkDragMoved(event_w)) {
-        return false;
+    // If the active point is virtual, create it.
+    if (active_hint_point) {
+        active_point = SPPoint::makePointRelative(active_item, active_hint_point, active_hint_name);
     }
 
-    // Find desktop coordinates.
-    Geom::Point p = _desktop->w2d(event_w);
-
-    SnapManager &m = _desktop->getNamedView()->snap_manager;
-
-    switch (this->state) {
-    case SP_CONNECTOR_CONTEXT_DRAGGING:
-    {
-        gobble_motion_events(mevent.modifiers);
-        // This is movement during a connector creation.
-        if ( this->npoints > 0 ) {
-            m.setup(_desktop);
-            m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-            m.unSetup();
-            this->selection->clear();
-            this->_setSubsequentPoint(p);
-            ret = true;
-        }
-        break;
+    // Set start point to itself if no SPPoint selected.
+    SPItem *conn_start = active_item;
+    if (active_point) {
+        conn_start = active_point;
     }
-    case SP_CONNECTOR_CONTEXT_REROUTING:
-    {
-        gobble_motion_events(GDK_BUTTON1_MASK);
-        g_assert(is<SPPath>(clickeditem));
-
-        m.setup(_desktop);
-        m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-        m.unSetup();
-
-        // Update the hidden path
-        auto i2d = clickeditem->i2dt_affine();
-        auto d2i = i2d.inverse();
-        auto path = cast<SPPath>(clickeditem);
-        auto curve = *path->curve();
-        if (clickedhandle == endpt_handle[0]) {
-            auto o = endpt_handle[1]->pos;
-            curve.stretch_endpoints(p * d2i, o * d2i);
-        } else {
-            auto o = endpt_handle[0]->pos;
-            curve.stretch_endpoints(o * d2i, p * d2i);
-        }
-        path->setCurve(std::move(curve));
-        sp_conn_reroute_path_immediate(path);
-
-        // Copy this to the temporary visible path
-        red_curve = path->curveForEdit()->transformed(i2d);
-        red_bpath->set_bpath(&*red_curve);
-
-        ret = true;
-        break;
+    // Start point should already be calculated, just need to calculate the end point
+    SPItem *conn_end = end_item;
+    Geom::Point *end_parent_point = new Geom::Point(0.5, 0.5);
+    if (end_point) {
+        conn_end = end_point;
+        end_parent_point = end_point->parentPoint();
     }
-    case SP_CONNECTOR_CONTEXT_STOP:
-        /* This is perfectly valid */
-        break;
-    default:
-        if (!this->sp_event_context_knot_mouseover()) {
-            m.setup(_desktop);
-            m.preSnap(Inkscape::SnapCandidatePoint(p, Inkscape::SNAPSOURCE_OTHER_HANDLE));
-            m.unSetup();
-        }
-        break;
+    if (conn_start == conn_end) {
+        // Refuse to make a connection between itself
+        return;
     }
-    return ret;
-}
 
-bool ConnectorTool::_handleButtonRelease(ButtonReleaseEvent const &revent)
-{
-    bool ret = false;
+    auto pt_point = SPPoint::getItemPoint(end_item, end_parent_point);
 
-    if (revent.button == 1) {
-        SPDocument *doc = _desktop->getDocument();
-        SnapManager &m = _desktop->getNamedView()->snap_manager;
+    Inkscape::XML::Node *repr = document->getReprDoc()->createElement("svg:path");
+    sp_desktop_apply_style_tool(_desktop, repr, "/tools/connector", false);
 
-        auto const event_w = revent.pos;
+    // Add it so we can adjust the affine
+    auto new_line = cast<SPItem>(_desktop->layerManager().currentLayer()->appendChildRepr(repr));
 
-        // Find desktop coordinates.
-        Geom::Point p = _desktop->w2d(event_w);
+    // Start is in _desktop units, so convert for easier calculation.
+    auto pathv = drawSimpleLine(*pt_point * end_item->i2dt_affine()) * new_line->i2dt_affine().inverse();
 
-        switch (this->state) {
-        //case SP_CONNECTOR_CONTEXT_POINT:
-        case SP_CONNECTOR_CONTEXT_DRAGGING:
-        {
-            m.setup(_desktop);
-            m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-            m.unSetup();
+    // Add in any directionality and automatic adjustment instructions
+    if (!last_route.empty()) {
+        for (int i = 1; i < pathv[0].size(); i++) {
+            auto dir = LPEConnectorLine::detectCheckpointOrientation(last_route[0], pathv[0].nodes()[i]);
 
-            if (this->within_tolerance) {
-                this->_finishSegment(p);
-                return true;
+            int dynamic = DynamicNone;
+            if (dir & Avoid::ConnDirVert) {
+                dynamic += DynamicY;
             }
-            // Connector has been created via a drag, end it now.
-            this->_setSubsequentPoint(p);
-            this->_finishSegment(p);
-            // Test whether we clicked on a connection point
-            this->_ptHandleTest(p, &this->ehref, &this->sub_ehref);
-            if (this->npoints != 0) {
-                this->_finish();
+            if (dir & Avoid::ConnDirHorz) {
+                dynamic += DynamicX;
             }
-            this->cc_set_active_conn(this->newconn);
-            this->state = SP_CONNECTOR_CONTEXT_IDLE;
-            break;
+            pathv = LPEConnectorLine::rewriteLine(pathv[0], i, pathv[0].nodes()[i], dir, dynamic);
         }
-        case SP_CONNECTOR_CONTEXT_REROUTING:
-        {
-            m.setup(_desktop);
-            m.freeSnapReturnByRef(p, Inkscape::SNAPSOURCE_OTHER_HANDLE);
-            m.unSetup();
-            this->_reroutingFinish(&p);
-
-            doc->ensureUpToDate();
-            this->state = SP_CONNECTOR_CONTEXT_IDLE;
-            return true;
-            break;
-        }
-        case SP_CONNECTOR_CONTEXT_STOP:
-            /* This is allowed, if we just cancelled curve */
-            break;
-        default:
-            break;
-        }
-        ret = true;
     }
-    return ret;
+
+    repr->setAttribute("d", sp_svg_write_path(pathv));
+    Inkscape::GC::release(repr);
+
+    auto lpe_repr = LivePathEffect::Effect::createEffect("connector_line", document);
+    LivePathEffect::Effect::applyEffect(lpe_repr, new_line);
+    lpe_repr->setAttribute("connection-start", g_strdup_printf("#%s", conn_start->getId()));
+    lpe_repr->setAttribute("connection-end", g_strdup_printf("#%s", conn_end->getId()));
+    lpe_repr->setAttribute("line-type", ConnectorType.get_key(conn_type).c_str());
+    lpe_repr->setAttribute("jump-type", jump_type == JumpMode::Arc ? "arc" : "gap");
+    lpe_repr->setAttributeSvgDouble("jump-size", jump_size);
+    lpe_repr->setAttributeSvgDouble("spacing", spacing);
+    lpe_repr->setAttributeSvgDouble("curvature", curvature);
+    Inkscape::GC::release(lpe_repr);
+
+    deactivateLineDrawing();
+    DocumentUndo::maybeDone(document, "connect-line", _("Draw connector line"), "");
+    _desktop->getSelection()->set(new_line);
 }
 
-bool ConnectorTool::_handleKeyPress(guint const keyval)
+void ConnectorTool::finishReconnectLine(SPItem *end_item, SPPoint *end_point)
 {
-    bool ret = false;
+    auto document = _desktop->getDocument();
+    auto lpe_repr = getLPE(modify_line)->getRepr();
 
-    switch (keyval) {
-    case GDK_KEY_Return:
-    case GDK_KEY_KP_Enter:
-        if (this->npoints != 0) {
-            this->_finish();
-            this->state = SP_CONNECTOR_CONTEXT_IDLE;
-            ret = true;
-        }
-        break;
-    case GDK_KEY_Escape:
-        if (this->state == SP_CONNECTOR_CONTEXT_REROUTING) {
-            SPDocument *doc = _desktop->getDocument();
-
-            this->_reroutingFinish(nullptr);
-
-            DocumentUndo::undo(doc);
-
-            this->state = SP_CONNECTOR_CONTEXT_IDLE;
-            _desktop->messageStack()->flash( Inkscape::NORMAL_MESSAGE,
-                    _("Connector endpoint drag cancelled."));
-            ret = true;
-        } else if (this->npoints != 0) {
-            // if drawing, cancel, otherwise pass it up for deselecting
-            this->state = SP_CONNECTOR_CONTEXT_STOP;
-            this->_resetColors();
-            ret = true;
-        }
-        break;
-    default:
-        break;
+    auto conn = end_point ? end_point : end_item;
+    if (modify_end) {
+        lpe_repr->setAttribute("connection-end", g_strdup_printf("#%s", conn->getId()));
+    } else {
+        lpe_repr->setAttribute("connection-start", g_strdup_printf("#%s", conn->getId()));
     }
-    return ret;
+
+    deactivateLineDrawing();
+    DocumentUndo::maybeDone(document, "reconnect-line", _("Reconnect line"), "");
+    selectionChange();
 }
 
-void ConnectorTool::_reroutingFinish(Geom::Point *const p)
+/**
+ * Highlight the given item or sub-point with a box.
+ */
+void ConnectorTool::highlightPoint(SPItem *item, SPPoint *sp_point)
 {
-    SPDocument *doc = _desktop->getDocument();
-
-    // Clear the temporary path:
-    this->red_curve->reset();
-    red_bpath->set_bpath(nullptr);
-
-    if (p != nullptr) {
-        // Test whether we clicked on a connection point
-        gchar *shape_label;
-        gchar *sub_label;
-        bool found = this->_ptHandleTest(*p, &shape_label, &sub_label);
-
-        if (found) {
-            if (this->clickedhandle == this->endpt_handle[0]) {
-                this->clickeditem->setAttribute("inkscape:connection-start", shape_label);
-                this->clickeditem->setAttribute("inkscape:connection-start-point", sub_label);
-            } else {
-                this->clickeditem->setAttribute("inkscape:connection-end", shape_label);
-                this->clickeditem->setAttribute("inkscape:connection-end-point", sub_label);
-            }
-            g_free(shape_label);
-            if(sub_label) {
-                g_free(sub_label);
-            }
-        }
+    // This produces a snapping like effect in the drawn line.
+    auto parent_point = sp_point ? sp_point->parentPoint() : new Geom::Point(0.5, 0.5);
+
+    hover_item = item;
+    hover_point = sp_point;
+    hover_hint_name = "";
+    hover_hint_point = nullptr;
+
+    setHighlightArea(highlight_b, item, sp_point ? parent_point : nullptr);
+    if (active_item || modify_line) {
+        auto point = SPPoint::getItemPoint(hover_item, parent_point);
+        auto drawn_end = new Geom::Point(*point * hover_item->i2dt_affine());
+        moveDrawnLine(drawn_end, parent_point);
     }
-    this->clickeditem->setHidden(false);
-    sp_conn_reroute_path_immediate(cast<SPPath>(this->clickeditem));
-    this->clickeditem->updateRepr();
-    DocumentUndo::done(doc, _("Reroute connector"), INKSCAPE_ICON("draw-connector"));
-    this->cc_set_active_conn(this->clickeditem);
 }
 
-
-void ConnectorTool::_resetColors()
+void ConnectorTool::highlightPoint(SPItem *item, std::string name, Geom::Point parent_point)
 {
-    /* Red */
-    this->red_curve->reset();
-    red_bpath->set_bpath(nullptr);
+    hover_item = item;
+    hover_point = nullptr;
+    hover_hint_name = name;
+    hover_hint_point = new Geom::Point(parent_point);
 
-    this->green_curve->reset();
-    this->npoints = 0;
+    setHighlightArea(highlight_b, item, &parent_point);
+    if (active_item || modify_line) {
+        auto point = SPPoint::getItemPoint(hover_item, hover_hint_point);
+        auto drawn_end = new Geom::Point(*point * hover_item->i2dt_affine());
+        moveDrawnLine(drawn_end, hover_hint_point);
+    }
 }
 
-void ConnectorTool::_setInitialPoint(Geom::Point const p)
+void ConnectorTool::unhighlightPoint()
 {
-    g_assert( this->npoints == 0 );
-
-    this->p[0] = p;
-    this->p[1] = p;
-    this->npoints = 2;
-    red_bpath->set_bpath(nullptr);
+    highlight_b->set_visible(false);
+    hover_item = nullptr;
 }
 
-void ConnectorTool::_setSubsequentPoint(Geom::Point const p)
+/**
+ * Activate (start or end line) at the current hover location.
+ */
+bool ConnectorTool::activateHoverPoint()
 {
-    g_assert( this->npoints != 0 );
-
-    Geom::Point o = _desktop->dt2doc(this->p[0]);
-    Geom::Point d = _desktop->dt2doc(p);
-    Avoid::Point src(o[Geom::X], o[Geom::Y]);
-    Avoid::Point dst(d[Geom::X], d[Geom::Y]);
-
-    if (!this->newConnRef) {
-        Avoid::Router *router = _desktop->getDocument()->getRouter();
-        this->newConnRef = new Avoid::ConnRef(router);
-        this->newConnRef->setEndpoint(Avoid::VertID::src, src);
-        if (this->isOrthogonal) {
-            this->newConnRef->setRoutingType(Avoid::ConnType_Orthogonal);
+    if (hover_item && hover_item != active_item) {
+        if (hover_hint_point) {
+            activatePoint(hover_item, hover_hint_name, *hover_hint_point);
         } else {
-            this->newConnRef->setRoutingType(Avoid::ConnType_PolyLine);
+            activatePoint(hover_item, hover_point);
         }
+        return true;
     }
-    // Set new endpoint.
-    this->newConnRef->setEndpoint(Avoid::VertID::tar, dst);
-    // Immediately generate new routes for connector.
-    this->newConnRef->makePathInvalid();
-    this->newConnRef->router()->processTransaction();
-    // Recreate curve from libavoid route.
-    red_curve = SPConnEndPair::createCurve(newConnRef, curvature);
-    red_curve->transform(_desktop->doc2dt());
-    red_bpath->set_bpath(&*red_curve, true);
+    return false;
 }
 
-
 /**
- * Concats red, blue and green.
- * If any anchors are defined, process these, optionally removing curves from white list
- * Invoke _flush_white to write result back to object.
+ * Called when an object's sub-node is clicked on (only from knots)
  */
-void ConnectorTool::_concatColorsAndFlush()
+void ConnectorTool::activatePoint(SPItem *item, SPPoint *sp_point)
 {
-    auto c = std::make_optional<SPCurve>();
-    std::swap(c, green_curve);
-
-    red_curve->reset();
-    red_bpath->set_bpath(nullptr);
-
-    if (c->is_empty()) {
-        return;
+    if (active_item || modify_line) {
+        return finishDrawnLine(item, sp_point);
     }
 
-    _flushWhite(&*c);
+    auto parent_point = sp_point ? sp_point->parentPoint() : new Geom::Point(0.5, 0.5);
+    active_item = item;
+    active_point = sp_point;
+    setHighlightArea(highlight_a, item, parent_point);
+    auto point = SPPoint::getItemPoint(item, parent_point);
+    drawn_start = *point * active_item->i2dt_affine();;
 }
 
-
-/*
- * Flushes white curve(s) and additional curve into object
- *
- * No cleaning of colored curves - this has to be done by caller
- * No rereading of white data, so if you cannot rely on ::modified, do it in caller
- *
+/**
+ * Called when an object's virtual sub-node is clicked on (only from knot)
  */
-
-void ConnectorTool::_flushWhite(SPCurve *c)
+void ConnectorTool::activatePoint(SPItem *item, std::string name, Geom::Point parent_point)
 {
-    /* Now we have to go back to item coordinates at last */
-    c->transform(_desktop->dt2doc());
-
-    SPDocument *doc = _desktop->getDocument();
-    Inkscape::XML::Document *xml_doc = doc->getReprDoc();
-
-    if ( !c->is_empty() ) {
-        /* We actually have something to write */
-
-        Inkscape::XML::Node *repr = xml_doc->createElement("svg:path");
-        /* Set style */
-        sp_desktop_apply_style_tool(_desktop, repr, "/tools/connector", false);
-
-        repr->setAttribute("d", sp_svg_write_path(c->get_pathvector()));
-
-        /* Attach repr */
-        auto layer = currentLayer();
-        this->newconn = cast<SPItem>(layer->appendChildRepr(repr));
-        this->newconn->transform = layer->i2doc_affine().inverse();
-
-        bool connection = false;
-        this->newconn->setAttribute( "inkscape:connector-type",
-                                   this->isOrthogonal ? "orthogonal" : "polyline");
-        this->newconn->setAttribute( "inkscape:connector-curvature",
-                                   Glib::Ascii::dtostr(this->curvature).c_str());
-        if (this->shref) {
-            connection = true;
-            this->newconn->setAttribute( "inkscape:connection-start", this->shref);
-            if(this->sub_shref) {
-                this->newconn->setAttribute( "inkscape:connection-start-point", this->sub_shref);
-            }
-        }
-
-        if (this->ehref) {
-            connection = true;
-            this->newconn->setAttribute( "inkscape:connection-end", this->ehref);
-            if(this->sub_ehref) {
-                this->newconn->setAttribute( "inkscape:connection-end-point", this->sub_ehref);
-            }
-        }
-        // Process pending updates.
-        this->newconn->updateRepr();
-        doc->ensureUpToDate();
-
-        if (connection) {
-            // Adjust endpoints to shape edge.
-            sp_conn_reroute_path_immediate(cast<SPPath>(this->newconn));
-            this->newconn->updateRepr();
-        }
-
-        this->newconn->doWriteTransform(this->newconn->transform, nullptr, true);
-
-        // Only set the selection after we are finished with creating the attributes of
-        // the connector.  Otherwise, the selection change may alter the defaults for
-        // values like curvature in the connector context, preventing subsequent lookup
-        // of their original values.
-        this->selection->set(repr);
-        Inkscape::GC::release(repr);
+    if (active_item || modify_line) {
+        // Create new hint point and finish the drawn line with it.
+        return finishDrawnLine(item, SPPoint::makePointRelative(item, &parent_point, name));
     }
 
-    DocumentUndo::done(doc, _("Create connector"), INKSCAPE_ICON("draw-connector"));
+    active_item = item;
+    active_hint_name = name;
+    active_hint_point = new Geom::Point(parent_point);
+    setHighlightArea(highlight_a, item, &parent_point);
+    auto point = SPPoint::getItemPoint(item, &parent_point);
+    drawn_start = *point * active_item->i2dt_affine();;
 }
 
-
-void ConnectorTool::_finishSegment(Geom::Point const /*p*/)
+/**
+ * Active the line-end for reconnection, see moveReconnectLine.
+ */
+void ConnectorTool::activateLine(SPShape *line, bool is_end)
 {
-    if (!this->red_curve->is_empty()) {
-        green_curve->append_continuous(*red_curve);
-
-        this->p[0] = this->p[3];
-        this->p[1] = this->p[4];
-        this->npoints = 2;
-
-        this->red_curve->reset();
-    }
+    // deactivate ensures we're not doing something else.
+    deactivateLineDrawing();
+    modify_end = is_end;
+    modify_line = line;
 }
 
-void ConnectorTool::_finish()
+/**
+ * Clear the selection and reset all vars.
+ */
+void ConnectorTool::selectionClear()
 {
-    _desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Finishing connector"));
-
-    this->red_curve->reset();
-    this->_concatColorsAndFlush();
-
-    this->npoints = 0;
-
-    if (this->newConnRef) {
-        this->newConnRef->router()->deleteConnector(this->newConnRef);
-        this->newConnRef = nullptr;
+    if (point_editing_holder) {
+        delete point_editing_holder;
+        point_editing_holder = nullptr;
+        point_editing_rect->set_visible(false);
     }
+    for (auto line_knots : selected_line_holders) {
+        delete line_knots;
+    }
+    selected_line_holders.clear();
+    selected_points.clear();
+    selected_lines.clear();
 }
 
-
-static bool cc_generic_knot_handler(CanvasEvent const &event, SPKnot *knot)
+void ConnectorTool::setToolMode(int mode)
 {
-    g_assert(knot);
-
-    SPKnot::ref(knot);
-
-    auto cc = SP_CONNECTOR_CONTEXT(knot->desktop->getTool());
-
-    bool consumed = false;
-
-    inspect_event(event,
-    [&] (EnterEvent const &event) {
-        knot->setFlag(SP_KNOT_MOUSEOVER, true);
-
-        cc->active_handle = knot;
-        knot->desktop->getTool()->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, _("Click to join at this point"));
-
-        consumed = true;
-    },
-    [&] (LeaveEvent const &event) {
-        knot->setFlag(SP_KNOT_MOUSEOVER, false);
-
-        /* FIXME: the following test is a workaround for LP Bug #1273510.
-         * It seems that a signal is not correctly disconnected, maybe
-         * something missing in cc_clear_active_conn()? */
-        if (cc) {
-            cc->active_handle = nullptr;
-        }
-
-        knot->desktop->getTool()->defaultMessageContext()->clear();
-
-        consumed = true;
-    },
-    [&] (CanvasEvent const &event) {}
-    );
-
-    SPKnot::unref(knot);
-
-    return consumed;
+    tool_mode = mode;
+    deactivateLineDrawing();
+    selectionChange();
 }
 
-static bool endpt_handler(CanvasEvent const &event, ConnectorTool *cc)
+void ConnectorTool::selectionChange()
 {
-    bool consumed = false;
-
-    inspect_event(event,
-    [&] (ButtonPressEvent const &event) {
-        g_assert( (cc->active_handle == cc->endpt_handle[0]) ||
-                  (cc->active_handle == cc->endpt_handle[1]) );
-        if (cc->state == SP_CONNECTOR_CONTEXT_IDLE) {
-            cc->clickeditem = cc->active_conn;
-            cc->clickedhandle = cc->active_handle;
-            cc->cc_clear_active_conn();
-            cc->state = SP_CONNECTOR_CONTEXT_REROUTING;
-
-            // Disconnect from attached shape
-            unsigned ind = (cc->active_handle == cc->endpt_handle[0]) ? 0 : 1;
-            sp_conn_end_detach(cc->clickeditem, ind);
-
-            Geom::Point origin;
-            if (cc->clickedhandle == cc->endpt_handle[0]) {
-                origin = cc->endpt_handle[1]->pos;
-            } else {
-                origin = cc->endpt_handle[0]->pos;
-            }
-
-            // Show the red path for dragging.
-            auto path = static_cast<SPPath const *>(cc->clickeditem);
-            cc->red_curve = path->curveForEdit()->transformed(cc->clickeditem->i2dt_affine());
-            cc->red_bpath->set_bpath(&*cc->red_curve, true);
-
-            cc->clickeditem->setHidden(true);
-
-            // The rest of the interaction rerouting the connector is
-            // handled by the context root handler.
-            consumed = true;
-        }
-    },
-    [&] (CanvasEvent const &event) {}
-    );
-
-    return consumed;
+    selectionChanged(_desktop->getSelection());
 }
 
-void ConnectorTool::_activeShapeAddKnot(SPItem* item, SPItem* subitem)
+/**
+ * Set the selected items, selecting connected lines where possible.
+ */
+void ConnectorTool::selectionChanged(Inkscape::Selection *selection)
 {
-    SPKnot *knot = new SPKnot(_desktop, "", Inkscape::CANVAS_ITEM_CTRL_TYPE_SHAPER, "CanvasItemCtrl:ConnectorTool:Shape");
-    knot->owner = item;
-
-    if (subitem) {
-        auto use = cast<SPUse>(item);
-        g_assert(use != nullptr);
-        knot->sub_owner = subitem;
-        knot->setSize(HandleSize::LARGE);
-        knot->setAnchor(SP_ANCHOR_CENTER);
-
-        // Set the point to the middle of the sub item
-        knot->setPosition(subitem->getAvoidRef().getConnectionPointPos() * _desktop->doc2dt(), 0);
-    } else {
-        knot->setSize(HandleSize::NORMAL);
-        knot->setAnchor(SP_ANCHOR_CENTER);
-        // Set the point to the middle of the object
-        knot->setPosition(item->getAvoidRef().getConnectionPointPos() * _desktop->doc2dt(), 0);
-    }
+    selectionClear();
+    for (auto item : selection->items()) {
+        selectObject(item);
 
-    knot->updateCtrl();
-
-    // We don't want to use the standard knot handler.
-    knot->_event_connection.disconnect();
-    knot->_event_connection =
-        knot->ctrl->connect_event(sigc::bind(sigc::ptr_fun(cc_generic_knot_handler), knot));
+        for (auto &connected_item : item->hrefList) {
+            selectObject(connected_item);
+        }
 
-    knot->show();
-    this->knots[knot] = 1;
+        for (auto &sp_point : item->getConnectionPoints()) {
+            for (auto &connected_item : sp_point->hrefList) {
+                selectObject(connected_item);
+            }
+        }
+    }
+    toolbar->select_lines(selected_lines);
+    toolbar->select_avoided(selection);
 }
 
-void ConnectorTool::_setActiveShape(SPItem *item)
+void ConnectorTool::selectObject(SPObject *object)
 {
-    g_assert(item != nullptr );
-
-    if (this->active_shape != item) {
-        // The active shape has changed
-        // Rebuild everything
-        this->active_shape = item;
-        // Remove existing active shape listeners
-        if (this->active_shape_repr) {
-            this->active_shape_repr->removeObserver(shapeNodeObserver());
-            Inkscape::GC::release(this->active_shape_repr);
-
-            this->active_shape_layer_repr->removeObserver(layerNodeObserver());
-            Inkscape::GC::release(this->active_shape_layer_repr);
-        }
-
-        // Listen in case the active shape changes
-        this->active_shape_repr = item->getRepr();
-        if (this->active_shape_repr) {
-            Inkscape::GC::anchor(this->active_shape_repr);
-            this->active_shape_repr->addObserver(shapeNodeObserver());
-
-            this->active_shape_layer_repr = this->active_shape_repr->parent();
-            Inkscape::GC::anchor(this->active_shape_layer_repr);
-            this->active_shape_layer_repr->addObserver(layerNodeObserver());
+    if (auto lpe = cast<LivePathEffectObject>(object)) {
+        if (auto effect = dynamic_cast<LPEConnectorLine *>(lpe->get_lpe())) {
+            for (auto &item : effect->getCurrrentLPEItems()) {
+                selectObject(item);
+            }
         }
-
-        cc_clear_active_knots(this->knots);
-
-        // The idea here is to try and add a group's children to solidify
-        // connection handling. We react to path objects with only one node.
-        for (auto& child: item->children) {
-            if(child.getAttribute("inkscape:connector")) {
-                this->_activeShapeAddKnot((SPItem *) &child, nullptr);
+    }
+    bool is_connection = isConnector(object);
+    if (SPItem *item = cast<SPItem>(object)) {
+        if (is_connection && tool_mode == CONNECTOR_LINE_MODE) {
+            auto lpe_effect = LPEConnectorLine::get(item);
+            if (auto start = cast<SPPoint>(lpe_effect->getConnStart())) {
+                selected_points.push_back(start);
+            }
+            if (auto end = cast<SPPoint>(lpe_effect->getConnEnd())) {
+                selected_points.push_back(end);
             }
+            auto holder = new ConnectorLineKnotHolder(_desktop, item);
+            selected_line_holders.push_back(holder);
+            selected_lines.push_back(cast<SPShape>(item));
         }
-        // Special connector points in a symbol
-        if (auto use = cast<SPUse>(item)) {
-            SPItem *orig = use->root();
-            //SPItem *orig = use->get_original();
-            for (auto& child: orig->children) {
-                if(child.getAttribute("inkscape:connector")) {
-                    this->_activeShapeAddKnot(item, (SPItem *) &child);
-                }
+        if (!is_connection && tool_mode == CONNECTOR_POINT_MODE) {
+            auto bounds = item->desktopVisualBounds();
+            if (!bounds) {
+                return;
+            }
+            if (point_editing_holder) {
+                delete point_editing_holder;
             }
+            bounds->expandBy(1.0);
+            point_editing_rect->set_rect(*bounds);
+            point_editing_rect->set_visible(true);
+            point_editing_holder = new ConnectorObjectKnotHolder(_desktop, item);
         }
-        // Center point to any object
-        this->_activeShapeAddKnot(item, nullptr);
-
-    } else {
-        // Ensure the item's connection_points map
-        // has been updated
-        item->document->ensureUpToDate();
     }
 }
 
-void ConnectorTool::cc_set_active_conn(SPItem *item)
+bool ConnectorTool::addCheckpoint(SPShape *line, Geom::Point point)
 {
-    g_assert( is<SPPath>(item) );
-
-    const SPCurve *curve = cast<SPPath>(item)->curveForEdit();
-    Geom::Affine i2dt = item->i2dt_affine();
-
-    if (this->active_conn == item) {
-        if (curve->is_empty()) {
-            // Connector is invisible because it is clipped to the boundary of
-            // two overlapping shapes.
-            this->endpt_handle[0]->hide();
-            this->endpt_handle[1]->hide();
-        } else {
-            // Just adjust handle positions.
-            Geom::Point startpt = *(curve->first_point()) * i2dt;
-            this->endpt_handle[0]->setPosition(startpt, 0);
+    auto lpe = LPEConnectorLine::get(line);
 
-            Geom::Point endpt = *(curve->last_point()) * i2dt;
-            this->endpt_handle[1]->setPosition(endpt, 0);
-        }
-
-        return;
-    }
-
-    this->active_conn = item;
-
-    // Remove existing active conn listeners
-    if (this->active_conn_repr) {
-        this->active_conn_repr->removeObserver(shapeNodeObserver());
-        Inkscape::GC::release(this->active_conn_repr);
-        this->active_conn_repr = nullptr;
-    }
-
-    // Listen in case the active conn changes
-    this->active_conn_repr = item->getRepr();
-    if (this->active_conn_repr) {
-        Inkscape::GC::anchor(this->active_conn_repr);
-        this->active_conn_repr->addObserver(shapeNodeObserver());
-    }
-
-    for (int i = 0; i < 2; ++i) {
-        // Create the handle if it doesn't exist
-        if ( this->endpt_handle[i] == nullptr ) {
-            SPKnot *knot = new SPKnot(_desktop,
-                                      _("<b>Connector endpoint</b>: drag to reroute or connect to new shapes"),
-                                      Inkscape::CANVAS_ITEM_CTRL_TYPE_SHAPER, "CanvasItemCtrl:ConnectorTool:Endpoint");
-
-            knot->setSize(HandleSize::SMALL);
-            knot->setAnchor(SP_ANCHOR_CENTER);
-            knot->updateCtrl();
-
-            // We don't want to use the standard knot handler,
-            // since we don't want this knot to be draggable.
-            knot->_event_connection.disconnect();
-            knot->_event_connection =
-                knot->ctrl->connect_event(sigc::bind(sigc::ptr_fun(cc_generic_knot_handler), knot));
-
-            this->endpt_handle[i] = knot;
-        }
-
-        // Remove any existing handlers
-        this->endpt_handler_connection[i].disconnect();
-        this->endpt_handler_connection[i] =
-            this->endpt_handle[i]->ctrl->connect_event(sigc::bind(sigc::ptr_fun(endpt_handler), this));
-    }
-
-    if (curve->is_empty()) {
-        // Connector is invisible because it is clipped to the boundary
-        // of two overlpapping shapes.  So, it doesn't need endpoints.
-        return;
+    // Advanced editor doesn't add checkpoints like this.
+    if (lpe->advancedEditor()) {
+        return false;
     }
 
-    Geom::Point startpt = *(curve->first_point()) * i2dt;
-    this->endpt_handle[0]->setPosition(startpt, 0);
-
-    Geom::Point endpt = *(curve->last_point()) * i2dt;
-    this->endpt_handle[1]->setPosition(endpt, 0);
-
-    this->endpt_handle[0]->show();
-    this->endpt_handle[1]->show();
-}
-
-void cc_create_connection_point(ConnectorTool* cc)
-{
-    if (cc->active_shape && cc->state == SP_CONNECTOR_CONTEXT_IDLE) {
-        if (cc->selected_handle) {
-            cc_deselect_handle( cc->selected_handle );
-        }
+    auto orig_pathv = line->curveForEdit()->get_pathvector();
+    auto const &route_pathv = lpe->getRoutePath();
 
-        SPKnot *knot = new SPKnot(cc->getDesktop(), "", Inkscape::CANVAS_ITEM_CTRL_TYPE_SHAPER,
-            "CanvasItemCtrl::ConnectorTool:ConnectionPoint");
+    Geom::Coord distance;
+    auto pathv_time = route_pathv.nearestTime(point, &distance);
 
-        // We do not process events on this knot.
-        knot->_event_connection.disconnect();
+    if (pathv_time && distance < 5.0) {
+        int path_index = -1;
+        auto line_point = route_pathv.pointAt(*pathv_time);
 
-        cc_select_handle( knot );
-        cc->selected_handle = knot;
-        cc->selected_handle->show();
-        cc->state = SP_CONNECTOR_CONTEXT_NEWCONNPOINT;
-    }
-}
+        // Detect the orientation so it can be maintained.
+        auto dir = LPEConnectorLine::detectCheckpointOrientation(route_pathv, line_point);
 
-static bool cc_item_is_shape(SPItem *item)
-{
-    if (auto path = cast<SPPath>(item)) {
-        SPCurve const *curve = path->curve();
-        if ( curve && !(curve->is_closed()) ) {
-            // Open paths are connectors.
-            return false;
+        for (int i = 0; i < orig_pathv[0].size(); i++) {
+            // Map the original point to the routed point so they can be compared.
+            Geom::Coord orig_dist;
+            auto orig_time = route_pathv.nearestTime(orig_pathv[0][i].initialPoint(), &orig_dist);
+            if (orig_time && orig_dist < 1.0 && pathv_time->asPathTime() > orig_time->asPathTime()) {
+                path_index = i + 1;
+            }
         }
-    } else if (is<SPText>(item) || is<SPFlowtext>(item)) {
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        if (prefs->getBool("/tools/connector/ignoretext", true)) {
-            // Don't count text as a shape we can connect connector to.
-            return false;
+        if (path_index == -1) {
+            // This copy shouldn't be needed, but there is something wrong with the very first path
+            // segment that doesn't apply to any other segment. This attempts to compensate for it.
+            Geom::Coord orig_dist;
+            auto orig_time = route_pathv.nearestTime(orig_pathv[0][0].finalPoint(), &orig_dist);
+            if (orig_time && orig_dist < 1.0 && pathv_time->asPathTime() < orig_time->asPathTime()) {
+                path_index = 1;
+            }
         }
-    }
-    return true;
-}
-
-
-bool cc_item_is_connector(SPItem *item)
-{
-    if (auto path = cast<SPPath>(item)) {
-        bool closed = path->curveForEdit()->is_closed();
-        if (path->connEndPair.isAutoRoutingConn() && !closed) {
-            // To be considered a connector, an object must be a non-closed
-            // path that is marked with a "inkscape:connector-type" attribute.
+        if (path_index > 0) {
+            // Insert the new checkpoint with the given direction detected.
+            LPEConnectorLine::rewriteLine(line, path_index, line_point, dir, DynamicNone, RewriteMode::Add);
+            DocumentUndo::done(_desktop->getDocument(), _("Add connector checkpoint"), "");
             return true;
         }
     }
     return false;
 }
 
-
-void cc_selection_set_avoid(SPDesktop *desktop, bool const set_avoid)
-{
-    if (desktop == nullptr) {
-        return;
-    }
-
-    SPDocument *document = desktop->getDocument();
-
-    Inkscape::Selection *selection = desktop->getSelection();
-
-
-    int changes = 0;
-
-    for (SPItem *item: selection->items()) {
-        char const *value = (set_avoid) ? "true" : nullptr;
-
-        if (cc_item_is_shape(item)) {
-            item->setAttribute("inkscape:connector-avoid", value);
-            item->getAvoidRef().handleSettingChange();
-            changes++;
-        }
-    }
-
-    if (changes == 0) {
-        desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE,
-                _("Select <b>at least one non-connector object</b>."));
-        return;
-    }
-
-    char *event_desc = (set_avoid) ?
-            _("Make connectors avoid selected objects") :
-            _("Make connectors ignore selected objects");
-    DocumentUndo::done(document, event_desc, INKSCAPE_ICON("draw-connector"));
-}
-
-void ConnectorTool::_selectionChanged(Inkscape::Selection *selection)
-{
-    SPItem *item = selection->singleItem();
-    if (this->active_conn == item) {
-        // Nothing to change.
-        return;
-    }
-
-    if (item == nullptr) {
-        this->cc_clear_active_conn();
-        return;
-    }
-
-    if (cc_item_is_connector(item)) {
-        this->cc_set_active_conn(item);
-    }
-}
-
 } // namespace Inkscape::UI::Tools
 
 /*
diff --git a/src/ui/tools/connector-tool.h b/src/ui/tools/connector-tool.h
index ca4bea6b17..28c62fe09a 100644
--- a/src/ui/tools/connector-tool.h
+++ b/src/ui/tools/connector-tool.h
@@ -1,182 +1,136 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
-#ifndef SEEN_CONNECTOR_CONTEXT_H
-#define SEEN_CONNECTOR_CONTEXT_H
+#ifndef INKSCAPE_UI_TOOLS_CONNECTOR_TOOL_H
+#define INKSCAPE_UI_TOOLS_CONNECTOR_TOOL_H
 
 /*
  * Connector creation tool
  *
  * Authors:
- *   Michael Wybrow <mjwybrow@users.sourceforge.net>
+ *   Martin Owens <doctormo@geek-2.com>
  *
- * Copyright (C) 2005 Michael Wybrow
+ * Copyright (C) 2021 Martin Owens
  *
  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
  */
 
-#include <map>
-#include <optional>
-#include <string>
-
-#include <2geom/point.h>
 #include <sigc++/connection.h>
 
-#include "display/curve.h"
-
+#include "display/control/canvas-item-bpath.h"
+#include "display/control/canvas-item-ptr.h"
+#include "display/control/canvas-item-rect.h"
+#include "helper/auto-connection.h"
+#include "live_effects/lpe-connector-line.h"
+#include "object/sp-point.h"
+#include "object/sp-shape.h"
+#include "selection.h"
 #include "ui/tools/tool-base.h"
+#include "ui/toolbar/connector-toolbar.h"
 
-#include "xml/node-observer.h"
-
-class SPItem;
-class SPCurve;
-class SPKnot;
-
-namespace Avoid {
-    class ConnRef;
-}
-
-namespace Inkscape {
-class CanvasItemBpath;
-class Selection;
-namespace XML { class Node; }
-struct ButtonPressEvent;
-struct MotionEvent;
-struct ButtonReleaseEvent;
-} // namespace Inkscape
-
-#define SP_CONNECTOR_CONTEXT(obj) (dynamic_cast<Inkscape::UI::Tools::ConnectorTool*>((Inkscape::UI::Tools::ToolBase*)obj))
-
-enum {
-    SP_CONNECTOR_CONTEXT_IDLE,
-    SP_CONNECTOR_CONTEXT_DRAGGING,
-    SP_CONNECTOR_CONTEXT_CLOSE,
-    SP_CONNECTOR_CONTEXT_STOP,
-    SP_CONNECTOR_CONTEXT_REROUTING,
-    SP_CONNECTOR_CONTEXT_NEWCONNPOINT
-};
-
-using SPKnotList = std::map<SPKnot *, int>;
+using Inkscape::LivePathEffect::LPEConnectorLine;
 
 namespace Inkscape::UI::Tools {
 
-class ConnectorTool;
+class ConnectorObjectKnotHolder;
+class ConnectorPointsKnotHolder;
+class ConnectorLineKnotHolder;
 
-class CCToolShapeNodeObserver : public Inkscape::XML::NodeObserver
+enum ToolModes
 {
-    friend class ConnectorTool;
-    ~CCToolShapeNodeObserver() override = default; // can only exist as a direct base of ConnectorTool
-
-    void notifyAttributeChanged(Inkscape::XML::Node &, GQuark, Util::ptr_shared, Util::ptr_shared) final;
-};
-
-class CCToolLayerNodeObserver : public Inkscape::XML::NodeObserver
-{
-    friend class ConnectorTool;
-    ~CCToolLayerNodeObserver() override = default; // can only exist as a direct base of ConnectorTool
-
-    void notifyChildRemoved(Inkscape::XML::Node &, Inkscape::XML::Node &, Inkscape::XML::Node *) final;
+    CONNECTOR_LINE_MODE,
+    CONNECTOR_POINT_MODE,
 };
 
-class ConnectorTool
-    : public ToolBase
-    , private CCToolShapeNodeObserver
-    , private CCToolLayerNodeObserver
+class ConnectorTool : public ToolBase
 {
 public:
     ConnectorTool(SPDesktop *desktop);
     ~ConnectorTool() override;
 
-    Inkscape::Selection *selection{nullptr};
-    Geom::Point p[5];
+    static LPEConnectorLine *getLPE(SPShape *line);
 
-    /** \invar npoints in {0, 2}. */
-    gint npoints{0};
-    unsigned int state : 4;
-
-    // Red curve
-    Inkscape::CanvasItemBpath *red_bpath{nullptr};
-    std::optional<SPCurve> red_curve;
-    guint32 red_color{0xff00007f};
-
-    // Green curve
-    std::optional<SPCurve> green_curve;
-
-    // The new connector
-    SPItem *newconn{nullptr};
-    Avoid::ConnRef *newConnRef{nullptr};
-    gdouble curvature{0.0};
-    bool isOrthogonal{false};
+    void set(Preferences::Entry const &val) override;
+    bool root_handler(CanvasEvent const &event) override;
 
-    // The active shape
-    SPItem *active_shape{nullptr};
-    Inkscape::XML::Node *active_shape_repr{nullptr};
-    Inkscape::XML::Node *active_shape_layer_repr{nullptr};
+    void setToolMode(int mode);
 
-    // Same as above, but for the active connector
-    SPItem *active_conn{nullptr};
-    Inkscape::XML::Node *active_conn_repr{nullptr};
-    sigc::connection sel_changed_connection;
+    // Public and called from knot-holder-entity.
+    void setHighlightArea(CanvasItemPtr<CanvasItemRect> &rect, SPItem *item, Geom::Point *point = nullptr);
 
-    // The activehandle
-    SPKnot *active_handle{nullptr};
+    void highlightPoint(SPItem *item, SPPoint *point = nullptr);
+    void highlightPoint(SPItem *item, std::string name, Geom::Point parent_point);
 
-    // The selected handle, used in editing mode
-    SPKnot *selected_handle{nullptr};
+    void unhighlightPoint();
 
-    SPItem *clickeditem{nullptr};
-    SPKnot *clickedhandle{nullptr};
+    bool activateHoverPoint();
+    void activatePoint(SPItem *item, SPPoint *point = nullptr);
+    void activatePoint(SPItem *item, std::string name, Geom::Point parent_point);
+    void activateLine(SPShape *line, bool is_end);
 
-    SPKnotList knots;
-    SPKnot *endpt_handle[2]{};
-    sigc::connection endpt_handler_connection[2];
-    gchar *shref{nullptr};
-    gchar *sub_shref{nullptr};
-    gchar *ehref {nullptr};
-    gchar *sub_ehref{nullptr};
+    std::vector<SPPoint *> selected_points;
 
-    void set(Preferences::Entry const &val) override;
-    bool root_handler(CanvasEvent const &event) override;
-    bool item_handler(SPItem* item, CanvasEvent const &event) override;
+    int tool_mode;
 
-    void cc_clear_active_shape();
-    void cc_set_active_conn(SPItem *item);
-    void cc_clear_active_conn();
+    bool addCheckpoint(SPShape *line, Geom::Point point);
+    void selectionChange();
 
 private:
-    void _selectionChanged(Inkscape::Selection *selection);
-
-    bool _handleButtonPress(ButtonPressEvent const &bevent);
-    bool _handleMotionNotify(MotionEvent const &mevent);
-    bool _handleButtonRelease(ButtonReleaseEvent const &revent);
-    bool _handleKeyPress(guint const keyval);
-
-    void _setInitialPoint(Geom::Point const p);
-    void _setSubsequentPoint(Geom::Point const p);
-    void _finishSegment(Geom::Point p);
-    void _resetColors();
-    void _finish();
-    void _concatColorsAndFlush();
-    void _flushWhite(SPCurve *gc);
-
-    void _activeShapeAddKnot(SPItem* item, SPItem* subitem);
-    void _setActiveShape(SPItem *item);
-    bool _ptHandleTest(Geom::Point& p, gchar **href, gchar **subhref);
-
-    void _reroutingFinish(Geom::Point *const p);
-
-    CCToolShapeNodeObserver &shapeNodeObserver() { return *this; }
-    CCToolLayerNodeObserver &layerNodeObserver() { return *this; }
-    friend CCToolShapeNodeObserver;
-    friend CCToolLayerNodeObserver;
+    SPItem *findShapeAtPoint(Geom::Point last_post, bool ignore_lines = false);
+    SPItem *findShapeNearPoint(Geom::Point dt_point, int distance = 3.0);
+
+    Geom::PathVector drawSimpleLine(Geom::Point drawn_end);
+    void moveDrawnLine(Geom::Point *point, Geom::Point *hover_sub_point = nullptr);
+    void moveReconnectLine(Geom::Point *point, Geom::Point *hover_sub_point = nullptr);
+    void finishDrawnLine(SPItem *end_item, SPPoint *end_point = nullptr);
+    void finishReconnectLine(SPItem *end_item, SPPoint *end_point = nullptr);
+    void deactivateLineDrawing();
+
+    void selectionClear();
+    void selectionChanged(Inkscape::Selection *selection);
+    void selectObject(SPObject *object);
+
+    auto_connection sel_changed_connection;
+
+    // Toolbar settings
+    Toolbar::ConnectorToolbar *toolbar = nullptr;
+    int steps = 0;
+    double spacing = 0.0;
+    double curvature = 0.0;
+    double jump_size = 0.0;
+    Inkscape::LivePathEffect::JumpMode jump_type = Inkscape::LivePathEffect::JumpMode::Arc;
+    Avoid::ConnType conn_type = Avoid::ConnType_PolyLine;
+
+    // This holds knots of points when a user hovers over an item
+    ConnectorPointsKnotHolder *hover_knots = nullptr;
+    ConnectorObjectKnotHolder *point_editing_holder = nullptr;
+    CanvasItemPtr<CanvasItemRect> point_editing_rect;
+    // A knot holder for each selected line, or line connected to selected objects
+    std::vector<ConnectorLineKnotHolder *> selected_line_holders;
+    std::vector<SPShape *> selected_lines;
+    // Active means that the user has clicked on the item and is drawing a line
+    SPItem *active_item = nullptr;
+    SPItem *hover_item = nullptr;
+    SPPoint *active_point = nullptr;
+    SPPoint *hover_point = nullptr;
+    SPShape *modify_line = nullptr;
+    bool modify_end = false;
+    // The hint will be turned into an SPPoint once the line is drawn.
+    std::string active_hint_name = "";
+    Geom::Point *active_hint_point = nullptr;
+    std::string hover_hint_name = "";
+    Geom::Point *hover_hint_point = nullptr;
+    // Store the "drawn-line" as the last calculated route
+    Geom::PathVector last_route;
+
+    // Highlighting and indication of connection process
+    CanvasItemPtr<CanvasItemRect> highlight_a;
+    CanvasItemPtr<CanvasItemRect> highlight_b;
+    CanvasItemPtr<CanvasItemBpath> drawn_line;
+    std::optional<Geom::Point> drawn_start;
 };
 
-void cc_selection_set_avoid(SPDesktop *, bool const set_ignore);
-void cc_create_connection_point(ConnectorTool* cc);
-void cc_remove_connection_point(ConnectorTool* cc);
-bool cc_item_is_connector(SPItem *item);
-
 } // namespace Inkscape::UI::Tools
 
-#endif /* !SEEN_CONNECTOR_CONTEXT_H */
+#endif // INKSCAPE_UI_TOOLS_CONNECTOR_TOOL_H
 
 /*
   Local Variables:
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index 95adce9dcd..a24ae36af4 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -210,10 +210,10 @@ int lpetool_item_has_construction(SPItem *item)
 bool lpetool_try_construction(SPDesktop *desktop, LivePathEffect::EffectType const type)
 {
     auto const selection = desktop->getSelection();
-    auto const item = selection->singleItem();
+    auto const item = cast<SPLPEItem>(selection->single());
 
     // TODO: should we check whether type represents a valid geometric construction?
-    if (item && is<SPLPEItem>(item) && LivePathEffect::Effect::acceptsNumClicks(type) == 0) {
+    if (item && LivePathEffect::Effect::acceptsNumClicks(type) == 0) {
         LivePathEffect::Effect::createAndApply(type, desktop->getDocument(), item);
         return true;
     }
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 5d878a83c0..08bfae7a5a 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -358,7 +358,8 @@ void NodeTool::selection_changed(Inkscape::Selection *sel)
     std::set<ShapeRecord> shapes;
 
     for (auto item : sel->items()) {
-        if (item) {
+        auto lpeitem = cast<SPLPEItem>(item);
+        if (!(lpeitem && lpeitem->providesOwnKnotholder())) {
             gather_items(this, nullptr, item, SHAPE_ROLE_NORMAL, shapes);
         }
     }
@@ -475,6 +476,10 @@ bool NodeTool::root_handler(CanvasEvent const &event)
             if (!shape) {
                 return; // for now, handle only shapes
             }
+            SPLPEItem *lpeitem = cast<SPLPEItem>(over_item);
+            if (lpeitem && lpeitem->providesOwnFlashPaths()) {
+                return; // item provides own flash path
+            }
 
             flashed_item = over_item;
             if (!shape->curveForEdit()) {
diff --git a/src/ui/tools/pages-tool.cpp b/src/ui/tools/pages-tool.cpp
index d8768c78e7..fd87d56539 100644
--- a/src/ui/tools/pages-tool.cpp
+++ b/src/ui/tools/pages-tool.cpp
@@ -505,8 +505,8 @@ void PagesTool::addDragShapes(SPPage *page, Geom::Affine tr)
  */
 void PagesTool::addDragShape(SPItem *item, Geom::Affine tr)
 {
-    if (auto shape = item_to_outline(item)) {
-        addDragShape(*shape * item->i2dt_affine(), tr);
+    if (auto const shape = item_to_outline(item); !shape.empty()) {
+        addDragShape(shape * item->i2dt_affine(), tr);
     }
 }
 
diff --git a/src/ui/widget/desktop-widget.cpp b/src/ui/widget/desktop-widget.cpp
index e42f99e812..8b17033ce2 100644
--- a/src/ui/widget/desktop-widget.cpp
+++ b/src/ui/widget/desktop-widget.cpp
@@ -36,7 +36,6 @@
 #include <gtkmm/paned.h>
 #include <gtkmm/widget.h>
 
-#include "conn-avoid-ref.h"
 #include "desktop.h"
 #include "document.h"
 #include "document-undo.h"
@@ -201,10 +200,6 @@ SPDesktopWidget::SPDesktopWidget(InkscapeWindow *inkscape_window, SPDocument *do
     command_toolbar = std::make_unique<Inkscape::UI::Toolbar::CommandToolbar>(_desktop.get());
     _top_toolbars->attach(*command_toolbar, 0, 0);
 
-    // Add the shape geometry to libavoid for autorouting connectors.
-    // This needs desktop set for its spacing preferences.
-    init_avoided_shape_geometry(_desktop.get());
-
     _statusbar->set_desktop(_desktop.get());
 
     /* Once desktop is set, we can update rulers */
diff --git a/testfiles/src/attributes-test.cpp b/testfiles/src/attributes-test.cpp
index 008e222b96..7714b43b06 100644
--- a/testfiles/src/attributes-test.cpp
+++ b/testfiles/src/attributes-test.cpp
@@ -394,15 +394,6 @@ std::vector<AttributeInfo> getKnownAttrs()
         AttributeInfo("inkscape:box3dsidetype", true),
         AttributeInfo("inkscape:collect", true),
         AttributeInfo("inkscape:color", true),
-        AttributeInfo("inkscape:connection-end", true),
-        AttributeInfo("inkscape:connection-end-point", true),
-        AttributeInfo("inkscape:connection-points", true),
-        AttributeInfo("inkscape:connection-start", true),
-        AttributeInfo("inkscape:connection-start-point", true),
-        AttributeInfo("inkscape:connector-avoid", true),
-        AttributeInfo("inkscape:connector-curvature", true),
-        AttributeInfo("inkscape:connector-spacing", true),
-        AttributeInfo("inkscape:connector-type", true),
         AttributeInfo("inkscape:corner0", true),
         AttributeInfo("inkscape:corner7", true),
         AttributeInfo("inkscape:current-layer", true),
@@ -567,8 +558,10 @@ std::vector<AttributeInfo> getKnownAttrs()
         // SPGuide
         AttributeInfo("position", true),
 
-        // don't know what that is
-        AttributeInfo("effect", true)
+        AttributeInfo("effect", true),
+
+        // Connectors
+        AttributeInfo("inkscape:original-point", true)
     };
 
     size_t count = sizeof(all_attrs) / sizeof(all_attrs[0]);
diff --git a/testfiles/src/sp-object-tags-test.cpp b/testfiles/src/sp-object-tags-test.cpp
index 89db0151c5..9c60f7c87b 100644
--- a/testfiles/src/sp-object-tags-test.cpp
+++ b/testfiles/src/sp-object-tags-test.cpp
@@ -39,6 +39,7 @@
 #include "object/sp-page.h"
 #include "object/sp-path.h"
 #include "object/sp-pattern.h"
+#include "object/sp-point.h"
 #include "object/sp-polyline.h"
 #include "object/sp-radial-gradient.h"
 #include "object/sp-rect.h"
@@ -194,6 +195,7 @@ TEST(SPObjectTagsTest, compare_dynamic_cast)
         SPLine,
         SPOffset,
         SPPath,
+        SPPoint,
         SPPolyLine,
         SPPolygon,
         Box3DSide,
-- 
GitLab