diff --git a/app/.classpath b/app/.classpath
index 4c46d2fcc..3fb1a2481 100644
--- a/app/.classpath
+++ b/app/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/build/jre/.classpath b/build/jre/.classpath
index a95e6b974..6b40476ff 100644
--- a/build/jre/.classpath
+++ b/build/jre/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/build/macosx/appbundler/.classpath b/build/macosx/appbundler/.classpath
index 3124990b4..ec275ba27 100644
--- a/build/macosx/appbundler/.classpath
+++ b/build/macosx/appbundler/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/core/.classpath b/core/.classpath
index abeadbeb0..bce493553 100644
--- a/core/.classpath
+++ b/core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/java/.classpath b/java/.classpath
index 424f58996..fa8666d22 100644
--- a/java/.classpath
+++ b/java/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing4-app"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/java/libraries/dxf/.classpath b/java/libraries/dxf/.classpath
index 4e243c7a4..0f47de2c4 100644
--- a/java/libraries/dxf/.classpath
+++ b/java/libraries/dxf/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/java/libraries/javafx/.classpath b/java/libraries/javafx/.classpath
index d5950e9a8..cfc5fc9ac 100644
--- a/java/libraries/javafx/.classpath
+++ b/java/libraries/javafx/.classpath
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="lib" path="library/javafx.base.jar"/>
-	<classpathentry kind="lib" path="library/javafx.controls.jar"/>
-	<classpathentry kind="lib" path="library/javafx.fxml.jar"/>
-	<classpathentry kind="lib" path="library/javafx.graphics.jar"/>
-	<classpathentry kind="lib" path="library/javafx.jar"/>
-	<classpathentry kind="lib" path="library/javafx.media.jar"/>
-	<classpathentry kind="lib" path="library/javafx.swing.jar"/>
+	<classpathentry kind="lib" path="library/macosx/modules/javafx.base.jar"/>
+	<classpathentry kind="lib" path="library/macosx/modules/javafx.controls.jar"/>
+	<classpathentry kind="lib" path="library/macosx/modules/javafx.fxml.jar"/>
+	<classpathentry kind="lib" path="library/macosx/modules/javafx.graphics.jar"/>
+	<classpathentry kind="lib" path="library/macosx/modules/javafx.media.jar"/>
+	<classpathentry kind="lib" path="library/macosx/modules/javafx.swing.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/java/libraries/net/.classpath b/java/libraries/net/.classpath
index c45131f2e..f1d4249b3 100644
--- a/java/libraries/net/.classpath
+++ b/java/libraries/net/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/processing4-core"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/java/libraries/pdf/.classpath b/java/libraries/pdf/.classpath
index 3cbcec3b2..6175a6d00 100644
--- a/java/libraries/pdf/.classpath
+++ b/java/libraries/pdf/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/java/libraries/serial/.classpath b/java/libraries/serial/.classpath
index bc1607f28..de63ac11a 100644
--- a/java/libraries/serial/.classpath
+++ b/java/libraries/serial/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
diff --git a/java/libraries/svg/.classpath b/java/libraries/svg/.classpath
index 2b0e67a5a..cf20983c2 100644
--- a/java/libraries/svg/.classpath
+++ b/java/libraries/svg/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="/Users/fry/coconut/processing4/java/libraries/svg/library/batik-all-1.14.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/adoptopenjdk-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/adoptopenjdk-11">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>