diff --git a/files/scripts/development-branch/fusion360-setup-wizard.sh b/files/scripts/development-branch/fusion360-setup-wizard.sh
index a403646..82d12d6 100644
--- a/files/scripts/development-branch/fusion360-setup-wizard.sh
+++ b/files/scripts/development-branch/fusion360-setup-wizard.sh
@@ -101,8 +101,8 @@ function create-structure {
 # Load the Flatpak-files for the Setup Wizard!
 
 function load-flatpak {
-  wget -N -P data/flatpak https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/scripts/development-branch/fusion360-flatpak-install.sh
-  chmod +x data/locale/locale.sh
+  wget -N -P data/flatpak https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/scripts/development-branch/flatpak-install.sh
+  chmod +x data/flatpak/flatpak-install.sh
 }
 
 ###############################################################################################################################################################
@@ -493,6 +493,13 @@ function airfoil-tools-plugin-custom {
     WINEPREFIX=$custom_directory wine AirfoilTools_win64.msi
 }
 
+function airfoil-tools-plugin-flatpak-standard {
+    mkdir -p "$HOME/Fusion360/data/extensions"
+    cd "$HOME/Fusion360/data/extensions"
+    wget -N https://github.com/cryinkfly/Fusion-360---Linux-Wine-Version-/raw/main/files/extensions/AirfoilTools_win64.msi &&
+    flatpak run org.winehq.flatpak-wine619 wine AirfoilTools_win64.msi
+}
+
 ###############################################################################################################################################################
 
 # Install a extension: Additive Assistant (FFF)
@@ -511,6 +518,13 @@ function additive-assistant-plugin-custom {
     WINEPREFIX=$custom_directory wine AdditiveAssistant.bundle-win64.msi
 }
 
+function additive-assistant-plugin-flatpak-standard {
+    mkdir -p "$HOME/Fusion360/data/extensions"
+    cd "$HOME/Fusion360/data/extensions"
+    wget -N https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/extensions/AdditiveAssistant.bundle-win64.msi &&
+    flatpak run org.winehq.flatpak-wine619 wine AdditiveAssistant.bundle-win64.msi
+}
+
 ###############################################################################################################################################################
 
 # Install a extension: Czech localization for F360
@@ -525,6 +539,11 @@ function czech-locale-plugin-custom {
     WINEPREFIX=$custom_directory wine $CZECH_LOCALE
 }
 
+function czech-locale-plugin-flatpak-standard {
+    czech-locale-search-plugin-standard
+    flatpak run org.winehq.flatpak-wine619 wine $CZECH_LOCALE
+}
+
 ###############################################################################################################################################################
 
 # Install a extension: HP 3D Printers for Autodesk® Fusion 360™
@@ -543,6 +562,13 @@ function hp-3dprinter-connector-plugin-custom {
     WINEPREFIX=$custom_directory wine HP_3DPrinters_for_Fusion360-win64.msi
 }
 
+function hp-3dprinter-connector-plugin-flatpak-standard {
+    mkdir -p "$HOME/Fusion360/data/extensions"
+    cd "$HOME/Fusion360/data/extensions"
+    wget -N https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/extensions/HP_3DPrinters_for_Fusion360-win64.msi &&
+    flatpak run org.winehq.flatpak-wine619 wine HP_3DPrinters_for_Fusion360-win64.msi
+}
+
 ###############################################################################################################################################################
 
 # Install a extension: OctoPrint for Autodesk® Fusion 360™
@@ -561,6 +587,13 @@ function octoprint-plugin-custom {
     WINEPREFIX=$custom_directory wine OctoPrint_for_Fusion360-win64.msi
 }
 
+function octoprint-plugin-flatpak-standard {
+    mkdir -p "$HOME/Fusion360/data/extensions"
+    cd "$HOME/Fusion360/data/extensions"
+    wget -N https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/extensions/OctoPrint_for_Fusion360-win64.msi &&
+    flatpak run org.winehq.flatpak-wine619 wine OctoPrint_for_Fusion360-win64.msi
+}
+
 ###############################################################################################################################################################
 
 # Install a extension: RoboDK
@@ -579,6 +612,13 @@ function robodk-plugin-custom {
     WINEPREFIX=$custom_directory wine RoboDK.bundle-win64.msi
 }
 
+function robodk-plugin-flatpak-standard {
+    mkdir -p "$HOME/Fusion360/data/extensions"
+    cd "$HOME/Fusion360/data/extensions"
+    wget -N https://github.com/cryinkfly/Autodesk-Fusion-360-for-Linux/raw/main/files/extensions/RoboDK.bundle-win64.msi &&
+    flatpak run org.winehq.flatpak-wine619 wine RoboDK.bundle-win64.msi
+}
+
 ###############################################################################################################################################################
 
 # Remove a exist Autodesk Fusion 360 (Wineprefix)!
@@ -1016,6 +1056,23 @@ function select-opengl_dxvk {
 [[ "$response" ]] || echo "Go back" && configure-locale
 }
 
+function select-opengl_dxvk-flatpak {
+  response=$(zenity --list \
+                    --radiolist \
+                    --title="$program_name" \
+                    --width=700 \
+                    --height=500 \
+                    --column="$text_select" --column="$text_driver" \
+                    TRUE "$text_driver_opengl" \
+                    FALSE "$text_driver_dxvk")
+
+[[ $response = "$text_driver_opengl" ]] && driver_used=1 && . data/flatpak/flatpak-install.sh && winetricks-flatpak-standard
+
+[[ $response = "$text_driver_dxvk" ]] && driver_used=2 && data/flatpak/flatpak-install.sh && winetricks-flatpak-standard
+
+[[ "$response" ]] || echo "Go back" && configure-locale
+}
+
 ###############################################################################################################################################################
 
 # For the installation of Autodesk Fusion 360 one of the supported Linux distributions must be selected! - Part 1