Index: CoreLibs/nbproject/project.xml
--- CoreLibs/nbproject/project.xml.orig
+++ CoreLibs/nbproject/project.xml
@@ -544,17 +544,19 @@
                 <package>org.joda.time.format</package>
                 <package>org.joda.time.tz</package>
                 <package>org.opencv.calib3d</package>
-                <package>org.opencv.contrib</package>
                 <package>org.opencv.core</package>
+                <package>org.opencv.dnn</package>
                 <package>org.opencv.features2d</package>
-                <package>org.opencv.gpu</package>
                 <package>org.opencv.highgui</package>
+                <package>org.opencv.imgcodecs</package>
                 <package>org.opencv.imgproc</package>
                 <package>org.opencv.ml</package>
                 <package>org.opencv.objdetect</package>
+                <package>org.opencv.osgi</package>
                 <package>org.opencv.photo</package>
                 <package>org.opencv.utils</package>
                 <package>org.opencv.video</package>
+                <package>org.opencv.videoio</package>
                 <package>org.sleuthkit.autopsy.corelibs</package>
                 <package>org.slf4j</package>
                 <package>org.slf4j.event</package>
@@ -917,116 +919,144 @@
                 <binary-origin>release/modules/ext/jackson-datatype-jsr310-2.18.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.14-ea2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-21.0.11-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-21.0.11-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.14-ea2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-21.0.11-openbsd.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-21.0.11-openbsd.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.14-ea2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-21.0.11-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-21.0.11-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-base-17.0.14-ea2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-base-17.0.14-ea2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-21.0.11-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-21.0.11-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.14-ea2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-base-21.0.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-base-21.0.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.14-ea2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-21.0.11-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-21.0.11-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.14-ea2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-21.0.11-openbsd.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-21.0.11-openbsd.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-controls-17.0.14-ea2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-controls-17.0.14-ea2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-21.0.11-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-21.0.11-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-21.0.11-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-21.0.11-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-controls-21.0.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-controls-21.0.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-21.0.11-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-21.0.11-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-fxml-17.0.14-ea2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-fxml-17.0.14-ea2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-21.0.11-openbsd.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-21.0.11-openbsd.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-21.0.11-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-21.0.11-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-21.0.11-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-21.0.11-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-fxml-21.0.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-fxml-21.0.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-graphics-17.0.14-ea2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-graphics-17.0.14-ea2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-21.0.11-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-21.0.11-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.14-ea2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-21.0.11-openbsd.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-21.0.11-openbsd.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.14-ea2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-21.0.11-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-21.0.11-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.14-ea2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-21.0.11-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-21.0.11-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-media-17.0.14-ea2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-media-17.0.14-ea2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-graphics-21.0.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-graphics-21.0.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.14-ea2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-21.0.11-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-21.0.11-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.14-ea2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-21.0.11-openbsd.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-21.0.11-openbsd.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.14-ea2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-21.0.11-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-21.0.11-mac.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-swing-17.0.14-ea2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-swing-17.0.14-ea2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-21.0.11-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-21.0.11-win.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.14-ea2-linux.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea2-linux.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-media-21.0.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-media-21.0.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.14-ea2-mac.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea2-mac.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-21.0.11-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-21.0.11-linux.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.14-ea2-win.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea2-win.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-21.0.11-openbsd.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-21.0.11-openbsd.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/javafx-web-17.0.14-ea2.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/javafx-web-17.0.14-ea2.jar</binary-origin>
+                <runtime-relative-path>ext/javafx-swing-21.0.11-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-21.0.11-mac.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/javafx-swing-21.0.11-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-21.0.11-win.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/javafx-swing-21.0.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-swing-21.0.11.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/javafx-web-21.0.11-linux.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-21.0.11-linux.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/javafx-web-21.0.11-openbsd.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-21.0.11-openbsd.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/javafx-web-21.0.11-mac.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-21.0.11-mac.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/javafx-web-21.0.11-win.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-21.0.11-win.jar</binary-origin>
+            </class-path-extension>
+            <class-path-extension>
+                <runtime-relative-path>ext/javafx-web-21.0.11.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/javafx-web-21.0.11.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/javax.annotation-api-1.3.2.jar</runtime-relative-path>
