build: Update QEMU base image to v7.24 (#1476 )

build: Update QEMU base image version to v7.23 (#1470 )
build: Run check for all files (#1469 )
2025-10-13 23:36:11 +01:00 · 2025-10-13 15:06:21 +02:00 · 2025-10-12 02:03:16 +02:00 · 2025-10-12 00:22:18 +02:00 · 2025-10-11 17:33:02 +02:00 · 2025-10-11 17:31:14 +02:00
40 changed files with 579 additions and 316 deletions
--- a/.github/winboat.png
+++ b/.github/winboat.png
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -1,12 +1,6 @@
 on:
  workflow_dispatch:
  pull_request:
    paths:
      - '**/*.sh'
      - '**/*.xml'
      - '.github/workflows/test.yml'
      - '.github/workflows/check.yml'
      - 'Dockerfile'
 name: "Test"
 permissions: {}
--- a/2
+++ b/2
@ -3,7 +3,7 @@
 ARG VERSION_ARG="latest"
 FROM scratch AS build-amd64
-COPY --from=qemux/qemu:7.21 / /
+COPY --from=qemux/qemu:7.24 / /
 ARG TARGETARCH
 ARG DEBCONF_NOWARNINGS="yes"
--- a/assets/win10x64-enterprise-eval.xml
+++ b/assets/win10x64-enterprise-eval.xml
@ -376,50 +376,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win10x64-enterprise.xml
+++ b/assets/win10x64-enterprise.xml
@ -379,50 +379,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win10x64-iot.xml
+++ b/assets/win10x64-iot.xml
@ -385,50 +385,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win10x64-ltsc.xml
+++ b/assets/win10x64-ltsc.xml
@ -382,50 +382,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win10x64.xml
+++ b/assets/win10x64.xml
@ -379,50 +379,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64-enterprise-eval.xml
+++ b/assets/win11x64-enterprise-eval.xml
@ -408,56 +408,61 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C rd /q C:\Windows.old</CommandLine>
          <Description>Remove empty Windows.old folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
+          <Order>26</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64-enterprise.xml
+++ b/assets/win11x64-enterprise.xml
@ -411,56 +411,61 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C rd /q C:\Windows.old</CommandLine>
          <Description>Remove empty Windows.old folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
+          <Order>26</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64-iot.xml
+++ b/assets/win11x64-iot.xml
@ -411,56 +411,61 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C rd /q C:\Windows.old</CommandLine>
          <Description>Remove empty Windows.old folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
+          <Order>26</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64-ltsc.xml
+++ b/assets/win11x64-ltsc.xml
@ -411,56 +411,61 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C rd /q C:\Windows.old</CommandLine>
          <Description>Remove empty Windows.old folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
+          <Order>26</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win11x64.xml
+++ b/assets/win11x64.xml
@ -411,56 +411,61 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV1 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>reg.exe add "HKCU\Control Panel\UnsupportedHardwareNotificationCache" /v SV2 /d 0 /t REG_DWORD /f</CommandLine>
          <Description>Disable unsupported hardware notifications</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C rd /q C:\Windows.old</CommandLine>
          <Description>Remove empty Windows.old folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>24</Order>
+          <Order>25</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>25</Order>
+          <Order>26</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2008r2-eval.xml
+++ b/assets/win2008r2-eval.xml
@ -266,30 +266,35 @@
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2008r2.xml
+++ b/assets/win2008r2.xml
@ -269,30 +269,35 @@
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2012r2-eval.xml
+++ b/assets/win2012r2-eval.xml
@ -284,30 +284,40 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>19</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2012r2.xml
+++ b/assets/win2012r2.xml
@ -287,30 +287,40 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>19</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2016-eval.xml
+++ b/assets/win2016-eval.xml
@ -284,50 +284,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2016.xml
+++ b/assets/win2016.xml
@ -287,50 +287,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2019-eval.xml
+++ b/assets/win2019-eval.xml
@ -288,50 +288,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2019-hv.xml
+++ b/assets/win2019-hv.xml
@ -293,50 +293,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2019.xml
+++ b/assets/win2019.xml
@ -291,50 +291,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2022-eval.xml
+++ b/assets/win2022-eval.xml
@ -288,50 +288,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2022.xml
+++ b/assets/win2022.xml
@ -291,50 +291,60 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "SearchboxTaskbarMode" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Search from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2025-eval.xml
+++ b/assets/win2025-eval.xml
@ -307,46 +307,51 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C rd /q C:\Windows.old</CommandLine>
          <Description>Remove empty Windows.old folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win2025.xml
+++ b/assets/win2025.xml
@ -310,46 +310,51 @@
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>15</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>16</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowTaskViewButton" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Task View from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>17</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarDa" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Widgets from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>18</Order>
          <CommandLine>reg.exe add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "TaskbarMn" /t REG_DWORD /d 0 /f</CommandLine>
          <Description>Remove Chat from the Taskbar</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>18</Order>
+          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>19</Order>
+          <Order>20</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>20</Order>
+          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>cmd /C rd /q C:\Windows.old</CommandLine>
          <Description>Remove empty Windows.old folder</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win81x64-enterprise-eval.xml
+++ b/assets/win81x64-enterprise-eval.xml
@ -269,30 +269,40 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>19</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win81x64-enterprise.xml
+++ b/assets/win81x64-enterprise.xml
@ -272,30 +272,40 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>19</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/win81x64.xml
+++ b/assets/win81x64.xml
@ -279,30 +279,40 @@
        <SynchronousCommand wcm:action="add">
          <Order>12</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>13</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>14</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v "NoAutoUpdate" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Turn off Windows Update auto download</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>14</Order>
+          <Order>15</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>15</Order>
+          <Order>16</Order>
          <CommandLine>reg.exe add "HKLM\SYSTEM\CurrentControlSet\Control\Network\NewNetworkWindowOff" /f</CommandLine>
          <Description>Disable Network Discovery popup</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>17</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>16</Order>
+          <Order>18</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>17</Order>
+          <Order>19</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax64-enterprise.xml
+++ b/assets/winvistax64-enterprise.xml
@ -233,25 +233,30 @@
        <SynchronousCommand wcm:action="add">
          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax64-ultimate.xml
+++ b/assets/winvistax64-ultimate.xml
@ -233,25 +233,30 @@
        <SynchronousCommand wcm:action="add">
          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax64.xml
+++ b/assets/winvistax64.xml
@ -233,25 +233,30 @@
        <SynchronousCommand wcm:action="add">
          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax86-enterprise.xml
+++ b/assets/winvistax86-enterprise.xml
@ -233,25 +233,30 @@
        <SynchronousCommand wcm:action="add">
          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax86-ultimate.xml
+++ b/assets/winvistax86-ultimate.xml
@ -233,25 +233,30 @@
        <SynchronousCommand wcm:action="add">
          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/assets/winvistax86.xml
+++ b/assets/winvistax86.xml
@ -233,25 +233,30 @@
        <SynchronousCommand wcm:action="add">
          <Order>19</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Policies\Microsoft\Windows NT\Terminal Services" /v "fAllowUnlistedRemotePrograms" /t REG_DWORD /d 1 /f</CommandLine>
-          <Description>Enable RemoteAPP to launch unlisted programs</Description>
+          <Description>Enable RemoteApp to launch unlisted programs</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>20</Order>
          <CommandLine>reg.exe add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Terminal Server\TSAppAllowList" /v "fDisabledAllowList" /t REG_DWORD /d 1 /f</CommandLine>
          <Description>Disable RemoteApp allowlist</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
          <Order>21</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-32752" new enable=Yes</CommandLine>
          <Description>Enable Network Discovery</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>21</Order>
+          <Order>22</Order>
          <CommandLine>netsh advfirewall firewall set rule group="@FirewallAPI.dll,-28502" new enable=Yes</CommandLine>
          <Description>Enable File Sharing</Description>
        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>22</Order>
+          <Order>23</Order>
          <CommandLine>cmd /C mklink /d %userprofile%\Desktop\Shared \\host.lan\Data</CommandLine>
          <Description>Create desktop shortcut to shared folder</Description>
-        </SynchronousCommand>        
+        </SynchronousCommand>
        <SynchronousCommand wcm:action="add">
-          <Order>23</Order>
+          <Order>24</Order>
          <CommandLine>cmd /C if exist "C:\OEM\install.bat" start "Install" "cmd /C C:\OEM\install.bat"</CommandLine>
          <Description>Execute custom script from the OEM folder if exists</Description>
        </SynchronousCommand>
--- a/readme.md
+++ b/readme.md
@ -66,6 +66,10 @@ kubectl apply -f https://raw.githubusercontent.com/dockur/windows/refs/heads/mas
 [![Open in GitHub Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/dockur/windows)
 ##### Via a graphical installer:
 [![Download WinBoat](https://github.com/dockur/windows/raw/master/.github/winboat.png)](https://winboat.app)
 ## FAQ 💬
 ### How do I use it?
--- a/src/define.sh
+++ b/src/define.sh
@ -1620,7 +1620,7 @@ prepareInstall() {
          echo "[UserData]"
          echo "    FullName=\"$username\""
          echo "    ComputerName=\"*\""
-          echo "    OrgName=\"Windows for Docker\""
+          echo "    OrgName=\"$APP for $ENGINE\""
          echo "    $KEY"
          echo ""
          echo "[Identification]"
--- a/src/entry.sh
+++ b/src/entry.sh
@ -8,9 +8,10 @@ set -Eeuo pipefail
 cd /run
-. start.sh      # Placeholder
+. start.sh      # Startup hook
 . utils.sh      # Load functions
 . reset.sh      # Initialize system
 . server.sh     # Start webserver
 . define.sh     # Define versions
 . mido.sh       # Download Windows
 . install.sh    # Run installation
@ -33,7 +34,7 @@ info "Booting ${APP}${BOOT_DESC} using QEMU v$version..."
 terminal
 ( sleep 30; boot ) &
-tail -fn +0 "$QEMU_LOG" 2>/dev/null &
+tail -fn +0 "$QEMU_LOG" --pid=$$ 2>/dev/null &
 cat "$QEMU_TERM" 2> /dev/null | tee "$QEMU_PTY" | \
 sed -u -e 's/\x1B\[[=0-9;]*[a-z]//gi' \
 -e 's/failed to load Boot/skipped Boot/g' \
--- a/src/install.sh
+++ b/src/install.sh
@ -759,6 +759,7 @@ updateXML() {
  [ -z "$HEIGHT" ] && HEIGHT="720"
  [ -z "$WIDTH" ] && WIDTH="1280"
  sed -i "s/>Windows for Docker</>$APP for $ENGINE</g" "$asset"
  sed -i "s/<VerticalResolution>1080<\/VerticalResolution>/<VerticalResolution>$HEIGHT<\/VerticalResolution>/g" "$asset"
  sed -i "s/<HorizontalResolution>1920<\/HorizontalResolution>/<HorizontalResolution>$WIDTH<\/HorizontalResolution>/g" "$asset"
--- a/src/samba.sh
+++ b/src/samba.sh
@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
-: "${SAMBA:="Y"}"        # Enable Samba
+: "${SAMBA:="Y"}"         # Enable Samba
-: "${SAMBA_LEVEL:="1"}"  # Logging level
+: "${SAMBA_LEVEL:="1"}"   # Logging level
-: "${SAMBA_DEBUG:="N"}"  # Disable debug
+: "${SAMBA_DEBUG:="N"}"   # Disable debug
 tmp="/tmp/smb"
 rm -rf "$tmp"
@ -35,6 +35,7 @@ else
 fi
 html "Initializing shared folder..."
 SAMBA_CONFIG="/etc/samba/smb.conf"
 [[ "$DEBUG" == [Yy1]* ]] && echo "Starting Samba daemon..."
 addShare() {
@ -42,58 +43,70 @@ addShare() {
  local ref="$2"
  local name="$3"
  local comment="$4"
  local cfg="$5"
  local owner=""
  mkdir -p "$dir" || return 1
-  ls -A "$dir" >/dev/null 2>&1 || return 1
+
  if ! ls -A "$dir" >/dev/null 2>&1; then
    error "Failed to access directory $dir" && return 1
  fi
  if [ -z "$(ls -A "$dir")" ]; then
-    chmod 777 "$dir" || return 1
+    if ! chmod 2777 "$dir"; then
      error "Failed to set permissions for directory $dir" && return 1
    fi
    owner=$(stat -c %u "$dir")
    if [[ "$owner" == "0" ]]; then
      if ! chown "1000:1000" "$dir"; then
        error "Failed to set ownership for directory $dir" && return 1
      fi
    fi
  fi
  if [[ "$dir" == "$tmp" ]]; then
-    {      echo "--------------------------------------------------------"
+    {   echo "--------------------------------------------------------"
-            echo " $APP for Docker v$(</run/version)..."
+        echo " $APP for $ENGINE v$(</run/version)..."
-            echo " For support visit $SUPPORT"
+        echo " For support visit $SUPPORT"
-            echo "--------------------------------------------------------"
+        echo "--------------------------------------------------------"
-            echo ""
+        echo ""
-            echo "Using this folder you can exchange files with the host machine."
+        echo "Using this folder you can exchange files with the host machine."
-            echo ""
+        echo ""
-            echo "To select a folder on the host for this purpose, include the following bind mount in your compose file:"
+        echo "To select a folder on the host for this purpose, include the following bind mount in your compose file:"
-            echo ""
+        echo ""
-            echo "  volumes:"
+        echo "  volumes:"
-            echo "    - \"./example:${ref}\""
+        echo "    - \"./example:${ref}\""
-            echo ""
+        echo ""
-            echo "Or in your run command:"
+        echo "Or in your run command:"
-            echo ""
+        echo ""
-            echo "  -v \"\${PWD:-.}/example:${ref}\""
+        echo "  -v \"\${PWD:-.}/example:${ref}\""
-            echo ""
+        echo ""
-            echo "Replace the example path ./example with your desired shared folder, which then will become visible here."
+        echo "Replace the example path ./example with your desired shared folder, which then will become visible here."
-            echo ""
+        echo ""
    } | unix2dos > "$dir/readme.txt"
  fi
-  {      echo ""
+  {     echo ""
-          echo "[$name]"
+        echo "[$name]"
-          echo "    path = $dir"
+        echo "    path = $dir"
-          echo "    comment = $comment"
+        echo "    comment = $comment"
-          echo "    writable = yes"
+        echo "    writable = yes"
-          echo "    guest ok = yes"
+        echo "    guest ok = yes"
-          echo "    guest only = yes"
+        echo "    guest only = yes"
-          echo "    force user = root"
+  } >> "$cfg"
          echo "    force group = root"
  } >> "/etc/samba/smb.conf"
  return 0
 }
-{      echo "[global]"
+{       echo "[global]"
        echo "    server string = Dockur"
        echo "    netbios name = $hostname"
        echo "    workgroup = WORKGROUP"
        echo "    interfaces = $interfaces"
        echo "    bind interfaces only = yes"
        echo "    socket address = $socket"
        echo "    security = user"
        echo "    guest account = nobody"
        echo "    map to guest = Bad User"
@ -101,15 +114,22 @@ addShare() {
        echo "    follow symlinks = yes"
        echo "    wide links = yes"
        echo "    unix extensions = no"
-        echo "    socket address = $socket"
+        echo "    inherit owner = yes"
        echo "    create mask = 0666"
        echo "    directory mask = 02777"
        echo "    force user = root"
        echo "    force group = root"
        echo "    force create mode = 0666"
        echo "    force directory mode = 02777"
        echo ""
-        echo "    # disable printing services"
+        echo "    # Disable printing services"
        echo "    load printers = no"
        echo "    printing = bsd"
        echo "    printcap name = /dev/null"
        echo "    disable spoolss = yes"
-} > "/etc/samba/smb.conf"
+} > "$SAMBA_CONFIG"
 # Add shared folders
 share="/shared"
 [ ! -d "$share" ] && [ -d "$STORAGE/shared" ] && share="$STORAGE/shared"
 [ ! -d "$share" ] && [ -d "/data" ] && share="/data"
@ -119,32 +139,30 @@ share="/shared"
 m1="Failed to add shared folder"
 m2="Please check its permissions."
-if ! addShare "$share" "/shared" "Data" "Shared"; then
+if ! addShare "$share" "/shared" "Data" "Shared" "$SAMBA_CONFIG"; then
  error "$m1 '$share'. $m2" && return 0
 fi
 if [ -d "/shared2" ]; then
-  addShare "/shared2" "/shared2" "Data2" "Shared" || error "$m1 '/shared2'. $m2"
+  addShare "/shared2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || error "$m1 '/shared2'. $m2"
 else
  if [ -d "/data2" ]; then
-    addShare "/data2" "/shared2" "Data2" "Shared" || error "$m1 '/data2'. $m2."
+    addShare "/data2" "/shared2" "Data2" "Shared" "$SAMBA_CONFIG" || error "$m1 '/data2'. $m2."
  fi
 fi
 if [ -d "/shared3" ]; then
-  addShare "/shared3" "/shared3" "Data3" "Shared" || error "$m1 '/shared3'. $m2"
+  addShare "/shared3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || error "$m1 '/shared3'. $m2"
 else
  if [ -d "/data3" ]; then
-    addShare "/data3" "/shared3" "Data3" "Shared" || error "$m1 '/data3'. $m2"
+    addShare "/data3" "/shared3" "Data3" "Shared" "$SAMBA_CONFIG" || error "$m1 '/data3'. $m2"
  fi
 fi
-IFS=',' read -r -a dirs <<< "${SHARES:-}"
+# Create directories if missing
-for dir in "${dirs[@]}"; do
+mkdir -p /var/lib/samba/sysvol
-  [ ! -d "$dir" ] && continue
+mkdir -p /var/lib/samba/private
-  dir_name=$(basename "$dir")
+mkdir -p /var/lib/samba/bind-dns
  addShare "$dir" "/shared" "$dir_name" "Shared $dir_name" || error "Failed to create shared folder for $dir!"
 done
 # Try to repair Samba permissions
 [ -d /run/samba/msg.lock ] && chmod -R 0755 /run/samba/msg.lock 2>/dev/null || :
@ -159,7 +177,7 @@ if ! smbd -l /var/log/samba; then
 fi
 if [[ "$SAMBA_DEBUG" == [Yy1]* ]]; then
-  tail -fn +0 /var/log/samba/log.smbd &
+  tail -fn +0 /var/log/samba/log.smbd --pid=$$ &
 fi
 case "${NETWORK,,}" in
@ -180,7 +198,7 @@ if [[ "${BOOT_MODE:-}" == "windows_legacy" ]]; then
  fi
  if [[ "$SAMBA_DEBUG" == [Yy1]* ]]; then
-    tail -fn +0 /var/log/samba/log.nmbd &
+    tail -fn +0 /var/log/samba/log.nmbd --pid=$$ &
  fi
 else
@ -196,7 +214,7 @@ else
  fi
  if [[ "$SAMBA_DEBUG" == [Yy1]* ]]; then
-    tail -fn +0 /var/log/wsddn.log &
+    tail -fn +0 /var/log/wsddn.log --pid=$$ &
  fi
 fi
Author	SHA1	Message	Date
Kroese	5e2ca4c1b6	build: Update QEMU base image to v7.24 (#1476 )	2025-10-13 15:06:21 +02:00
Kroese	3c029582d6	build: Update QEMU base image version to v7.23 (#1470 )	2025-10-12 02:03:16 +02:00
Kroese	8846aad171	build: Run check for all files (#1469 ) Removed specific paths from pull request triggers.	2025-10-12 00:22:18 +02:00
Kroese	44dd2b67c8	docs: Update image link (#1468 )	2025-10-11 17:33:02 +02:00
Kroese	ffadba3f3f	docs: Add link to WinBoat (#1467 )	2025-10-11 17:31:14 +02:00
Kroese	135fd38778	feat: Shared files inherit ownership from parent folder (#1465 )	2025-10-10 06:28:20 +02:00
Kroese	45956f786f	feat: Allow to set a user/group for the shared folder (#1464 )	2025-10-09 12:24:51 +02:00
Kroese	aa575286f6	build: Update QEMU base image to v7.22 (#1462 )	2025-10-08 22:08:11 +02:00
Kroese	ccc0d4ea64	fix: Terminate tail on exit (#1461 )	2025-10-08 08:14:36 +02:00
Kroese	75e25b2aea	feat: Disable Network Discovery popup (#1459 )	2025-10-07 15:29:33 +02:00
Kroese	26e4ab5fb2	feat: Use the engine variable (#1458 )	2025-10-07 12:39:17 +02:00