diff --git a/docker/sofabuilder_fedora/Dockerfile b/docker/sofabuilder_fedora/Dockerfile
index 9331295..9a9e9a6 100644
--- a/docker/sofabuilder_fedora/Dockerfile
+++ b/docker/sofabuilder_fedora/Dockerfile
@@ -54,23 +54,27 @@ RUN yum install -y -q \
     assimp-devel \
     opencascade-devel \
     libXrandr-devel \
-    tinyxml2-devel
+    tinyxml2-devel \
+    xorg-x11-server-devel\
+    gtk3-devel
+
+ENV VM_BUILDS_IMGUI="false"
 
 # Install pip, numpy, scipy, pybind11
-ARG PYBIND11_VERSION=2.9.1
+ARG PYBIND11_VERSION=2.11.1
 #RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \
 #    && python2.7 /tmp/get-pip2.py \
 #    && python2.7 -m pip install --upgrade "pip == 20.3.4" \
 #    && python2.7 -m pip install "numpy == 1.16.6" "scipy == 1.2.3" "matplotlib == 2.2.5"
 #RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py
 #RUN python3.10 /tmp/get-pip3.py
-RUN python3.10 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+RUN python3.10 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION
 RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
     && python3.11 /tmp/get-pip3.py \
-    && python3.11 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.11 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION
 RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
     && python3.12 /tmp/get-pip3.py \
-    && python3.12 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.12 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION
 ENV PYTHONPATH=""
 ENV VM_HAS_ASSIMP="true"
 ENV VM_HAS_OPENCASCADE="false"
diff --git a/docker/sofabuilder_ubuntu/Dockerfile b/docker/sofabuilder_ubuntu/Dockerfile
index 6fac2ce..42cd2cc 100644
--- a/docker/sofabuilder_ubuntu/Dockerfile
+++ b/docker/sofabuilder_ubuntu/Dockerfile
@@ -51,7 +51,7 @@ RUN apt-get install -y \
     python2.7-dev \
     python3.10-dev python3.10-distutils \
     python3.11-dev python3.11-distutils \
-    python3.12-dev python3.12-distutils \
+    python3.12-dev \
     libpng-dev libjpeg-dev libtiff-dev \
     libblas-dev \
     liblapack-dev \
@@ -61,10 +61,13 @@ RUN apt-get install -y \
     liboce-ocaf-dev \
     libzmq3-dev liboscpack-dev \
     libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev \
-    libtinyxml2-dev
+    libtinyxml2-dev \
+    xorg-dev\
+    libgtk-3-dev
 
+ENV VM_BUILDS_IMGUI="true"
 # Install pip, numpy, scipy, pybind11
-ARG PYBIND11_VERSION=2.9.1
+ARG PYBIND11_VERSION=2.11.1
 RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.py \
     && python2.7 /tmp/get-pip2.py \
     && python2.7 -m pip install --upgrade "pip == 20.3.4" \
@@ -72,15 +75,15 @@ RUN curl -L https://bootstrap.pypa.io/pip/2.7/get-pip.py --output /tmp/get-pip2.
 RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
     && python3.10 /tmp/get-pip3.py \
     && python3.10 -m pip install --upgrade pip \
-    && python3.10 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.10 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION mypy pybind11-stubgen
 RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
     && python3.11 /tmp/get-pip3.py \
     && python3.11 -m pip install --upgrade pip \
-    && python3.11 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.11 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION mypy pybind11-stubgen
 RUN curl -L https://bootstrap.pypa.io/pip/get-pip.py --output /tmp/get-pip3.py \
     && python3.12 /tmp/get-pip3.py \
     && python3.12 -m pip install --upgrade pip \
-    && python3.12 -m pip install numpy scipy matplotlib pybind11==$PYBIND11_VERSION
+    && python3.12 -m pip install numpy==1.26.4 scipy matplotlib pybind11==$PYBIND11_VERSION mypy pybind11-stubgen
 ENV VM_HAS_ASSIMP="true"
 ENV VM_HAS_OPENCASCADE="true"
 
diff --git a/scripts/configure.sh b/scripts/configure.sh
index c47fa4c..922f7a2 100644
--- a/scripts/configure.sh
+++ b/scripts/configure.sh
@@ -70,7 +70,7 @@ if vm-is-windows && [ ! -d "$SRC_DIR/lib" ]; then
     (
     cd "$SRC_DIR"
     echo "Copying dependency pack in the source tree."
-    curl -L "https://github.com/guparan/ci/raw/tmp_windeppack/setup/WinDepPack.zip" --output dependencies_tmp.zip
+    curl -L "https://www.sofa-framework.org/download/WinDepPack/latest/" --output dependencies_tmp.zip
     unzip dependencies_tmp.zip -d dependencies_tmp > /dev/null
     cp -rf dependencies_tmp/*/* "$SRC_DIR"
     rm -rf dependencies_tmp*
@@ -319,6 +319,7 @@ fi
 ######################
 
 # Options common to all configurations
+add-cmake-option "-DSOFA_ENABLE_LEGACY_HEADERS=ON"
 add-cmake-option "-DAPPLICATION_GETDEPRECATEDCOMPONENTS=ON"
 add-cmake-option "-DSOFA_BUILD_APP_BUNDLE=OFF" # MacOS
 add-cmake-option "-DSOFA_WITH_DEPRECATED_COMPONENTS=ON"
@@ -398,6 +399,9 @@ elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
     add-cmake-option "-DPLUGIN_SOFTROBOTS=ON -DSOFA_FETCH_SOFTROBOTS=ON"
     add-cmake-option "-DPLUGIN_SHAPEMATCHINGPLUGIN=ON -DSOFA_FETCH_SHAPEMATCHINGPLUGIN=ON"
     add-cmake-option "-DPLUGIN_CSPARSESOLVERS=ON -DSOFA_FETCH_CSPARSESOLVERS=ON"
+    add-cmake-option "-DPLUGIN_MODELORDERREDUCTION=ON -DSOFA_FETCH_MODELORDERREDUCTION=ON"
+    add-cmake-option "-DPLUGIN_SOFA_METIS=ON -DSOFA_FETCH_SOFA.METIS=ON"
+
     if [[ "$VM_HAS_BULLET" == "true" ]]; then
         add-cmake-option "-DPLUGIN_BULLETCOLLISIONDETECTION=ON"
     else
@@ -419,7 +423,6 @@ elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
     add-cmake-option "-DPLUGIN_DIFFUSIONSOLVER=ON"
     add-cmake-option "-DPLUGIN_GEOMAGIC=ON"
     add-cmake-option "-DPLUGIN_IMAGE=ON"
-    add-cmake-option "-DPLUGIN_INVERTIBLEFVM=ON -DSOFA_FETCH_INVERTIBLEFVM=ON"
     add-cmake-option "-DPLUGIN_MANIFOLDTOPOLOGIES=ON -DSOFA_FETCH_MANIFOLDTOPOLOGIES=ON"
     add-cmake-option "-DPLUGIN_MANUALMAPPING=ON"
     if [[ "$VM_HAS_OPENCASCADE" == "true" ]]; then
@@ -430,31 +433,38 @@ elif in-array "build-scope-full" "$BUILD_OPTIONS"; then
     add-cmake-option "-DPLUGIN_MULTITHREADING=ON"
     add-cmake-option "-DPLUGIN_PLUGINEXAMPLE=ON -DSOFA_FETCH_PLUGINEXAMPLE=ON"
     add-cmake-option "-DPLUGIN_REGISTRATION=ON -DSOFA_FETCH_REGISTRATION=ON"
-    add-cmake-option "-DPLUGIN_SENSABLEEMULATION=ON"
     add-cmake-option "-DPLUGIN_SOFACARVING=ON"
     if [[ "$VM_HAS_CUDA" == "true" ]]; then
         add-cmake-option "-DPLUGIN_SOFACUDA=ON -DSOFACUDA_DOUBLE=ON"
         if in-array "build-release-package" "$BUILD_OPTIONS"; then
-            add-cmake-option "-DCUDA_ARCH_LIST=6.0;6.1;7.0;7.5"
+            add-cmake-option "-DCUDA_ARCH_LIST=6.0;6.1;7.0;7.5;8.0;8.6;8.9"
         else
-            add-cmake-option "-DCUDA_ARCH_LIST=6.0;7.5"
+            add-cmake-option "-DCUDA_ARCH_LIST=6.0;8.9"
         fi
     else
         add-cmake-option "-DPLUGIN_SOFACUDA=OFF"
     fi
     add-cmake-option "-DPLUGIN_SOFADISTANCEGRID=ON"
     add-cmake-option "-DPLUGIN_SOFAEULERIANFLUID=ON"
-    add-cmake-option "-DPLUGIN_SOFAGLFW=ON" "-DPLUGIN_SOFAIMGUI=OFF" "-DAPPLICATION_RUNSOFAGLFW=ON" "-DSOFA_FETCH_SOFAGLFW=ON"
+    add-cmake-option "-DPLUGIN_SOFAGLFW=ON"  "-DAPPLICATION_RUNSOFAGLFW=ON" "-DSOFA_FETCH_SOFAGLFW=ON"
+    if [[ "$VM_BUILDS_IMGUI" == "true" ]]; then
+		    add-cmake-option "-DPLUGIN_SOFAIMGUI=ON"
+		fi
     add-cmake-option "-DPLUGIN_SOFAIMPLICITFIELD=ON"
-    add-cmake-option "-DPLUGIN_SOFASIMPLEGUI=ON" # Not sure if worth maintaining
     add-cmake-option "-DPLUGIN_SOFASPHFLUID=ON -DSOFA_FETCH_SOFASPHFLUID=ON"
     add-cmake-option "-DPLUGIN_COLLISIONOBBCAPSULE=ON"
     add-cmake-option "-DPLUGIN_THMPGSPATIALHASHING=OFF -DSOFA_FETCH_THMPGSPATIALHASHING=ON"
     add-cmake-option "-DPLUGIN_VOLUMETRICRENDERING=ON"
+
+    if [[ "$VM_HAS_CUDA" == "true" ]]; then
+      add-cmake-option "-DPLUGIN_VOLUMETRICRENDERING_CUDA=ON"
+      add-cmake-option "-DPLUGIN_SOFADISTANCEGRID_CUDA=ON"
+    fi
 fi
 
 # Generate binaries?
 if in-array "build-release-package" "$BUILD_OPTIONS"; then
+    add-cmake-option "-DSOFA_WITH_DEVTOOLS=OFF"
     add-cmake-option "-DSOFA_BUILD_RELEASE_PACKAGE=ON"
     if [[ "$BUILD_TYPE_CMAKE" == "Release" ]]; then
         add-cmake-option "-DCMAKE_BUILD_TYPE=MinSizeRel"
diff --git a/scripts/env/consortium-macos-2 b/scripts/env/consortium-macos-2
index c4645a2..feece56 100644
--- a/scripts/env/consortium-macos-2
+++ b/scripts/env/consortium-macos-2
@@ -8,6 +8,9 @@ export VM_MAX_PARALLEL_TESTS="4"
 
 export VM_CCACHE_MAXSIZE="16G"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 
@@ -20,32 +23,33 @@ export VM_HAS_CUDA="false"
 export VM_HAS_OPENCASCADE="false"
 
 
-export VM_QT_PATH="/opt/homebrew/opt/qt5"
+export VM_QT_PATH="/opt/homebrew/Cellar/qt@5/5.15.13/"
 
 x86_root="/usr/local"
 arm_root="/opt/homebrew"
 export VM_PYTHON_EXECUTABLE=""
 export VM_PYTHON_PYTHONPATH=""
-export VM_PYTHON3_EXECUTABLE="$arm_root/opt/python@3.10/bin/python3"
+export VM_PYTHON3_EXECUTABLE="$arm_root/opt/python@3.10/bin/python3.10"
 export VM_PYTHON3_PYTHONPATH="$arm_root/lib/python3.10/site-packages"
 if [[ -n "$CI_PYTHON3_VERSION" ]] &&
-   [[ -e "$x86_root/opt/python@$CI_PYTHON3_VERSION/bin/python3" ]] &&
+   [[ -e "$x86_root/opt/python@$CI_PYTHON3_VERSION/bin/python$CI_PYTHON3_VERSION" ]] &&
    [[ -e "$x86_root/lib/python$CI_PYTHON3_VERSION/site-packages" ]]; then
-    export VM_PYTHON3_EXECUTABLE="$x86_root/opt/python@$CI_PYTHON3_VERSION/bin/python3"
+    export VM_PYTHON3_EXECUTABLE="$x86_root/opt/python@$CI_PYTHON3_VERSION/bin/python$CI_PYTHON3_VERSION"
     export VM_PYTHON3_PYTHONPATH="$x86_root/lib/python$CI_PYTHON3_VERSION/site-packages"
 fi
 if [[ -n "$CI_PYTHON3_VERSION" ]] &&
-   [[ -e "$arm_root/opt/python@$CI_PYTHON3_VERSION/bin/python3" ]] &&
+   [[ -e "$arm_root/opt/python@$CI_PYTHON3_VERSION/bin/python$CI_PYTHON3_VERSION" ]] &&
    [[ -e "$arm_root/lib/python$CI_PYTHON3_VERSION/site-packages" ]]; then
-    export VM_PYTHON3_EXECUTABLE="$arm_root/opt/python@$CI_PYTHON3_VERSION/bin/python3"
+    export VM_PYTHON3_EXECUTABLE="$arm_root/opt/python@$CI_PYTHON3_VERSION/bin/python$CI_PYTHON3_VERSION"
     export VM_PYTHON3_PYTHONPATH="$arm_root/lib/python$CI_PYTHON3_VERSION/site-packages"
 fi
 export VM_PYBIND11_CONFIG_EXECUTABLE="$VM_PYTHON3_EXECUTABLE -m pybind11"
 
+source ~/.bash_profile
+
 export PATH="\
 /opt/homebrew/opt/gnu-sed/libexec/gnubin:\
 /opt/homebrew/opt/coreutils/libexec/gnubin:\
 /opt/homebrew/opt/ccache/libexec:\
 /opt/homebrew/bin:/opt/homebrew/lib:\
-/opt/homebrew/opt/qt5/bin:\
 $PATH"
diff --git a/scripts/env/consortium-macos-3 b/scripts/env/consortium-macos-3
index 4c7ca23..47489d6 100644
--- a/scripts/env/consortium-macos-3
+++ b/scripts/env/consortium-macos-3
@@ -8,6 +8,9 @@ export VM_MAX_PARALLEL_TESTS="4"
 
 export VM_CCACHE_MAXSIZE="16G"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 
@@ -20,20 +23,28 @@ export VM_HAS_CUDA="false"
 export VM_HAS_OPENCASCADE="false"
 
 
-export VM_QT_PATH="/Users/ci/Qt/5.12.6"
+export VM_QT_PATH="/Users/ci/Qt/5.12.12"
 
+x86_root="/usr/local"
 export VM_PYTHON_EXECUTABLE=""
 export VM_PYTHON_PYTHONPATH=""
-export VM_PYTHON3_EXECUTABLE="/usr/local/opt/python@3.10/bin/python3"
-export VM_PYTHON3_PYTHONPATH="/usr/local/lib/python3.10/site-packages"
+export VM_PYTHON3_EXECUTABLE="$x86_root/opt/python@3.10/bin/python3.10"
+export VM_PYTHON3_PYTHONPATH="$x86_root/lib/python3.10/site-packages"
+if [[ -n "$CI_PYTHON3_VERSION" ]] &&
+   [[ -e "$x86_root/opt/python@$CI_PYTHON3_VERSION/bin/python$CI_PYTHON3_VERSION" ]] &&
+   [[ -e "$x86_root/lib/python$CI_PYTHON3_VERSION/site-packages" ]]; then
+    export VM_PYTHON3_EXECUTABLE="$x86_root/opt/python@$CI_PYTHON3_VERSION/bin/python$CI_PYTHON3_VERSION"
+    export VM_PYTHON3_PYTHONPATH="$x86_root/lib/python$CI_PYTHON3_VERSION/site-packages"
+fi
 if [[ -n "$CI_PYTHON3_VERSION" ]] &&
-   [[ -e "/usr/local/opt/python@$CI_PYTHON3_VERSION/bin/python3" ]] &&
-   [[ -e "/usr/local/lib/python$CI_PYTHON3_VERSION/site-packages" ]]; then
-    export VM_PYTHON3_EXECUTABLE="/usr/local/opt/python@$CI_PYTHON3_VERSION/bin/python3"
-    export VM_PYTHON3_PYTHONPATH="/usr/local/lib/python$CI_PYTHON3_VERSION/site-packages"
+   [[ -e "$x86_root/opt/python@$CI_PYTHON3_VERSION/bin/python$CI_PYTHON3_VERSION" ]] &&
+   [[ -e "$x86_root/lib/python$CI_PYTHON3_VERSION/site-packages" ]]; then
+    export VM_PYTHON3_EXECUTABLE="$x86_root/opt/python@$CI_PYTHON3_VERSION/bin/python$CI_PYTHON3_VERSION"
+    export VM_PYTHON3_PYTHONPATH="$x86_root/lib/python$CI_PYTHON3_VERSION/site-packages"
 fi
 export VM_PYBIND11_CONFIG_EXECUTABLE="$VM_PYTHON3_EXECUTABLE -m pybind11"
 
+source ~/.bash_profile
 export PATH="\
 /usr/local/opt/gnu-sed/libexec/gnubin:\
 /usr/local/opt/coreutils/libexec/gnubin:\
diff --git a/scripts/env/sofa-ci-windows10-0 b/scripts/env/sofa-ci-windows10-0
index 5f7976e..56280f0 100644
--- a/scripts/env/sofa-ci-windows10-0
+++ b/scripts/env/sofa-ci-windows10-0
@@ -18,6 +18,8 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
 
 export VM_HAS_BULLET="false"
 
diff --git a/scripts/env/sofa-ci-windows10-1 b/scripts/env/sofa-ci-windows10-1
index 5f7976e..f833ecd 100644
--- a/scripts/env/sofa-ci-windows10-1
+++ b/scripts/env/sofa-ci-windows10-1
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 
diff --git a/scripts/env/sofa-ci-windows10-2 b/scripts/env/sofa-ci-windows10-2
index 5f7976e..f833ecd 100644
--- a/scripts/env/sofa-ci-windows10-2
+++ b/scripts/env/sofa-ci-windows10-2
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 
diff --git a/scripts/env/sofa-ci-windows10-3 b/scripts/env/sofa-ci-windows10-3
index 5f7976e..f833ecd 100644
--- a/scripts/env/sofa-ci-windows10-3
+++ b/scripts/env/sofa-ci-windows10-3
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 
diff --git a/scripts/env/sofa-ci-windows10-4 b/scripts/env/sofa-ci-windows10-4
index 5f7976e..f833ecd 100644
--- a/scripts/env/sofa-ci-windows10-4
+++ b/scripts/env/sofa-ci-windows10-4
@@ -18,6 +18,9 @@ export VM_MAKE_OPTIONS="-j4"
 
 export VM_MAX_PARALLEL_TESTS="4"
 
+export VM_BUILDS_IMGUI="true"
+
+
 
 export VM_HAS_BULLET="false"
 
diff --git a/scripts/main.sh b/scripts/main.sh
index f6e66ef..3f5d6db 100644
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -373,7 +373,7 @@ if vm-is-windows; then
 else
     plugin_conf="$BUILD_DIR/lib/plugin_list.conf.default"
 fi
-grep -v "SofaCUDA " "$plugin_conf" > "${plugin_conf}.tmp" && mv "${plugin_conf}.tmp" "$plugin_conf"
+grep -v "CUDA " "$plugin_conf" > "${plugin_conf}.tmp" && mv "${plugin_conf}.tmp" "$plugin_conf"
 grep -v "SofaPython " "$plugin_conf" > "${plugin_conf}.tmp" && mv "${plugin_conf}.tmp" "$plugin_conf"
 grep -v "MeshSTEPLoader " "$plugin_conf" > "${plugin_conf}.tmp" && mv "${plugin_conf}.tmp" "$plugin_conf"
 
diff --git a/scripts/scene-tests.sh b/scripts/scene-tests.sh
index 4d1719d..eb32fa4 100644
--- a/scripts/scene-tests.sh
+++ b/scripts/scene-tests.sh
@@ -150,9 +150,14 @@ list-plugins() {
 }
 
 list-scene-directories() {
-    # Main directory
+    # examples directory
     mkdir -p "$output_dir/examples"
     echo examples >> "$output_dir/directories.txt"
+
+    # share directory
+    mkdir -p "$output_dir/share"
+    echo share >> "$output_dir/directories.txt"
+
     # List directories for compiled plugins only
     list-plugins | while read plugin; do
         local lib="$(get-lib "$plugin")"
diff --git a/scripts/utils.sh b/scripts/utils.sh
index cf6db6d..4d1fc09 100644
--- a/scripts/utils.sh
+++ b/scripts/utils.sh
@@ -320,7 +320,10 @@ call-cmake() {
             echo "Calling: $COMSPEC //c \"$vcvarsall && cd $build_dir_windows && $cmake_command $*\""
             $COMSPEC //c "$vcvarsall && cd $build_dir_windows && $cmake_command $*"
         fi
-    else
+    elif vm-is-macos; then
+				echo "Calling: $cmake_command  $@ -DCMAKE_CXX_FLAGS=\"-ffp-contract=off\""
+				cd $build_dir && $cmake_command "$@" -DCMAKE_CXX_FLAGS="-ffp-contract=off"
+		else
         echo "Calling: $cmake_command $@"
         cd $build_dir && $cmake_command "$@"
     fi
@@ -357,11 +360,11 @@ call-make() {
         fi
     else
     	toolname="make" # default
-        if [ -e "$(command -v ninja)" ]; then
-            echo "Using ninja as build system"
-	        toolname="ninja"
-        fi
-        echo "Calling: $toolname $target $VM_MAKE_OPTIONS"
-        cd $build_dir && $toolname $target $VM_MAKE_OPTIONS
+			if [ -e "$(command -v ninja)" ]; then
+					echo "Using ninja as build system"
+				toolname="ninja"
+			fi
+			echo "Calling: $toolname $target $VM_MAKE_OPTIONS"
+			cd $build_dir && $toolname $target $VM_MAKE_OPTIONS
     fi
 }
diff --git a/setup/setup-macos.sh b/setup/setup-macos.sh
index 0e99d73..fa82ea8 100644
--- a/setup/setup-macos.sh
+++ b/setup/setup-macos.sh
@@ -41,6 +41,7 @@ echo "---- Install Python, numpy, scipy, pybind11"
 brew install python@3.9
 brew install python@3.10
 brew install python@3.11
+brew install python@3.12
 
 brew unlink python@3.12 || true
 brew unlink python@3.11  || true
@@ -49,21 +50,27 @@ brew unlink python@3.9 || true
 
 brew link --force python@3.9
 python3.9 -m pip install --upgrade pip
-python3.9 -m pip install numpy scipy pygame pybind11
+python3.9 -m pip install numpy scipy pygame pybind11==2.12.0 mypy pybind11-stubgen
 
 brew unlink python@3.9  || true
 brew link --force python@3.10
 python3.10 -m pip install --upgrade pip
-python3.10 -m pip install numpy scipy pygame pybind11
+python3.10 -m pip install numpy scipy pygame pybind11==2.12.0 mypy pybind11-stubgen
 
 brew unlink python@3.10  || true
 brew link --force python@3.11
 python3.11 -m pip install --upgrade pip
-python3.11 -m pip install numpy scipy pygame pybind11
+python3.11 -m pip install numpy scipy pygame pybind11==2.12.0 mypy pybind11-stubgen
 
 brew unlink python@3.11  || true
+brew link --force python@3.12
+python3.12 -m pip install --upgrade pip
+python3.12 -m pip install numpy scipy pygame pybind11==2.12.0 mypy pybind11-stubgen --break-system-packages
+
+brew unlink python@3.12  || true
 brew link --force python@3.10
 
+
 echo "--------------------------------------------"
 echo "---- Install Qt with online installer"
 # Minimal Qt online version compatible with arm64: 6.2.0
diff --git a/setup/setup-windows_2.bat b/setup/setup-windows_2.bat
index e546367..205f2a4 100755
--- a/setup/setup-windows_2.bat
+++ b/setup/setup-windows_2.bat
@@ -45,11 +45,11 @@ pathed /MACHINE /REMOVE C:\Python311\
 pathed /MACHINE /REMOVE C:\Python312\Scripts\
 pathed /MACHINE /REMOVE C:\Python312\
 C:\Python310\python.exe -m pip install --upgrade pip
-C:\Python310\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib
+C:\Python310\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib mypy pybind11-stubgen
 C:\Python311\python.exe -m pip install --upgrade pip
-C:\Python311\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib
+C:\Python311\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib mypy pybind11-stubgen
 C:\Python312\python.exe -m pip install --upgrade pip
-C:\Python312\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib
+C:\Python312\python.exe -m pip install numpy scipy pybind11==2.9.1 matplotlib mypy pybind11-stubgen
 
 
 REM Install plugins dependencies