diff --git a/build/build.xml b/build/build.xml
index c5573a161..f03841b2e 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -72,13 +72,6 @@
     </condition>
   </fail>
 
-  <!-- JavaFX got removed from the Oracle's JDK for arm and Java 11 -->
-  <condition property="jfx.available" value="true">
-    <and>
-      <not><equals arg1="${os.arch}" arg2="arm" /></not>
-    </and>
-  </condition>
-
   <property name="examples.dir"
             value="../../processing-docs/content/examples" />
 
@@ -90,25 +83,6 @@
   <property name="jdk.prefix" value="jdk" />
   <property name="jdk.esoteric" value="${jdk.train}.${jdk.version}.${jdk.update}" />
 
-  <!-- As of 210117, Gluon has 11.0.8 available for commercial clients
-       as an LTS release, but 11.0.2 is the latest free/public version -->
-  <!--
-  <property name="jfx.train" value="11" />
-  <property name="jfx.version" value="0" />
-  <property name="jfx.update" value="2" />
-  <property name="jfx.build" value="0" />
-
-  <property name="jfx.name" value="${jfx.train}.${jfx.version}.${jfx.update}" />
-  -->
-
-  <!-- with 16, there's no 16.0.3 it's just "16" -->
-  <property name="jfx.name" value="16" />
-
-  <!-- Before 4.0a5, these included longer lists of files to remove in order
-       to keep downloads and exported applications smaller. With Java 11,
-       it's a losing battle, so we're only removing the worst offenders.
-       https://github.com/processing/processing/issues/3288 -->
-
   <fileset dir="macosx/work/Processing.app/Contents" id="jdk-optional-macosx">
     <include name="PlugIns/jdk-${jdk.esoteric}+${jdk.build}/Contents/Home/lib/src.zip" />
     <!-- <include name="Java/core/library/libjfxwebkit.dylib" /> -->
@@ -141,9 +115,11 @@
 
       <property name="jdk.data.model" value="@{datamodel}" />
 
+      <!--
       <property name="jfx.path.zip" value="${target-platform}/jfx-${jfx.name}.zip" />
       <property name="jfx.path.dist" value="${target-platform}/javafx-sdk-${jfx.name}" />
       <property name="jfx.path.lib" value="${jfx.path.dist}/lib" />
+      -->
 
       <condition property="jdk.tgz.path" value="${target-platform}/jdk-${jdk.esoteric}.tgz">
         <not>
@@ -157,87 +133,17 @@
     </sequential>
   </macrodef>
 
-  <macrodef name="preparejfx">
-    <sequential>
-      <if>
-        <equals arg1="${jfx.available}" arg2="true" />
-        <then>
-          <!-- Extract JavaFX -->
-          <echo message="Target jfx: ${jfx.path.zip}"/>
-          <unzip dest="${target-platform}" src="${jfx.path.zip}" overwrite="true">
-            <patternset>
-              <!-- These two aren't supported/used anyway -->
-              <!-- javafx.web.jar, javafx-swt.jar -->
-              <exclude name="**/javafx.web.jar" />
-              <exclude name="**/javafx-swt.jar" />
-              <!-- The web library isn't included because this library is massive.
-                   Remove libjfxwebkit.dylib, libjfxwebkit.so, jfxwebkit.dll -->
-              <exclude name="**/*jfxwebkit.*" />
-              <!-- Not using this either -->
-              <exclude name="**/src.zip" />
-            </patternset>
-          </unzip>
-          <!-- <fail message="should be clean inside ${target-platform}" /> -->
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
-  <macrodef name="nativecopy">
-    <attribute name="src"/>
-    <attribute name="dest"/>
-    <sequential>
-
-      <local name="src-abs"/>
-      <local name="dest-abs"/>
-      <local name="src-local"/>
-      <local name="dest-local"/>
-
-      <property name="src-abs" value="${basedir}/@{src}"/>
-      <property name="dest-abs" value="${basedir}/@{dest}"/>
-
-      <if>
-        <equals arg1="${host-platform}" arg2="windows" />
-        <then>
-          <propertyregex property="src-local"
-               input="${src-abs}"
-               regexp="/"
-               replace="\\\\"
-               global="true" />
-          <propertyregex property="dest-local"
-              input="${dest-abs}"
-              regexp="/"
-              replace="\\\\"
-              global="true" />
-
-          <echo message="Native copy of ${src-local} to ${dest-local}" />
-          <exec executable="cmd">
-            <arg line="/C xcopy /s/Y ${src-local} ${dest-local}" />
-          </exec>
-        </then>
-      </if>
-
-      <if>
-        <not><equals arg1="${host-platform}" arg2="windows" /></not>
-        <then>
-          <echo message="Native copy of ${src-abs} to ${dest-abs}" />
-          <exec executable="sh">
-            <arg line="-c 'cp ${src-abs} ${dest-abs}'"/>
-          </exec>
-        </then>
-      </if>
-    </sequential>
-  </macrodef>
-
   <target name="jdk-check">
     <echo message="Checking for ${jdk.tgz.path}" />
     <available file="${jdk.tgz.path}" property="jdk.tgz.downloaded" />
     <echo message="Result: ${jdk.tgz.downloaded}" />
   </target>
 
+  <!--
   <target name="jfx-check">
     <available file="${jfx.path.zip}" property="jfx.zip.downloaded" />
   </target>
+  -->
 
   <target name="downloader-setup">
     <!-- make sure we're built -->
@@ -271,40 +177,6 @@
                 path="${jdk.tgz.path}" />
   </target>
 
-  <target name="jfx-download" depends="jfx-check, downloader-setup"
-          unless="jfx.zip.downloaded">
-
-    <condition property="jfx.platform" value="linux">
-      <equals arg1="${target-platform}" arg2="linux" />
-    </condition>
-
-    <condition property="jfx.platform" value="mac">
-      <equals arg1="${target-platform}" arg2="macosx" />
-    </condition>
-
-    <condition property="jfx.platform" value="windows">
-      <equals arg1="${target-platform}" arg2="windows" />
-    </condition>
-
-    <property name="jfx.url"
-              value="https://gluonhq.com/download/javafx-${jfx.name}-sdk-${jfx.platform}" />
-
-    <echo message="${jfx.platform} ${jfx.name} ${jfx.url}" />
-    <get src="${jfx.url}"
-             dest="${jfx.path.zip}"
-             usetimestamp="true" />
-    <!--
-    <downloader component="jfx"
-                train="${jfx.train}"
-                version="${jfx.version}"
-                platform="${target-platform}${jdk.data.model}"
-                update="${jfx.update}"
-                build="1"
-                flavor="${target-platform}${jdk.data.model}.zip"
-                path="${jfx.path.zip}" />
-    -->
-  </target>
-
   <!-- Set the version of Java that must be present to build. -->
   <property name="jdk.path.macosx" value="macosx/jdk-${jdk.esoteric}+${jdk.build}" />
 
@@ -410,6 +282,7 @@
     <subant buildpath="../core" target="clean"/>
     <subant buildpath="../app" target="clean"/>
     <subant buildpath="../java/libraries/dxf" target="clean"/>
+    <subant buildpath="../java/libraries/javafx" target="clean"/>
     <subant buildpath="../java/libraries/io" target="clean"/>
     <subant buildpath="../java/libraries/net" target="clean"/>
     <subant buildpath="../java/libraries/pdf" target="clean"/>
@@ -432,6 +305,7 @@
     <subant buildpath="../core" target="build"/>
     <subant buildpath="../app" target="build"/>
     <subant buildpath="../java/libraries/dxf" target="build"/>
+    <subant buildpath="../java/libraries/javafx" target="build"/>
     <subant buildpath="../java/libraries/net" target="build"/>
     <subant buildpath="../java/libraries/pdf" target="build"/>
     <subant buildpath="../java/libraries/serial" target="build"/>
@@ -586,7 +460,7 @@
     </if>
   </target>
 
-  <target name="macosx-build" depends="revision-check, macosx-check-os, subprojects-build, jdk-download, jfx-download" description="Build Mac OS X version">
+  <target name="macosx-build" depends="revision-check, macosx-check-os, subprojects-build, jdk-download" description="Build Mac OS X version">
     <mkdir dir="macosx/work" />
 
     <!-- Extract JDK -->
@@ -689,7 +563,8 @@
       <!-- Make it possible to get to JavaFX and JOGL libraries for Tools, Modes, etc.
            Not recommended, to use those, but making it possible since some Tools
            rely on JavaFX. (The OpenGL support is only incidental.) -->
-      <option value="-Djava.library.path=$APP_ROOT/Contents/Java:$APP_ROOT/Contents/Java/core/library" />
+      <!-- <option value="-Djava.library.path=$APP_ROOT/Contents/Java:$APP_ROOT/Contents/Java/core/library" /> -->
+      <option value="-Djava.library.path=$APP_ROOT/Contents/Java:$APP_ROOT/Contents/Java/modes/java/libraries/javafx/library/macosx64" />
 
       <!-- Necessary to avoid complaints because JavaFX wants to be a module -->
       <option value="--module-path=$APP_ROOT/Contents/Java/core/library" />
@@ -756,9 +631,10 @@
       <fileset file="shared/changes.md" />
     </copy>
 
-    <preparejfx />
+    <!-- <preparejfx /> -->
 
     <!-- Pull in OpenJFX (separated from mainline Java in JDK 11). -->
+    <!--
     <if>
       <equals arg1="${jfx.available}" arg2="true" />
       <then>
@@ -776,6 +652,7 @@
 
       </then>
     </if>
+    -->
 
     <!-- Use the Processing executable as the stub for exported apps.
          This works b/c everything app-specific is in Info.plist. -->
@@ -821,10 +698,12 @@
       <arg line="${jdk.path.macosx}"/>
     </exec>
 
+    <!--
     <exec executable="rm">
       <arg value="-r"/>
       <arg line="${jfx.path.dist}"/>
     </exec>
+    -->
 
   </target>
 
@@ -1059,7 +938,7 @@
     </if>
   </target>
 
-  <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, jdk-download, jfx-download, subprojects-build, subprojects-build-linux-arm32, subprojects-build-linux-arm64" description="Build Linux version">
+  <target name="linux-build" depends="ignore-tools, check-linux-arm32, check-linux-arm64, revision-check, linux-check-os, jdk-download, subprojects-build, subprojects-build-linux-arm32, subprojects-build-linux-arm64" description="Build Linux version">
     <mkdir dir="linux/work" />
 
     <copy todir="linux/work" preservelastmodified="true">
@@ -1099,9 +978,10 @@
       <fileset refid="runtime.jars" />
     </copy>
 
-    <preparejfx />
+    <!-- <preparejfx /> -->
 
     <!-- Pull in OpenJFX (separated from mainline Java in JDK 11). -->
+    <!--
     <if>
       <equals arg1="${jfx.available}" arg2="true" />
       <then>
@@ -1117,6 +997,7 @@
         </copy>
       </then>
     </if>
+    -->
 
     <copy file="linux/processing" todir="linux/work" />
     <chmod perm="ugo+x" file="linux/work/processing" />
@@ -1178,10 +1059,6 @@
 
     <!-- Remove unused JRE bloat. -->
     <delete failonerror="true">
-      <!--
-      <fileset refid="javafx-basics" />
-      <fileset refid="javafx-linux-${jdk.data.model}" />
-      -->
       <fileset refid="jdk-optional-linux" />
     </delete>
 
@@ -1190,11 +1067,12 @@
       <arg line="linux/jdk-${jdk.esoteric}+${jdk.build}"/>
     </exec>
 
+    <!--
     <exec executable="rm">
       <arg value="-r"/>
       <arg line="${jfx.path.dist}"/>
     </exec>
-
+    -->
   </target>
 
   <target name="linux-run" depends="linux-build"
@@ -1355,7 +1233,7 @@
     <!-- Left for consistency. Windows can be built on mac, linux, or windows. -->
   </target>
 
-  <target name="windows-build" depends="ignore-tools, revision-check, windows-check-os, jdk-download, jfx-download, subprojects-build" description="Build Windows version">
+  <target name="windows-build" depends="ignore-tools, revision-check, windows-check-os, jdk-download, subprojects-build" description="Build Windows version">
     <mkdir dir="windows/work" />
 
     <!-- assemble the pde -->
@@ -1389,34 +1267,7 @@
       <fileset file="shared/changes.md" />
     </copy>
 
-    <preparejfx />
-
-    <!-- Pull in OpenJFX (separated from mainline Java in JDK 11). -->
-    <if>
-      <equals arg1="${jfx.available}" arg2="true" />
-      <then>
-
-        <!-- Use native copy command due to binary file corruption. See
-          https://ant.apache.org/manual/Tasks/copy.html#encoding. Extraneous
-          files removed later. -->
-
-        <nativecopy
-          src="${jfx.path.lib}/*.jar"
-          dest="windows/work/core/library" />
-
-        <nativecopy
-          src="${jfx.path.dist}/bin/*.dll"
-          dest="windows/work/core/library" />
-
-        <mkdir dir="windows/work/java/legal/openjfx" />
-
-        <copy todir="windows/work/java/legal/openjfx" overwrite="true">
-          <fileset dir="${jfx.path.dist}/legal" includes="**"/>
-        </copy>
-
-        <delete failonerror="false" dir="${jfx.path.dist}" />
-      </then>
-    </if>
+    <!-- <preparejfx /> -->
 
     <fixcrlf file="windows/work/changes.md" eol="crlf" encoding="UTF-8" />
 
@@ -1479,16 +1330,6 @@
       <fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
     </chmod>
 
-    <!-- starting with 2.0a7, require the local JRE + tools.jar -->
-<!--
-    <get src="http://download.processing.org/java/${jdk.file}"
-         dest="windows/jdk.tgz"
-         usetimestamp="true" />
--->
-
-    <!--
-    <unzip dest="windows/work" src="windows/jdk.zip" overwrite="false"/>
-    -->
     <!-- Hopefully this is OK with the permissions (unlike Linux),
          since those shouldn't matter on Windows. -->
     <unzip dest="windows/work"
@@ -1501,10 +1342,6 @@
 
     <!-- Remove unused JRE bloat. -->
     <delete failonerror="true">
-      <!--
-      <fileset refid="javafx-basics" />
-      <fileset refid="javafx-windows" />
-      -->
       <fileset refid="jdk-optional-windows" />
     </delete>
   </target>
@@ -1517,15 +1354,6 @@
 
   <target name="windows-dist" depends="windows-build"
           description="Create .zip files of windows version">
-    <!--
-    <zip basedir="windows/work"
-         prefix="processing-${version}"
-         destfile="windows/processing-${version}.zip" />
-    <zip basedir="windows/work"
-         prefix="processing-${version}"
-         destfile="windows/processing-${version}-expert.zip"
-         excludes="java/**" />
-    -->
 
     <property name="windows.dist" value="windows/processing-${version}-windows${jdk.data.model}.zip" />
 
@@ -1534,15 +1362,6 @@
                   prefix="processing-${version}" />
     </zip>
 
-<!-- Expert is too much of a headache. Just nix it for 2.0. -->
-<!--
-    <zip destfile="windows/processing-${version}-windows-expert.zip">
-      <zipfileset dir="windows/work"
-                  prefix="processing-${version}"
-                  excludes="java/**" />
-    </zip>
--->
-
     <echo>
       =======================================================
       Processing for Windows was built. Grab the archive from
@@ -1663,7 +1482,7 @@ remove the spaces for depth since it should be double dash, but screws up commen
 
       <!-- provide links for java.* classes.
            also suppresses the java.lang prefix in the text.  -->
-      <link href="http://docs.oracle.com/javase/7/docs/api/" />
+      <link href="https://docs.oracle.com/en/java/javase/11/docs/api/" />
 
       <!-- prevent files from always appearing to have changed -->
       <arg value="-notimestamp" />
@@ -1698,13 +1517,13 @@ remove the spaces for depth since it should be double dash, but screws up commen
       <arg line="everything -type f -exec rm -rf {} ';'" />
     </exec>
 
-    <javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr-4.7.2-complete.jar:../app/lib/apple.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf:../java/libraries/serial/library:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
+    <javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr-4.7.2-complete.jar:../app/lib/apple.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf:../java/libraries/javafx:../java/libraries/serial/library:${java.home}/lib/tools.jar" destdir="javadoc/everything" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
 
       <arg value="-notimestamp" />
 
       <arg value="-quiet" />
 
-      <link href="http://docs.oracle.com/javase/7/docs/api/" />
+      <link href="https://docs.oracle.com/en/java/javase/11/docs/api/" />
 
       <packageset dir="../app/src">
         <include name="antlr/**" />
@@ -1739,13 +1558,13 @@ remove the spaces for depth since it should be double dash, but screws up commen
       <arg line="libraries -type f -exec rm -rf {} ';'" />
     </exec>
 
-    <javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr-4.7.2-complete.jar:../app/lib/apple.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/library/batik-dom-1.8.jar:../java/libraries/svg/library/batik-svggen-1.8.jar:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf:../java/libraries/serial/library/jssc.jar:${java.home}/lib/tools.jar" destdir="javadoc/libraries" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
+    <javadoc access="public" author="false" classpath="../app/lib/ant.jar:../app/lib/ant-launcher.jar:../app/lib/antlr-4.7.2-complete.jar:../app/lib/apple.jar:../app/lib/jna.jar:../app/lib/jna-platform.jar:../core/bin:../core/library/gluegen-rt.jar:../core/library/jogl-all.jar:../java/libraries/svg/library/batik-dom-1.8.jar:../java/libraries/svg/library/batik-svggen-1.8.jar:../java/libraries/pdf/library/itext.jar:../java/libraries/dxf:../java/libraries/javafx:../java/libraries/serial/library/jssc.jar:${java.home}/lib/tools.jar" destdir="javadoc/libraries" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" source="1.8" splitindex="false" use="false" version="false" noqualifier="all">
 
       <arg value="-notimestamp" />
 
       <arg value="-quiet" />
 
-      <link href="http://docs.oracle.com/javase/7/docs/api/" />
+      <link href="https://docs.oracle.com/en/java/javase/11/docs/api/" />
       <link href="../../javadoc/core/" />
 
       <tag name="webref" enabled="false" />
@@ -1762,6 +1581,9 @@ remove the spaces for depth since it should be double dash, but screws up commen
         <include name="antlr/**" />
         <include name="processing/**" />
       </packageset>
+      <packageset dir="../java/libraries/javafx/src">
+        <include name="processing/**" />
+      </packageset>
       <packageset dir="../java/libraries/io/src">
         <include name="antlr/**" />
         <include name="processing/**" />
diff --git a/build/windows/config.xml b/build/windows/config.xml
index cb4071f10..c41d49347 100755
--- a/build/windows/config.xml
+++ b/build/windows/config.xml
@@ -23,21 +23,26 @@
     <cp>lib/ant.jar</cp>
     <cp>lib/ant-launcher.jar</cp>
 
-    <cp>core/library/javafx.base.jar</cp>
-    <cp>core/library/javafx.controls.jar</cp>
-    <cp>core/library/javafx.fxml.jar</cp>
-    <cp>core/library/javafx.graphics.jar</cp>
-    <cp>core/library/javafx.media.jar</cp>
-    <cp>core/library/javafx.swing.jar</cp>
     <!-- <cp>%EXEDIR%/java/lib/tools.jar</cp> -->
+
+    <cp>modes/java/libraries/javafx/library/javafx.base.jar</cp>
+    <cp>modes/java/libraries/javafx/library/javafx.controls.jar</cp>
+    <cp>modes/java/libraries/javafx/library/javafx.fxml.jar</cp>
+    <cp>modes/java/libraries/javafx/library/javafx.graphics.jar</cp>
+    <cp>modes/java/libraries/javafx/library/javafx.media.jar</cp>
+    <cp>modes/java/libraries/javafx/library/javafx.swing.jar</cp>
   </classPath>
   <jre>
     <path>java</path>
     <!-- Make it possible access JavaFX and JOGL libraries for Tools,
          Modes, etc. Not recommended, but making it possible because
          some Tools rely on JavaFX. (OpenGL is only incidental.) -->
-    <opt>-Djava.library.path=lib;core/library</opt>
-    <opt>--module-path=core/library</opt>
+    <!-- <opt>-Djava.library.path=lib;core/library</opt> -->
+    <!-- <opt>-\-module-path=core/library</opt> -->
+    <!-- Make it possible access JavaFX for Tools, Modes, etc. Not recommended,
+         but making it possible for 4.x because some Tools rely on JavaFX. -->
+    <opt>-Djava.library.path=lib;modes/java/libraries/javafx/library</opt>
+    <opt>--module-path=modes/java/libraries/javafx/library/windows64</opt>
 
     <!-- Java 9+ handles high DPI internally so OS display scaling -->
     <!-- can cause display issues with custom rendering swing elements. -->
diff --git a/core/src/processing/javafx/PGraphicsFX2D.java b/java/libraries/javafx/src/processing/javafx/PGraphicsFX2D.java
similarity index 100%
rename from core/src/processing/javafx/PGraphicsFX2D.java
rename to java/libraries/javafx/src/processing/javafx/PGraphicsFX2D.java
diff --git a/core/src/processing/javafx/PSurfaceFX.java b/java/libraries/javafx/src/processing/javafx/PSurfaceFX.java
similarity index 100%
rename from core/src/processing/javafx/PSurfaceFX.java
rename to java/libraries/javafx/src/processing/javafx/PSurfaceFX.java
diff --git a/todo.txt b/todo.txt
index 3c44206fa..6be11e61e 100755
--- a/todo.txt
+++ b/todo.txt
@@ -36,10 +36,16 @@ X   https://github.com/processing/processing/issues/3288
 o   these will change again for Java 11, so wait until then
 X   opting not to do so
 X   https://github.com/processing/processing4/issues/210
+X move JavaFX to its own library, too many weird quirks that it includes
+o   build bits should be in core/build.xml or javafx/build.xml
+X   by moving it out, all the strangeness of download and import is outside core
 
+_ fix modules path warning for Tools in the PDE
+_ update for new modules path when running from the PDE
+_ update modules path when exporting application
+
+_ automatically import JavaFX if FX2D is in sketch? or tell user?
 
-_ move JavaFX to its own library, too many weird quirks that it includes
-_   build bits should be in core/build.xml or javafx/build.xml
 _ Remove usage of com.sun.* in JavaFX library
 _   https://github.com/processing/processing4/issues/208
 _ Only specify --modules-path when running JavaFX apps