diff --git a/.gitignore b/.gitignore
index fdeaa0f..0a5d427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,10 @@
+*.swp
*.wim
*.iso
*.exe
*.dll
+null
+log.txt
+Packages.txt
distribution
-*.swp
-
+SOFTWAREBKP
diff --git a/PrepareStick.cmd b/PrepareStick.cmd
index ce79e95..2892193 100644
--- a/PrepareStick.cmd
+++ b/PrepareStick.cmd
@@ -1,22 +1,35 @@
@echo off
-set TARGET=D:
-set TESTSCRIPT=1st-logon.cmd
+set TARGET=D:\
set SOURCES=c:\TEMP\Win10\sources
echo ####### %0 #######
+echo using drive %TARGET% ...
+
+if NOT EXIST %TARGET% (
+ echo ERROR: drive %TARGET% not found!
+ exit /b
+)
+
+:ask
+ set /p answer="BIOS or UEFI setup (B/U)? "
+ if /i "%answer:~,1%" EQU "B" (
+ copy /Y autounattend_BIOS.xml %TARGET%\autounattend.xml
+ goto cont
+ )
+ if /i "%answer:~,1%" EQU "U" (
+ copy /Y autounattend_UEFI.xml %TARGET%\autounattend.xml
+ goto cont
+ )
+ echo Please type B for BIOS or U for UEFI setup.
+ goto ask
+:cont
+
if EXIST %SOURCES%\install_FINAL.esd (
robocopy %SOURCES% %TARGET%\sources install_FINAL.esd
del /Q %TARGET%\sources\install.esd 1>nul 2>nul
- move %TARGET%\sources\install_FINAL.esd %TARGET%\sources\install.esd
- move %SOURCES%\install_FINAL.esd %SOURCES%\install_FINAL_copy.esd
+ move /Y %TARGET%\sources\install_FINAL.esd %TARGET%\sources\install.esd
+ move /Y %SOURCES%\install_FINAL.esd %SOURCES%\install_FINAL_copy.esd
)
-copy /Y autounattend.xml %TARGET%\
-copy /Y 1st-logon.cmd %TARGET%\
-copy /Y ToolsDownload.ftp %TARGET%\
-copy /Y SetupComplete.cmd %TARGET%\
-copy /Y SetupComplete.ps1 %TARGET%\
-
echo ####### %0 #######
-
diff --git a/RunScriptTest.cmd b/RunScriptTest.cmd
index fc99524..6731fbc 100644
--- a/RunScriptTest.cmd
+++ b/RunScriptTest.cmd
@@ -1,16 +1,15 @@
@echo off
-set TARGET=D:
-set TESTSCRIPT=1st-logon.cmd
+set SCRIPTS=%WINDIR%\Setup\scripts
+set LOG=C:\SetupComplete.txt
+mkdir %SCRIPTS% 1>nul 2>nul
+del /Q %LOG% 1>nul 2>nul
echo ####### %0 #######
-copy /Y autounattend.xml %TARGET%\
-copy /Y 1st-logon.cmd %TARGET%\
-copy /Y ToolsDownload.ftp %TARGET%\
-copy /Y SetupComplete.cmd %TARGET%\
-copy /Y SetupComplete.ps1 %TARGET%\
+copy /Y SetupComplete.cmd %SCRIPTS%
+copy /Y ToolsDownload.* %SCRIPTS%
echo ####### %0 #######
-rem call %TARGET%\%TESTSCRIPT%
+call %SCRIPTS%\SetupComplete.cmd
diff --git a/SetupComplete.cmd b/SetupComplete.cmd
index ebaf9e7..d98a51d 100644
--- a/SetupComplete.cmd
+++ b/SetupComplete.cmd
@@ -1,9 +1,46 @@
@echo off
-rem SetupComplete.cmd ...
+set LOG=c:\SetupComplete.txt
+set SETUPDIR=c:\Windows\Setup\scripts
+set FTPSCRIPT=ToolsDownload.cmd
+
+del /Q %LOG% 1>nul 2>nul
+if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1
+shift /1
echo ####### %0 #######
+date /t
+time /t
+echo.
-echo [ place your code here ] ...
+echo Disable Windows "Hi" Animation ...
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" ^
+ /v EnableFirstLogonAnimation /t REG_DWORD /d 0 /f
+reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" ^
+ /v EnableFirstLogonAnimation /t REG_DWORD /d 0 /f
+echo.
+rem allow execution of any powershell script ...
+powershell -Command "Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope LocalMachine"
+powershell -Command ^
+"$R=Get-ExecutionPolicy ; if ($R -eq 'Bypass') { ^
+ write-host 'POWERSHELL: Execution Policy was set to BYPASS' ^
+} ^
+ else { ^
+ write-host 'ERROR: CANNOT SET Execution Policy to BYPASS !' ^
+}"
+echo.
+
+rem call initial download script ...
+cd /D %SETUPDIR%
+if EXIST %FTPSCRIPT% (
+ echo EXECUTING %FTPSCRIPT% ...
+ call %FTPSCRIPT%
+) else (
+ echo INFO: %FTPSCRIPT% not found!
+)
+
+echo.
+date /t
+time /t
echo ####### %0 #######
diff --git a/SetupComplete.ps1 b/SetupComplete.ps1
deleted file mode 100644
index 334d893..0000000
--- a/SetupComplete.ps1
+++ /dev/null
@@ -1,16 +0,0 @@
-# SetupComplete.ps1 ...
-
-write-host '#######',(split-path $PSCommandPath -Leaf),'#######'
-
-echo "[ place your code here ] ..."
-
-$progressPreference = 'SilentlyContinue'
-Get-AppxPackage -AllUsers |
- where-object {$_.name -notlike "*store*"} |
- Remove-AppxPackage
-Get-AppxProvisionedPackage -online |
- where-object {$_.name -notlike "*store*"} |
- Remove-AppxProvisionedPackage -online
-
-write-host '#######',(split-path $PSCommandPath -Leaf),'#######'
-
diff --git a/1st-logon.cmd b/ToolsDownload.cmd
similarity index 62%
rename from 1st-logon.cmd
rename to ToolsDownload.cmd
index 9a41d7d..fa5b501 100644
--- a/1st-logon.cmd
+++ b/ToolsDownload.cmd
@@ -1,10 +1,20 @@
@echo off
+set LOG=c:\ToolsDownload.txt
+set SETUPDIR=c:\Windows\Setup\scripts
+set FTPSCRIPT=ToolsDownload.ftp
+
set T=c:\TEMP
set TOOLS=c:\tools
set SCRIPTS=c:\scripts
-set FTPSCRIPT=ToolsDownload.ftp
+
+del /Q %LOG% 1>nul 2>nul
+if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1
+shift /1
echo ####### %0 #######
+date /t
+time /t
+echo.
echo killing some processes...
taskkill /F /IM ssh-agent.exe
@@ -30,19 +40,16 @@ echo DISABLE firewall (for FTP access) ...
netsh advfirewall set allprofiles state off
echo getting TOOLS from webserver ...
-rem try to call a script...
-for %%D in (H G F E D) do (
- if EXIST %%D:\%FTPSCRIPT% (
- echo EXECUTING ftp-script %FTPSCRIPT% on drive %%D ...
- ftp -i -s:%%D:\%FTPSCRIPT%
- ) else (
- echo INFO: %FTPSCRIPT% not found on drive %%D!
- )
-
+cd /D %SETUPDIR%
+if EXIST %FTPSCRIPT% (
+ echo EXECUTING ftp script %FTPSCRIPT% in path %SETUPDIR% ...
+ ftp -i -s:%FTPSCRIPT%
+) else (
+ echo INFO: %FTPSCRIPT% not found in path %SETUPDIR% !
)
+echo.
+date /t
+time /t
echo ####### %0 #######
-echo STARTING setup script...
-call %SCRIPTS%\1st-setup.cmd
-
diff --git a/autounattend_BIOS.xml b/autounattend_BIOS.xml
new file mode 100644
index 0000000..c37d513
--- /dev/null
+++ b/autounattend_BIOS.xml
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+ de-DE
+
+ de-DE
+ de-DE
+ en-US
+ en-US
+
+
+
+ OnError
+
+
+
+ 1
+ 100
+ Primary
+
+
+ 2
+ Primary
+ true
+
+
+
+
+ 1
+ 1
+ NTFS
+
+ true
+
+
+ 2
+ 2
+ C
+
+ NTFS
+
+
+ 0
+ true
+
+
+
+
+
+ 0
+ 2
+
+ OnError
+
+
+
+
+ VK7JG-NPHTM-C97JM-9MPGT-3V66T
+
+ true
+ none
+
+
+
+
+
+
+ IBM PC
+ Windows
+
+ true
+ none
+ none
+ Central Europe Standard Time
+ VK7JG-NPHTM-C97JM-9MPGT-3V66T
+ true
+
+
+ 0
+
+
+
+
+ de-DE
+ de-DE
+ en-US
+ en-US
+
+
+
+ true
+ true
+ true
+ 1
+ true
+
+
+
+
+
+ UwB0AGEAcgB0AF8AMQAyADMANAA1ACEAUABhAHMAcwB3AG8AcgBkAA==
+ false
+
+ support
+ support
+ Administrators
+
+
+
+
+
+ UwB0AGEAcgB0AF8AMQAyADMANAA1ACEAUABhAHMAcwB3AG8AcgBkAA==
+ false
+
+ true
+ 1
+ support
+
+
+
+ 1
+ Password Never Expires
+ cmd /C wmic useraccount where name="support" set PasswordExpires=false
+
+
+ 2
+ Initial Setup
+ cmd /C c:\scripts\1st-setup.cmd
+
+
+
+
+
+
+ false
+
+
+
+
diff --git a/autounattend.xml b/autounattend_UEFI.xml
similarity index 97%
rename from autounattend.xml
rename to autounattend_UEFI.xml
index 24e1352..414ce9f 100644
--- a/autounattend.xml
+++ b/autounattend_UEFI.xml
@@ -148,7 +148,7 @@
2
Initial Setup
- cmd /C D:\1st-logon.cmd
+ cmd /C c:\scripts\1st-setup.cmd
diff --git a/wimscripts/copy-iso.cmd b/copy-iso.cmd
similarity index 95%
rename from wimscripts/copy-iso.cmd
rename to copy-iso.cmd
index 17746dc..8626607 100644
--- a/wimscripts/copy-iso.cmd
+++ b/copy-iso.cmd
@@ -6,4 +6,3 @@ mkdir %W10% 1>nul 2>nul
powershell Mount-DiskImage -ImagePath %W10%.iso
robocopy \\.\CDROM0 %W10% /MIR /256
powershell Dismount-Diskimage -ImagePath %W10%.iso
-
diff --git a/wimscripts/download-iso.cmd b/download-iso.cmd
similarity index 100%
rename from wimscripts/download-iso.cmd
rename to download-iso.cmd
diff --git a/wimscripts/download-iso.ftp b/download-iso.ftp
similarity index 84%
rename from wimscripts/download-iso.ftp
rename to download-iso.ftp
index 0943ed3..744da08 100644
--- a/wimscripts/download-iso.ftp
+++ b/download-iso.ftp
@@ -3,6 +3,7 @@ w10install
9054c6cf-c54c
binary
lcd c:\TEMP
+cd iso
mget Win10*.iso
bye
diff --git a/wimscripts/export-image.cmd b/export-image.cmd
similarity index 100%
rename from wimscripts/export-image.cmd
rename to export-image.cmd
diff --git a/wimscripts/finish-image.cmd b/finish-image.cmd
similarity index 77%
rename from wimscripts/finish-image.cmd
rename to finish-image.cmd
index e76b188..96fb9c9 100644
--- a/wimscripts/finish-image.cmd
+++ b/finish-image.cmd
@@ -5,9 +5,14 @@ set MNT=c:\TEMP\WIM
rd /S /Q %MNT%\Windows\Setup\scripts 1>nul 2>nul
mkdir %MNT%\Windows\Setup\scripts 1>nul 2>nul
-rem copy SetupComplete script ...
+echo copy SetupComplete script ...
copy /Y SetupComplete.cmd %MNT%\Windows\Setup\scripts
if %errorlevel% neq 0 exit /b %errorlevel%
+
+echo copy ftp scripts ...
+copy /Y ToolsDownload.* %MNT%\Windows\Setup\scripts
+if %errorlevel% neq 0 exit /b %errorlevel%
+
dir %MNT%\Windows\Setup\scripts
dism /Image:%MNT% /Cleanup-Image /StartComponentCleanup /ResetBase
diff --git a/wimscripts/get-wiminfo.cmd b/get-wiminfo.cmd
similarity index 100%
rename from wimscripts/get-wiminfo.cmd
rename to get-wiminfo.cmd
diff --git a/wimscripts/mount-wim.cmd b/mount-wim.cmd
similarity index 100%
rename from wimscripts/mount-wim.cmd
rename to mount-wim.cmd
diff --git a/reduced-remove.cmd b/reduced-remove.cmd
new file mode 100644
index 0000000..1532e56
--- /dev/null
+++ b/reduced-remove.cmd
@@ -0,0 +1,179 @@
+set MNT=c:\TEMP\WIM
+
+install_wim_tweak.exe /p %MNT% /c "Adobe-Flash" /r /n
+install_wim_tweak.exe /p %MNT% /c "Containers-ApplicationGuard" /r /n
+install_wim_tweak.exe /p %MNT% /c "Containers-Client" /r /n
+install_wim_tweak.exe /p %MNT% /c "Containers-DisposableClientVM" /r /n
+install_wim_tweak.exe /p %MNT% /c "Containers-Guest-Gated" /r /n
+install_wim_tweak.exe /p %MNT% /c "Containers-OptionalFeature" /r /n
+install_wim_tweak.exe /p %MNT% /c "Containers-Server" /r /n
+install_wim_tweak.exe /p %MNT% /c "DeviceAccess" /r /n
+install_wim_tweak.exe /p %MNT% /c "HyperV" /r /n
+install_wim_tweak.exe /p %MNT% /c "LanguageFeatures-WordBreaking" /r /n
+install_wim_tweak.exe /p %MNT% /c "Media-FaceAnalysis" /r /n
+install_wim_tweak.exe /p %MNT% /c "Media-Ocr" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Composable-PlatformExtension" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Hyper-V" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-IoTUAP-ShellExt-Tools" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Media-Foundation" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Mobile" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-AllJoyn" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-AllowTelemetry" /r /n
+install_wim_tweak.exe /p %MNT% /c "microsoft-onecore-applicationmodel-sync-desktop" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-ApplicationModel-Sync" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Biometrics" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-BITS" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-CameraCaptureUI" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Connectivity-NFC" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Connectivity-Serial" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Containers" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-DebugCore" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-DeviceUpdateCenter" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-EnergyEstimationEngine" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-ESENT" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Gaming" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-HyperV" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Indexer" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-InkPlatform" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Maps" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Miracast" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Multimedia-CastingCommon" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Multimedia-CastingReceiver" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Multimedia-CastingTransmitter" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Multimedia-MFPMP" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Networking-MobileBroadbandApi" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-NowPlayingSessionManager" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-PointOfService" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-RemoteDesktopServices" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Sensors" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-SpeechComponents" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Onecore-SPP-VirtualDevice" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Tethering" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-TroubleShooting" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-UserDataAccess" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-Wallet" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-OneCore-WebService" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-PPIProjection" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-UtilityVM" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-3DAudio" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-ApiSetSchemaExtension-HyperV" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-AppCompat" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-AppManagement" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-AppServerClient" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Backup" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Basic-Http-Minio" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-BioEnrollment" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-BITS" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Branding-Enterprise" /r /n
+rem install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Browser" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-BusinessScanning" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Casting" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Client-AssignedAccess" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Client-EmbeddedExp" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Client-Optional-Features" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Client-ShellLauncher" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Common-Modem" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-COM-MSMQ" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Compression" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-ContactSupport" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-ContentDeliveryManager" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-CoreSystem-DebugTransports" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Cortana" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-DataCenterBridging" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-DeviceSync" /r /n
+install_wim_tweak.exe /p %MNT% /c "microsoft-windows-directoryservices-adam" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-DirectoryServices-ADAM" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-EnterpriseClientSync" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-FodMetadata" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Geolocation" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Hello-Face" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Help" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-HVSI-Components" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-HyperV-OptionalFeature-HypervisorPlatform" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-HyperV-OptionalFeature-VirtualMachinePlatform" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Identity-Foundation" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-IIS-WebServer" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-International" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-InternetExplorer" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Internet" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Killbits" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-LanguageEnablingComponents" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-LanguageFeatures" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Legacy" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Links" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Lxss" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Management-SecureAssessment" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Media-Format" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MediaPlayback-OC" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MediaPlayer" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Media-Streaming" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Migration" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MiracastView" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MobileBroadband" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MobileCore" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MobilePC" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MRT10" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MSMQ-Client" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MSMQ-MMC-OptGroup" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-msmq" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-MultiPoint-Connector" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Network-Connectivity-Assistant" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NetworkDiagnostics" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Network-QoS" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-NFS" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Notepad-FoD" /r /n
+install_wim_tweak.exe /p %MNT% /c "microsoft-windows-notepad" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-Not-Supported-On-LTSB" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-OfflineFiles" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-OneCore-Containers" /r /n
+install_wim_tweak.exe /p %MNT% /c "Microsoft-Windows-OneDrive" /r /n
+
+rem ESSENTIAL (do NOT remove):
+
+rem Microsoft-Client-License-Platform
+rem Microsoft-Windows-20H2Enablement
+rem Microsoft-Windows-Client-Desktop-Required
+rem Microsoft-Windows-Client-LanguagePack
+rem Microsoft-Windows-Common-Foundation
+rem Microsoft-Windows-Common-RegulatedPackages
+rem Microsoft-Windows-ConfigCI
+rem Microsoft-Windows-Desktop-BCDTemplate
+rem Microsoft-Windows-DesktopFileExplorer
+rem Microsoft-Windows-DeviceGuard-GPEXT
+rem Microsoft-Windows-EditionPack-Professional
+rem Microsoft-Windows-EditionSpecific-Professional
+rem Microsoft-Windows-Editions-Professional
+rem Microsoft-Windows-Embedded-UnifiedWriteFilterCSP
+rem Microsoft-Windows-Enterprise-Desktop-Share
+rem Microsoft-Windows-FCI-Client
+rem Microsoft-Windows-Foundation
+rem Microsoft-Windows-GroupPolicy-ClientExtensions
+rem Microsoft-Windows-GroupPolicy-ClientTools
+rem Microsoft-Windows-Holographic-Desktop
+rem Microsoft-Windows-HVSI
+rem Microsoft-Windows-MSPaint-FoD
+rem Microsoft-Windows-NetFx
+rem Microsoft-Windows-NetFx2
+rem Microsoft-Windows-NetFx3
+rem Microsoft-Windows-NetFx4
+rem Microsoft-Windows-NewTabPageHost
+rem Microsoft-Windows-PowerShell-ISE-FOD
+rem Microsoft-Windows-Product-Data-EKB
+rem Microsoft-Windows-ProfessionalEdition
+rem Microsoft-Windows-Professional-SPP-Components
+rem Microsoft-Windows-RegulatedPackages
+rem Microsoft-Windows-Required-ShellExperiences-Desktop
+rem Microsoft-Windows-Runtime-Metadata-Desktop
+rem Microsoft-Windows-SecureStartup
+rem Microsoft-Windows-Security-SPP-Component-SKU
+rem Microsoft-Windows-ShellExperienceHost
+rem Microsoft-Windows-WMPNetworkSharingService
+
+rem CLEANUP:
+del SOFTWAREBKP 1>nul 2>nul
+
+rem export remaining PACKAGE names ...
+install_wim_tweak /p %MNT% /l
+dir Packages.txt
+
diff --git a/wimscripts/remove-components.cmd b/remove-components.cmd
similarity index 100%
rename from wimscripts/remove-components.cmd
rename to remove-components.cmd
diff --git a/wimscripts/umount-wim.cmd b/umount-wim.cmd
similarity index 100%
rename from wimscripts/umount-wim.cmd
rename to umount-wim.cmd
diff --git a/wimscripts/.gitignore b/wimscripts/.gitignore
deleted file mode 100644
index 59108a3..0000000
--- a/wimscripts/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-null
-SOFTWAREBKP
-*.swp
-log.txt
-Packages.txt
-
diff --git a/wimscripts/RunScriptTest.cmd b/wimscripts/RunScriptTest.cmd
deleted file mode 100644
index e7d2f50..0000000
--- a/wimscripts/RunScriptTest.cmd
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-set SCRIPTS=%WINDIR%\Setup\scripts
-set LOG=C:\SetupComplete.txt
-mkdir %SCRIPTS% 1>nul 2>nul
-del /Q %LOG% 1>nul 2>nul
-
-echo ####### %0 #######
-
-copy /Y SetupComplete.cmd %SCRIPTS%
-
-echo ####### %0 #######
-
-call %SCRIPTS%\SetupComplete.cmd
-start notepad %LOG%
-
diff --git a/wimscripts/SetupComplete.cmd b/wimscripts/SetupComplete.cmd
deleted file mode 100644
index 5e98dc0..0000000
--- a/wimscripts/SetupComplete.cmd
+++ /dev/null
@@ -1,53 +0,0 @@
-@echo off
-set LOG=C:\SetupComplete.txt
-set BATCH=SetupComplete.cmd
-set PS1=SetupComplete.ps1
-
-if not "%1"=="STDOUT_TO_FILE" %0 STDOUT_TO_FILE %* 1>%LOG% 2>&1
-shift /1
-
-echo ####### %0 #######
-date /t
-time /t
-echo.
-
-echo Disable Windows "Hi" Animation ...
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" ^
- /v EnableFirstLogonAnimation /t REG_DWORD /d 0 /f
-reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" ^
- /v EnableFirstLogonAnimation /t REG_DWORD /d 0 /f
-
-rem allow execution of any powershell script ...
-powershell -Command "Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope LocalMachine"
-powershell -Command ^
-"$T=Get-ExecutionPolicy ; if ($T -eq 'Bypass') { ^
- write-host 'POWERSHELL: Execution Policy was set to BYPASS' ^
-} ^
- else { ^
- write-host 'ERROR: CANNOT SET Execution Policy to BYPASS !' ^
-}"
-echo.
-
-rem try to call a script...
-for %%D in (H G F E D) do (
- if EXIST %%D:\%PS1% (
- echo EXECUTING %PS1% on drive %%D ...
- powershell -Command %%D:\%PS1%
- ) else (
- echo INFO: %PS1% not found on drive %%D!
- )
-
- if EXIST %%D:\%BATCH% (
- echo EXECUTING %BATCH% on drive %%D ...
- call %%D:\%BATCH%
- ) else (
- echo INFO: %BATCH% not found on drive %%D!
- )
-
-)
-
-echo.
-date /t
-time /t
-echo ####### %0 #######
-