diff --git a/playbook/FlatUnattendW10.xml b/playbook/FlatUnattendW10.xml
index 3f4f5fc..cbdc316 100644
--- a/playbook/FlatUnattendW10.xml
+++ b/playbook/FlatUnattendW10.xml
@@ -1,307 +1,363 @@
-
-
-
-
-
-
-
-
-
-
-
- W:\Drivers
-
-
- W:\Deploy\Applications\extra\printdrivers\BROTHER\UNIV-PS-01181\PS\64
-
-
- W:\Deploy\Applications\extra\printdrivers\HP
-
-
- W:\Deploy\Applications\extra\printdrivers\XEROX\UNIV_5.1035.2.0_PS_x64_Driver
-
-
-
-
-
-
-
-
-
- H%serialnumber%
- GE Aerospace
- GE
- Eastern Standard Time
-
-
-
-
-
-
-
- 1
- msiexec /i "C:\Deploy\Applications\extra\wireless\EAP-PEAP.msi" /quiet /norestart
- Install EAP-PEAP
-
-
-
-
- 2
- cmd /c netsh wlan add profile filename="C:\Deploy\Applications\extra\wireless\BLUESSO.xml" user=all
- Add BLUESSO WiFi profile
-
-
- 3
- cmd /c netsh wlan add profile filename="C:\Deploy\Applications\extra\wireless\WiFi-Profile.xml" user=all
- Add generic WiFi profile
-
-
-
-
- 4
- cmd /c certutil -addstore Root "C:\Deploy\Applications\GE_External_Root_CA_2_1.cer"
- Install External Root Certificate
-
-
- 5
- cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_External_Intermediate_CA_2_1.cer"
- Install External Intermediate Certificate
-
-
- 6
- cmd /c certutil -addstore Root "C:\Deploy\Applications\GE_Enterprise_Root_CA_2_1.cer"
- Install Enterprise Root Certificate
-
-
- 7
- cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_Enterprise_Device_Issuing_CA_2_1.cer"
- Install Enterprise Device Issuing Certificate
-
-
- 8
- cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_Enterprise_Server_Issuing_CA_2_1.cer"
- Install Enterprise Server Issuing Certificate
-
-
- 9
- cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_Enterprise_Smart_Card_Issuing_CA_2_1.cer"
- Install SmartCard Issuing Certificate
-
-
- 10
- cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_Enterprise_User_Issuing_CA_2_1.cer"
- Install User Issuing Certificate
-
-
- 11
- cmd /c certutil -addstore Root "C:\Deploy\Applications\GE_Aerospace_Enterprise_Root_CA_1.cer"
- Install Aerospace Enterprise Root CA
-
-
- 12
- cmd /c certutil -addstore Root "C:\Deploy\Applications\ZscalerCommercialCertificate-2048-SHA256.crt"
- Install Zscaler Certificate
-
-
-
-
- 13
- cmd /c copy "C:\Deploy\Applications\extra\fonts\3OF9.TTF" "%WINDIR%\Fonts\" /Y
- Copy 3OF9 Font
-
-
- 14
- cmd /c reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "3 of 9 Barcode" /t REG_SZ /d "3OF9.TTF" /f
- Register 3OF9 Barcode Font
-
-
- 15
- cmd /c copy "C:\Deploy\Applications\extra\fonts\Code39AzaleaNarrow3.ttf" "%WINDIR%\Fonts\" /Y
- Copy Code39 Azalea Narrow Font
-
-
- 16
- cmd /c reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "Code39AzaleaNarrow3" /t REG_SZ /d "Code39AzaleaNarrow3.ttf" /f
- Register Code39 Azalea Narrow Font
-
-
- 17
- cmd /c copy "C:\Deploy\Applications\extra\fonts\Code39Azalea.ttf" "%WINDIR%\Fonts\" /Y
- Copy Code39 Azalea Font
-
-
- 18
- cmd /c reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "Code39Azalea" /t REG_SZ /d "Code39Azalea.ttf" /f
- Register Code39 Azalea Font
-
-
-
-
- 19
- C:\Deploy\Applications\extra\opentext\opentext_hostexplorer_sp1_15.0_v01.exe /quiet /norestart
- Install OpenText HostExplorer SP1
-
-
- 20
- C:\Deploy\Applications\extra\opentext\J2SE_Runtime_Environment_1.6.0_22_Static_Config_V2_Co-Exist.EXE /silent /norestart
- Install J2SE Runtime Environment 1.6.0_22
-
-
- 21
- C:\Deploy\Applications\extra\opentext\unattended.bat
- Install J2SE Runtime Environment 1.6.0_22
-
-
-
-
- 22
- msiexec /i "C:\Deploy\Applications\extra\adobe\AcroRead.msi" TRANSFORMS="C:\Deploy\Applications\extra\adobe\AcroRead.mst" /quiet /norestart
- Install Adobe
-
-
- 23
- msiexec /p "C:\Deploy\Applications\extra\adobe\AcroRdrDCUpd2500120531.msp" /quiet /norestart
- Apply Adobe Reader Update
-
-
-
-
- 26
- C:\Deploy\Applications\extra\java\jre-8u441-windows-i586.exe /s INSTALLDIR="C:\Program Files (x86)\Java\jre1.8.0_441" STATIC=1 AUTO_UPDATE=0 REBOOT=0 SPONSORS=0 WEB_JAVA=0 /L "C:\Windows\Logs\java-install.log"
- Install Java JRE 8 Update 441 with Enterprise Settings and Logging
-
-
-
-
- 27
- cmd /c reg add "HKLM\SOFTWARE\JavaSoft\Java Update\Policy" /v EnableJavaUpdate /t REG_DWORD /d 0 /f
- Disable Java Auto Updates (64-bit)
-
-
-
-
- 28
- cmd /c reg add "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Update\Policy" /v EnableJavaUpdate /t REG_DWORD /d 0 /f
- Disable Java Auto Updates (32-bit)
-
-
-
-
- 29
- cmd /c reg add "HKLM\SOFTWARE\JavaSoft\Java Update\Policy" /v EnableAutoUpdateCheck /t REG_DWORD /d 0 /f
- Disable Java Auto Update Check (64-bit)
-
-
-
-
- 30
- cmd /c reg add "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Update\Policy" /v EnableAutoUpdateCheck /t REG_DWORD /d 0 /f
- Disable Java Auto Update Check (32-bit)
-
-
-
-
- 31
- cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v AllowCortana /t REG_DWORD /d 0 /f
- Disable Cortana
-
-
-
-
- 33
- cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v DisableWebSearch /t REG_DWORD /d 1 /f
- Disable Web Search in Start Menu
-
-
-
-
- 34
- cmd /c reg load HKU\TempDU C:\Users\Default\NTUSER.DAT & reg add "HKU\TempDU\Software\Policies\Microsoft\Windows\Explorer" /v DisableSearchBoxSuggestions /t REG_DWORD /d 1 /f & reg unload HKU\TempDU
- Disable Bing/web search suggestions (Default User hive)
-
-
-
-
- 35
- cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v ConnectedSearchUseWeb /t REG_DWORD /d 0 /f
- Disable Connected Search Use Web
-
-
-
-
- 36
- cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\InputPersonalization" /v AllowInputPersonalization /t REG_DWORD /d 0 /f
- Disable Cortana Speech Recognition
-
-
-
-
- 38
- cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v EnableDynamicContentInWSB /t REG_DWORD /d 0 /f
- Disable Search Highlights
-
-
-
-
-
-
-
-
-
- true
- true
- false
- false
- true
- Work
- 3
- false
- false
-
-
-
- 1
- shutdown -a
- Cancel any scheduled shutdown from Office installation
-
-
-
-
- 2
- C:\Deploy\Applications\extra\zscaler\zscaler.bat
- Install Zscaler Client Connector
-
-
-
-
- 3
- cmd /c "cd /d C:\Deploy\Applications\extra\office\ && install.bat"
- Install Microsoft Office
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ W:\Drivers
+
+
+ W:\Deploy\Applications\extra\printdrivers\BROTHER\UNIV-PS-01181\PS\64
+
+
+ W:\Deploy\Applications\extra\printdrivers\HP
+
+
+ W:\Deploy\Applications\extra\printdrivers\XEROX\UNIV_5.1035.2.0_PS_x64_Driver
+
+
+
+
+
+
+
+
+
+ H%serialnumber%
+ GE Aerospace
+ GE
+ Eastern Standard Time
+
+
+
+
+
+
+
+ 1
+ msiexec /i "C:\Deploy\Applications\extra\wireless\EAP-PEAP.msi" /quiet /norestart
+ Install EAP-PEAP
+
+
+
+
+ 2
+ cmd /c netsh wlan add profile filename="C:\Deploy\Applications\extra\wireless\BLUESSO.xml" user=all
+ Add BLUESSO WiFi profile
+
+
+ 3
+ cmd /c netsh wlan add profile filename="C:\Deploy\Applications\extra\wireless\WiFi-Profile.xml" user=all
+ Add generic WiFi profile
+
+
+
+
+ 4
+ cmd /c certutil -addstore Root "C:\Deploy\Applications\GE_External_Root_CA_2_1.cer"
+ Install External Root Certificate
+
+
+ 5
+ cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_External_Intermediate_CA_2_1.cer"
+ Install External Intermediate Certificate
+
+
+ 6
+ cmd /c certutil -addstore Root "C:\Deploy\Applications\GE_Enterprise_Root_CA_2_1.cer"
+ Install Enterprise Root Certificate
+
+
+ 7
+ cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_Enterprise_Device_Issuing_CA_2_1.cer"
+ Install Enterprise Device Issuing Certificate
+
+
+ 8
+ cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_Enterprise_Server_Issuing_CA_2_1.cer"
+ Install Enterprise Server Issuing Certificate
+
+
+ 9
+ cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_Enterprise_Smart_Card_Issuing_CA_2_1.cer"
+ Install SmartCard Issuing Certificate
+
+
+ 10
+ cmd /c certutil -addstore CA "C:\Deploy\Applications\GE_Enterprise_User_Issuing_CA_2_1.cer"
+ Install User Issuing Certificate
+
+
+ 11
+ cmd /c certutil -addstore Root "C:\Deploy\Applications\GE_Aerospace_Enterprise_Root_CA_1.cer"
+ Install Aerospace Enterprise Root CA
+
+
+ 12
+ cmd /c certutil -addstore Root "C:\Deploy\Applications\ZscalerCommercialCertificate-2048-SHA256.crt"
+ Install Zscaler Certificate
+
+
+
+
+ 13
+ cmd /c copy "C:\Deploy\Applications\extra\fonts\3OF9.TTF" "%WINDIR%\Fonts\" /Y
+ Copy 3OF9 Font
+
+
+ 14
+ cmd /c reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "3 of 9 Barcode" /t REG_SZ /d "3OF9.TTF" /f
+ Register 3OF9 Barcode Font
+
+
+ 15
+ cmd /c copy "C:\Deploy\Applications\extra\fonts\Code39AzaleaNarrow3.ttf" "%WINDIR%\Fonts\" /Y
+ Copy Code39 Azalea Narrow Font
+
+
+ 16
+ cmd /c reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "Code39AzaleaNarrow3" /t REG_SZ /d "Code39AzaleaNarrow3.ttf" /f
+ Register Code39 Azalea Narrow Font
+
+
+ 17
+ cmd /c copy "C:\Deploy\Applications\extra\fonts\Code39Azalea.ttf" "%WINDIR%\Fonts\" /Y
+ Copy Code39 Azalea Font
+
+
+ 18
+ cmd /c reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts" /v "Code39Azalea" /t REG_SZ /d "Code39Azalea.ttf" /f
+ Register Code39 Azalea Font
+
+
+
+
+ 19
+ C:\Deploy\Applications\extra\opentext\opentext_hostexplorer_sp1_15.0_v01.exe /quiet /norestart
+ Install OpenText HostExplorer SP1
+
+
+ 20
+ C:\Deploy\Applications\extra\opentext\J2SE_Runtime_Environment_1.6.0_22_Static_Config_V2_Co-Exist.EXE /silent /norestart
+ Install J2SE Runtime Environment 1.6.0_22
+
+
+ 21
+ C:\Deploy\Applications\extra\opentext\unattended.bat
+ Install J2SE Runtime Environment 1.6.0_22
+
+
+
+
+ 22
+ msiexec /i "C:\Deploy\Applications\extra\adobe\AcroRead.msi" TRANSFORMS="C:\Deploy\Applications\extra\adobe\AcroRead.mst" /quiet /norestart
+ Install Adobe
+
+
+ 23
+ msiexec /p "C:\Deploy\Applications\extra\adobe\AcroRdrDCUpd2500120531.msp" /quiet /norestart
+ Apply Adobe Reader Update
+
+
+
+
+ 26
+ C:\Deploy\Applications\extra\java\jre-8u441-windows-i586.exe /s INSTALLDIR="C:\Program Files (x86)\Java\jre1.8.0_441" STATIC=1 AUTO_UPDATE=0 REBOOT=0 SPONSORS=0 WEB_JAVA=0 /L "C:\Windows\Logs\java-install.log"
+ Install Java JRE 8 Update 441 with Enterprise Settings and Logging
+
+
+
+
+ 27
+ cmd /c reg add "HKLM\SOFTWARE\JavaSoft\Java Update\Policy" /v EnableJavaUpdate /t REG_DWORD /d 0 /f
+ Disable Java Auto Updates (64-bit)
+
+
+
+
+ 28
+ cmd /c reg add "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Update\Policy" /v EnableJavaUpdate /t REG_DWORD /d 0 /f
+ Disable Java Auto Updates (32-bit)
+
+
+
+
+ 29
+ cmd /c reg add "HKLM\SOFTWARE\JavaSoft\Java Update\Policy" /v EnableAutoUpdateCheck /t REG_DWORD /d 0 /f
+ Disable Java Auto Update Check (64-bit)
+
+
+
+
+ 30
+ cmd /c reg add "HKLM\SOFTWARE\Wow6432Node\JavaSoft\Java Update\Policy" /v EnableAutoUpdateCheck /t REG_DWORD /d 0 /f
+ Disable Java Auto Update Check (32-bit)
+
+
+
+
+ 31
+ cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v AllowCortana /t REG_DWORD /d 0 /f
+ Disable Cortana
+
+
+
+
+ 33
+ cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v DisableWebSearch /t REG_DWORD /d 1 /f
+ Disable Web Search in Start Menu
+
+
+
+
+ 34
+ cmd /c reg load HKU\TempDU C:\Users\Default\NTUSER.DAT & reg add "HKU\TempDU\Software\Policies\Microsoft\Windows\Explorer" /v DisableSearchBoxSuggestions /t REG_DWORD /d 1 /f & reg unload HKU\TempDU
+ Disable Bing/web search suggestions (Default User hive)
+
+
+
+
+ 35
+ cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v ConnectedSearchUseWeb /t REG_DWORD /d 0 /f
+ Disable Connected Search Use Web
+
+
+
+
+ 36
+ cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\InputPersonalization" /v AllowInputPersonalization /t REG_DWORD /d 0 /f
+ Disable Cortana Speech Recognition
+
+
+
+
+ 38
+ cmd /c reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Windows Search" /v EnableDynamicContentInWSB /t REG_DWORD /d 0 /f
+ Disable Search Highlights
+
+
+
+ 39
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\sxs\microsoft-windows-netfx3-ondemand-package~31bf3856ad364e35~amd64~~.cab" dism /online /enable-feature /featurename:NetFx3 /all /source:"C:\Deploy\Applications\extra_engineering\prereqs\sxs" /limitaccess
+ Enable .NET Framework 3.5 from staged sxs
+
+
+ 40
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v10.0.40219.325_x64\InstallMSVC2010Redist10.0.40219.325_x64.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v10.0.40219.325_x64\InstallMSVC2010Redist10.0.40219.325_x64.exe"
+ VC++ 2010 x64
+
+
+ 41
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v10.0.40219.325\InstallMSVC2010Redist10.0.40219.325.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v10.0.40219.325\InstallMSVC2010Redist10.0.40219.325.exe"
+ VC++ 2010 x86
+
+
+ 42
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v11.0.60610.1_x64\InstallMSVC2012Redist11.0.60610.1_x64.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v11.0.60610.1_x64\InstallMSVC2012Redist11.0.60610.1_x64.exe"
+ VC++ 2012 x64
+
+
+ 43
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v11.0.60610.1\InstallMSVC2012Redist11.0.60610.1.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v11.0.60610.1\InstallMSVC2012Redist11.0.60610.1.exe"
+ VC++ 2012 x86
+
+
+ 44
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v9.0.30729.5026_x64\InstallMSVC2008Redist.5026_x64.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v9.0.30729.5026_x64\InstallMSVC2008Redist.5026_x64.exe"
+ VC++ 2008 x64
+
+
+ 45
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v9.0.30729.5026\InstallMSVC2008Redist.5026.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v9.0.30729.5026\InstallMSVC2008Redist.5026.exe"
+ VC++ 2008 x86
+
+
+ 46
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v8.0.50727.6195_x64\InstallMSVC2005Redist.6195_x64.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v8.0.50727.6195_x64\InstallMSVC2005Redist.6195_x64.exe"
+ VC++ 2005 x64
+
+
+ 47
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v8.0.50727.6195\InstallMSVC2005Redist.6195.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v8.0.50727.6195\InstallMSVC2005Redist.6195.exe"
+ VC++ 2005 x86
+
+
+ 48
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v12.0.30501.0_x64\InstallMSVC2013Redist12.0.30501.0_x64.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v12.0.30501.0_x64\InstallMSVC2013Redist12.0.30501.0_x64.exe"
+ VC++ 2013 x64
+
+
+ 49
+ cmd /c if exist "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v14.40.33816_x64\InstallMSVC20152022Redist14.40.33816_x64.exe" "C:\Deploy\Applications\extra_engineering\prereqs\redistrib\v14.40.33816_x64\InstallMSVC20152022Redist14.40.33816_x64.exe"
+ VC++ 2015-2022 x64
+
+
+
+
+
+
+
+
+
+ true
+ true
+ false
+ false
+ true
+ Work
+ 3
+ false
+ false
+
+
+
+ 1
+ shutdown -a
+ Cancel any scheduled shutdown from Office installation
+
+
+
+
+ 2
+ C:\Deploy\Applications\extra\zscaler\zscaler.bat
+ Install Zscaler Client Connector
+
+
+
+
+ 3
+ cmd /c "cd /d C:\Deploy\Applications\extra\office\ && install.bat"
+ Install Microsoft Office
+
+
+
+
+
+