diff --git a/build.gradle b/build.gradle
index 2ddb0d460d..31ab676f27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -53,7 +53,7 @@ configure(subprojects) {
         httpcoreVersion = '4.4.13'
         ioVersion = '2.6'
         jacksonVersion = '2.12.1'
-        javafxVersion = '15'
+        javafxVersion = '16'
         javaxAnnotationVersion = '1.2'
         jcsvVersion = '1.4.0'
         jetbrainsAnnotationsVersion = '13.0'
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index 211c8949fe..3d771bed4d 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -3028,79 +3028,79 @@
             <sha256 value="0859ba0d5cfeefb13964e5862c036faa48a0bccff4932638fb13fe3445df33f7" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.openjfx" name="javafx" version="15">
-         <artifact name="javafx-15.pom">
-            <sha256 value="d264ed93d4e87ea92768fa794029c8154efd69428cf7edd28c789794de0a5aff" origin="Generated by Gradle"/>
+      <component group="org.openjfx" name="javafx" version="16">
+         <artifact name="javafx-16.pom">
+            <sha256 value="18d9784212d04475bfe4a5f4038e0fc78146f9a721eb6b9a52955d3b4b20d3ca" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.openjfx" name="javafx-base" version="15">
-         <artifact name="javafx-base-15-linux.jar">
-            <sha256 value="d53dc58ade915119e297fefe0e015c9bded4c7cf5de71779fa879a6d4bf933dd" origin="Generated by Gradle"/>
+      <component group="org.openjfx" name="javafx-base" version="16">
+         <artifact name="javafx-base-16-linux.jar">
+            <sha256 value="b825e220d685ecbd77e76f2cd52793132e6c9a10e23ee3361673cb29033413c0" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-base-15-mac.jar">
-            <sha256 value="6df1310e45b3092d7461881b9180c5bc27df852735ec1eeb2aaa48478d466ceb" origin="Generated by Gradle"/>
+         <artifact name="javafx-base-16-mac.jar">
+            <sha256 value="8cb4a023706d392d0a733aaee41be839e8418448ab0090a8115a9b909d595c77" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-base-15-win.jar">
-            <sha256 value="c17d575ad74f42ae9d1fb52cda5c6d824512a99e6a078c155bf24223ed63a1e7" origin="Generated by Gradle"/>
+         <artifact name="javafx-base-16-win.jar">
+            <sha256 value="23abcdffb6f92d8b37531080682034d01c177f1229118a2f7646331c51c6ed63" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-base-15.jar">
-            <sha256 value="4b7bc8edb034b8ba42891d02e9c437e576a4684d12186a088ee5a808bc14c591" origin="Generated by Gradle"/>
+         <artifact name="javafx-base-16.jar">
+            <sha256 value="036955291b3633b6e11106df315f7a561218d31dcb4280078fe4d2414925f557" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-base-15.pom">
-            <sha256 value="bd8228de9916bc87f683ad92776339f7b31f97c34e6a0b21c8b7a5b9a183e2e3" origin="Generated by Gradle"/>
+         <artifact name="javafx-base-16.pom">
+            <sha256 value="09fe0f2eda8b6f3d4c55b28e32b6b7b2782847add96a686d3048753baa781901" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.openjfx" name="javafx-controls" version="15">
-         <artifact name="javafx-controls-15-linux.jar">
-            <sha256 value="4648718ad38310028af53ddabf0e202773e72a67fcc41cbca0b4ee3de5847771" origin="Generated by Gradle"/>
+      <component group="org.openjfx" name="javafx-controls" version="16">
+         <artifact name="javafx-controls-16-linux.jar">
+            <sha256 value="fd0aba38a0dde9836845c6d671501f4c30e6cff6f2d72748f75742dbcfc74df9" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-controls-15-mac.jar">
-            <sha256 value="e81a892fed3af2245e24e566e9e532311eed30c7553bce86061390ee055eafb9" origin="Generated by Gradle"/>
+         <artifact name="javafx-controls-16-mac.jar">
+            <sha256 value="4add6fdf120ab9c784dc6e700c158d411d9371aaba7bbb61ad9f9d016f2cce44" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-controls-15-win.jar">
-            <sha256 value="1b4f03083565423bb5f18588472863b2e8a87efd6c7948faa36ea2584b8343b5" origin="Generated by Gradle"/>
+         <artifact name="javafx-controls-16-win.jar">
+            <sha256 value="a7f6e4757163c38a5e6cf26b426e9daf788ad1b57513111d362b3bbbc298d13b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-controls-15.jar">
-            <sha256 value="8e4f3de2828e744b29111586f16407abc1fb526ec55f3f4968d1e2a7b88956f2" origin="Generated by Gradle"/>
+         <artifact name="javafx-controls-16.jar">
+            <sha256 value="dfdbe63f9717b2cd84c9fd34b28a8ddffdbe25cc1e4c2ff9f171f07ca725e0f4" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.openjfx" name="javafx-fxml" version="15">
-         <artifact name="javafx-fxml-15-linux.jar">
-            <sha256 value="704047590d1c924d10f5383baeec53955b2ea2f4400cb1795c70f0c6fc821c73" origin="Generated by Gradle"/>
+      <component group="org.openjfx" name="javafx-fxml" version="16">
+         <artifact name="javafx-fxml-16-linux.jar">
+            <sha256 value="65249a5a47357283f21c5fa85b2e91255f7e5b0b86a2ec3dd2cc220541d7ae0b" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-fxml-15-mac.jar">
-            <sha256 value="64f072453400480965ac0acd0b6ac6e34dba5fdd19f940290dcb00183f4f01fa" origin="Generated by Gradle"/>
+         <artifact name="javafx-fxml-16-mac.jar">
+            <sha256 value="b722e590930180ff7c43d34281202251e1fe8d1f81b16098cda78600780b7f46" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-fxml-15-win.jar">
-            <sha256 value="ed32696c99a295df1d1cdb33da62ea651ba5f99d710137c8c585f6ca8f0e395a" origin="Generated by Gradle"/>
+         <artifact name="javafx-fxml-16-win.jar">
+            <sha256 value="e8313ffb783c26acbbc1267448bbfdf2f05126e5845a06c6f29a43db7483606d" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.openjfx" name="javafx-graphics" version="15">
-         <artifact name="javafx-graphics-15-linux.jar">
-            <sha256 value="5e24155331bfb779cece880d1b8acf1872f938c664b8b4b8d03d5ac9f49a0931" origin="Generated by Gradle"/>
+      <component group="org.openjfx" name="javafx-graphics" version="16">
+         <artifact name="javafx-graphics-16-linux.jar">
+            <sha256 value="a2f5e1ea5aeb3ae57e63a1c853a4edf1e38b6f2fe76997ab864ad8b3c54bed53" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-graphics-15-mac.jar">
-            <sha256 value="de7521511513260780682f22d0a258ea85f52cae62fa841fdb374f981dabdc45" origin="Generated by Gradle"/>
+         <artifact name="javafx-graphics-16-mac.jar">
+            <sha256 value="23a67ad877f283039a20dd827f68988c1f952fe4958d039c006762883f1f04ab" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-graphics-15-win.jar">
-            <sha256 value="ef64aa8713936908f547d048def872b76525da93d11492243032015da891d189" origin="Generated by Gradle"/>
+         <artifact name="javafx-graphics-16-win.jar">
+            <sha256 value="78124668c64db443cf3e105b9c2f6d7061e7c72ad5ad2de63a13adc46ef2ca8c" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-graphics-15.jar">
-            <sha256 value="4b760e04d5eba40c23613213b46eb7d8774c85e77a38955094bae12749973c36" origin="Generated by Gradle"/>
+         <artifact name="javafx-graphics-16.jar">
+            <sha256 value="77533b2922a853a3e1350c8e6650f6cf746000d20efef69119c6324086883b95" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-graphics-15.pom">
-            <sha256 value="4135bba8cbf2fcb0df88c7d50269eba9f7faf9a51079b67538b6b6162392e64d" origin="Generated by Gradle"/>
+         <artifact name="javafx-graphics-16.pom">
+            <sha256 value="b8fb99688eccae62be724bd72b34dfff1f8e1cddbe44649f5ef9a082e520c47e" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.openjfx" name="javafx-swing" version="15">
-         <artifact name="javafx-swing-15-linux.jar">
-            <sha256 value="f18b5f978b5be8e4f7d0ab74bf12dc1ccc86eebda3070db6989a21350ccb2fa5" origin="Generated by Gradle"/>
+      <component group="org.openjfx" name="javafx-swing" version="16">
+         <artifact name="javafx-swing-16-linux.jar">
+            <sha256 value="ffb495dbbf314f56784828b91ee2cc304bd891b862b79fdd7f3338e6cffd74f7" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-swing-15-mac.jar">
-            <sha256 value="0191693946a7e23d5d6f2a2e3e6449b40e6f70d1c766a4d51e74229891a7c9e6" origin="Generated by Gradle"/>
+         <artifact name="javafx-swing-16-mac.jar">
+            <sha256 value="6b49d1754f9c987b48244c8c9612214f05229a67b7bd43f4ba98f76b4617ae56" origin="Generated by Gradle"/>
          </artifact>
-         <artifact name="javafx-swing-15-win.jar">
-            <sha256 value="537903e6d0d4b4d5f2cb1859821d156b530c27f735a08218bd5ccc4b07128a05" origin="Generated by Gradle"/>
+         <artifact name="javafx-swing-16-win.jar">
+            <sha256 value="5244ee1fe470507cebeaf1111937168556163a0b90e6bf9bba5c16b4c3280012" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="org.opentest4j" name="opentest4j" version="1.2.0">