diff --git a/cli/lfd/build.gradle b/cli/lfd/build.gradle
index 9a8c52c46c..6b5739e0c9 100644
--- a/cli/lfd/build.gradle
+++ b/cli/lfd/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation project(':cli:base')
-    implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:$klighdVersion") {
+    implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.setup:$klighdVersion") {
         exclude group: 'de.cau.cs.kieler.swt.mock'
     }
     implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.piccolo:${klighdVersion}") {
diff --git a/cli/lfd/src/main/java/org/lflang/cli/Lfd.java b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
index fa19751eb1..f129c28324 100644
--- a/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
+++ b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
@@ -2,7 +2,7 @@
 
 import de.cau.cs.kieler.klighd.Klighd;
 import de.cau.cs.kieler.klighd.LightDiagramServices;
-import de.cau.cs.kieler.klighd.standalone.KlighdStandaloneSetup;
+import de.cau.cs.kieler.klighd.setup.KlighdStandaloneSetup;
 import java.nio.file.Path;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.ecore.resource.Resource;
diff --git a/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java b/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
index 73c5aafd58..7433bbb88e 100644
--- a/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
+++ b/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
@@ -4,7 +4,7 @@
 import com.google.inject.Provider;
 import de.cau.cs.kieler.klighd.Klighd;
 import de.cau.cs.kieler.klighd.LightDiagramServices;
-import de.cau.cs.kieler.klighd.standalone.KlighdStandaloneSetup;
+import de.cau.cs.kieler.klighd.setup.KlighdStandaloneSetup;
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
diff --git a/core/build.gradle b/core/build.gradle
index 142c347e03..2979ab494b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -29,7 +29,7 @@ dependencies {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
         exclude group: 'de.cau.cs.kieler.swt.mock'
     }
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:$klighdVersion") {
+    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.setup:$klighdVersion") {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
         exclude group: 'de.cau.cs.kieler.swt.mock'
diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java b/core/src/main/java/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
index 33a9b02167..691ea42192 100644
--- a/core/src/main/java/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
+++ b/core/src/main/java/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
@@ -180,7 +180,7 @@ public void configureReactor(KNode node) {
         DiagramSyntheses.setLayoutOption(
             node,
             LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
-            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+            ComponentOrderingStrategy.MODEL_ORDER);
         DiagramSyntheses.setLayoutOption(
             node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
 
@@ -213,7 +213,7 @@ public void configureReactor(KNode node) {
         DiagramSyntheses.setLayoutOption(
             node,
             LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
-            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+            ComponentOrderingStrategy.MODEL_ORDER);
         DiagramSyntheses.setLayoutOption(
             node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
 
@@ -246,7 +246,7 @@ public void configureReactor(KNode node) {
         DiagramSyntheses.setLayoutOption(
             node,
             LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
-            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+            ComponentOrderingStrategy.MODEL_ORDER);
         DiagramSyntheses.setLayoutOption(
             node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
         // During crossing minimization 10 node order violations are regarded as important as 1 edge
@@ -274,7 +274,7 @@ public void configureReactor(KNode node) {
         DiagramSyntheses.setLayoutOption(
             node,
             LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
-            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+            ComponentOrderingStrategy.MODEL_ORDER);
         DiagramSyntheses.setLayoutOption(
             node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
         // Disable all kinds of crossing minimization entirely. Just take what is in the model and
diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
index b64a805c1a..aa1e78b072 160000
--- a/core/src/main/resources/lib/c/reactor-c
+++ b/core/src/main/resources/lib/c/reactor-c
@@ -1 +1 @@
-Subproject commit b64a805c1a78ca67e41026301e67830ee4791cb2
+Subproject commit aa1e78b0723da37c8c7ad05a2a94e70a2952b22d
diff --git a/gradle.properties b/gradle.properties
index 8380667652..3ff621246c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ openTest4jVersion=1.2.0
 picocliVersion=4.7.0
 resourcesVersion=3.19.0
 xtextVersion=2.34.0
-klighdVersion=2.3.0.v20230606
+klighdVersion=3.0.1.v20240410
 freehepVersion=2.4
 swtVersion=3.124.0
 spotbugsToolVersion=4.7.3
diff --git a/lsp/build.gradle b/lsp/build.gradle
index 65215162b7..772f618db1 100644
--- a/lsp/build.gradle
+++ b/lsp/build.gradle
@@ -10,13 +10,6 @@ dependencies {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
     }
-
-    // This dependency ensures correct animations and bookkeeping during updates
-    // See https://github.com/lf-lang/vscode-lingua-franca/issues/103#issuecomment-1731023470
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.incremental:$klighdVersion") {
-        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
-        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
-    }
 }
 
 application {