diff --git a/scripts/copy-executables.cmd b/scripts/copy-executables.cmd
index ad3c24f..dc0fdb3 100644
--- a/scripts/copy-executables.cmd
+++ b/scripts/copy-executables.cmd
@@ -12,6 +12,7 @@ for %%E in (
   snapshot64.exe
   putty.exe
   puttygen.exe
+  rufus.exe
   Windows-ISO-Downloader.exe
 
 ) do (
diff --git a/scripts/startmenu/Rufus.lnk b/scripts/startmenu/Rufus.lnk
new file mode 100644
index 0000000..4c3a8be
Binary files /dev/null and b/scripts/startmenu/Rufus.lnk differ
diff --git a/software/basic.csv b/software/basic.csv
index e9eba69..9566cb5 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -19,6 +19,7 @@ https://www.sordum.org/files/downloads.php?st-windows-update-blocker wub.zip
 https://golang.org/dl/go1.16.windows-amd64.msi go-setup.msi
 https://www.python.org/ftp/python/3.9.2/python-3.9.2-amd64.exe python3-setup.exe
 https://www.nirsoft.net/utils/regscanner-x64.zip regscanner.zip
+https://github.com/pbatard/rufus/releases/download/v3.13/rufus-3.13p.exe rufus.exe
 http://www.drivesnapshot.de/download/snapshot64.exe snapshot64.exe
 https://helgeklein.com/downloads/SetACL/current/SetACL%20(executable%20version).zip setacl.zip
 https://github.com/Superfly-Inc/ShowKeyPlus/releases/download/ShowKeyPlus1.1.14.1/ShowKeyPlus1.1.14.1.zip showkeyplus.zip
diff --git a/wim/mount-boot.cmd b/wim/mount-boot.cmd
index 17ca3ba..edcf680 100644
--- a/wim/mount-boot.cmd
+++ b/wim/mount-boot.cmd
@@ -2,10 +2,13 @@
 set SOURCES=c:\TEMP\W10\sources
 set BOOT=c:\TEMP\BOOT
 
+rem cleanup ...
+rd /S /Q %BOOT% 2>nul
+
 echo creating wim mountpoint for BOOT ...
 mkdir %BOOT% 1>nul 2>nul
 
-echo set write access for boot.wim ..
+echo set write access for boot.wim ...
 attrib -R %SOURCES%\boot.wim
 
 echo mounting boot.wim to %BOOT% ...
diff --git a/wim/mount-image.cmd b/wim/mount-image.cmd
index 248eb12..a6e1458 100644
--- a/wim/mount-image.cmd
+++ b/wim/mount-image.cmd
@@ -5,6 +5,9 @@ set IMAGE=c:\TEMP\IMAGE
 echo creating image mountpoint ...
 mkdir %IMAGE% 1>nul 2>nul
 
+rem set write access ...
+attrib -R %SOURCES%\install.wim 2>nul
+
 echo mounting install.IMAGE to %IMAGE% ...
 dism /Mount-IMAGE /IMAGEFile:%SOURCES%\install.wim /Name:"Windows 10 Pro" /MountDir:%IMAGE%
 
diff --git a/wim/packages-to-remove.csv b/wim/packages-to-remove.csv
index 31aa371..51658c6 100644
--- a/wim/packages-to-remove.csv
+++ b/wim/packages-to-remove.csv
@@ -5,7 +5,6 @@ Containers-DisposableClientVM
 Containers-Guest-Gated
 Containers-OptionalFeature
 Containers-Server
-DeviceAccess
 HyperV
 LanguageFeatures-WordBreaking
 Media-FaceAnalysis
@@ -13,7 +12,6 @@ Media-Ocr
 Microsoft-Composable-PlatformExtension
 Microsoft-Hyper-V
 Microsoft-IoTUAP-ShellExt-Tools
-Microsoft-Mobile
 Microsoft-PPIProjection
 Microsoft-UtilityVM
 Microsoft-Windows-3DAudio
@@ -40,7 +38,6 @@ Microsoft-Windows-ContentDeliveryManager
 Microsoft-Windows-CoreSystem-DebugTransports
 Microsoft-Windows-Cortana
 Microsoft-Windows-DataCenterBridging
-Microsoft-Windows-DeviceSync
 Microsoft-Windows-DirectoryServices
 Microsoft-Windows-EnterpriseClientSync
 Microsoft-Windows-FodMetadata
@@ -64,9 +61,6 @@ Microsoft-Windows-Lxss
 Microsoft-Windows-Management-SecureAssessment
 Microsoft-Windows-Migration
 Microsoft-Windows-MiracastView
-Microsoft-Windows-MobileBroadband
-Microsoft-Windows-MobileCore
-Microsoft-Windows-MobilePC
 Microsoft-Windows-MRT10
 Microsoft-Windows-MSMQ
 Microsoft-Windows-MultiPoint-Connector
@@ -83,8 +77,6 @@ Microsoft-Windows-PAW-Feature
 Microsoft-Windows-PeerDist
 Microsoft-Windows-PeerToPeer
 Microsoft-Windows-PerformanceCounters
-Microsoft-Windows-PhotoBasic
-Microsoft-Windows-Portable-Devices
 Microsoft-Windows-Printing-InternetPrinting-Client
 Microsoft-Windows-Printing-LocalPrinting-Enterprise
 Microsoft-Windows-Printing-PremiumTools
@@ -115,7 +107,6 @@ Microsoft-Windows-SMB1Server-D-Opt
 Microsoft-Windows-SmbDirect-Opt
 Microsoft-Windows-SmbDirect
 Microsoft-Windows-SNMP
-Microsoft-Windows-StorageService
 Microsoft-Windows-Store
 Microsoft-Windows-SystemRestore
 Microsoft-Windows-TabletPC
diff --git a/wim/packages-to-remove.csv.ORIG b/wim/packages-to-remove.csv.ORIG
new file mode 100644
index 0000000..31aa371
--- /dev/null
+++ b/wim/packages-to-remove.csv.ORIG
@@ -0,0 +1,167 @@
+Adobe-Flash
+Containers-ApplicationGuard
+Containers-Client
+Containers-DisposableClientVM
+Containers-Guest-Gated
+Containers-OptionalFeature
+Containers-Server
+DeviceAccess
+HyperV
+LanguageFeatures-WordBreaking
+Media-FaceAnalysis
+Media-Ocr
+Microsoft-Composable-PlatformExtension
+Microsoft-Hyper-V
+Microsoft-IoTUAP-ShellExt-Tools
+Microsoft-Mobile
+Microsoft-PPIProjection
+Microsoft-UtilityVM
+Microsoft-Windows-3DAudio
+Microsoft-Windows-ApiSetSchemaExtension-HyperV
+Microsoft-Windows-AppCompat
+Microsoft-Windows-AppManagement
+Microsoft-Windows-AppServerClient
+Microsoft-Windows-Backup
+Microsoft-Windows-Basic-Http-Minio
+Microsoft-Windows-BioEnrollment
+Microsoft-Windows-BITS
+Microsoft-Windows-Browser
+Microsoft-Windows-BusinessScanning
+Microsoft-Windows-Casting
+Microsoft-Windows-Client-AssignedAccess
+Microsoft-Windows-Client-EmbeddedExp
+Microsoft-Windows-Client-Optional-Features
+Microsoft-Windows-Client-ShellLauncher
+Microsoft-Windows-Common-Modem
+Microsoft-Windows-COM-MSMQ
+Microsoft-Windows-Compression
+Microsoft-Windows-ContactSupport
+Microsoft-Windows-ContentDeliveryManager
+Microsoft-Windows-CoreSystem-DebugTransports
+Microsoft-Windows-Cortana
+Microsoft-Windows-DataCenterBridging
+Microsoft-Windows-DeviceSync
+Microsoft-Windows-DirectoryServices
+Microsoft-Windows-EnterpriseClientSync
+Microsoft-Windows-FodMetadata
+Microsoft-Windows-Geolocation
+Microsoft-Windows-Hello-Face
+Microsoft-Windows-Help
+Microsoft-Windows-HVSI-Components
+Microsoft-Windows-HyperV-OptionalFeature-HypervisorPlatform
+Microsoft-Windows-HyperV-OptionalFeature-VirtualMachinePlatform
+Microsoft-Windows-Identity-Foundation
+Microsoft-Windows-IIS-WebServer
+Microsoft-Windows-International
+Microsoft-Windows-InternetExplorer
+Microsoft-Windows-Internet
+Microsoft-Windows-Killbits
+Microsoft-Windows-LanguageEnablingComponents
+Microsoft-Windows-LanguageFeatures
+Microsoft-Windows-Legacy
+Microsoft-Windows-Links
+Microsoft-Windows-Lxss
+Microsoft-Windows-Management-SecureAssessment
+Microsoft-Windows-Migration
+Microsoft-Windows-MiracastView
+Microsoft-Windows-MobileBroadband
+Microsoft-Windows-MobileCore
+Microsoft-Windows-MobilePC
+Microsoft-Windows-MRT10
+Microsoft-Windows-MSMQ
+Microsoft-Windows-MultiPoint-Connector
+Microsoft-Windows-Network-Connectivity-Assistant
+Microsoft-Windows-NetworkDiagnostics
+Microsoft-Windows-Network-QoS
+Microsoft-Windows-NFS
+Microsoft-Windows-Not-Supported-On-LTSB
+Microsoft-Windows-OfflineFiles
+Microsoft-Windows-OneCore-Containers
+Microsoft-Windows-OneDrive
+Microsoft-Windows-ParentalControls
+Microsoft-Windows-PAW-Feature
+Microsoft-Windows-PeerDist
+Microsoft-Windows-PeerToPeer
+Microsoft-Windows-PerformanceCounters
+Microsoft-Windows-PhotoBasic
+Microsoft-Windows-Portable-Devices
+Microsoft-Windows-Printing-InternetPrinting-Client
+Microsoft-Windows-Printing-LocalPrinting-Enterprise
+Microsoft-Windows-Printing-PremiumTools
+Microsoft-Windows-Printing-PrintToPDFServices
+microsoft-windows-printing-wfs-fod-package-Wrapper
+Microsoft-Windows-Printing-WFS-FoD-Package
+Microsoft-Windows-Printing-XPSServices
+Microsoft-Windows-Provisioning
+Microsoft-Windows-Proximity
+Microsoft-Windows-QuickAssist
+Microsoft-Windows-RDC
+Microsoft-Windows-RemoteAssistance
+Microsoft-Windows-RemoteDesktop
+Microsoft-Windows-RemoteFX
+Microsoft-Windows-RetailDemo
+Microsoft-Windows-Search2
+Microsoft-Windows-SearchEngine
+Microsoft-Windows-SenseClient
+Microsoft-Windows-Serial
+Microsoft-Windows-ShareMedia
+Microsoft-Windows-Shell-HomeGroup
+Microsoft-Windows-Shell-SettingSync
+Microsoft-Windows-Skype
+Microsoft-Windows-SMB1Client-D
+Microsoft-Windows-SMB1Deprecation-Group
+Microsoft-Windows-SMB1
+Microsoft-Windows-SMB1Server-D-Opt
+Microsoft-Windows-SmbDirect-Opt
+Microsoft-Windows-SmbDirect
+Microsoft-Windows-SNMP
+Microsoft-Windows-StorageService
+Microsoft-Windows-Store
+Microsoft-Windows-SystemRestore
+Microsoft-Windows-TabletPC
+Microsoft-Windows-TabletPCMath
+microsoft-windows-tabletpcmath-package-Wrapper
+Microsoft-Windows-TabShellExperience
+Microsoft-Windows-TerminalServices
+Microsoft-Windows-TextPrediction-Dictionaries
+Microsoft-Windows-TextPrediction
+Microsoft-Windows-TroubleShooting
+Microsoft-Windows-TS
+Microsoft-Windows-UpdateTargeting-ClientOS
+Microsoft-Windows-UserExperience
+microsoft-windows-userexperience-desktop-package-Wrapper
+Microsoft-Windows-Virtualization-RemoteFX-User-Mode-Transport
+Microsoft-Windows-Virtualization
+Microsoft-Windows-VirtualPC
+Microsoft-Windows-VirtualXP
+Microsoft-Windows-WebcamExperience
+Microsoft-Windows-WindowsFoundation-LanguagePack
+Microsoft-Windows-WinOcr
+Microsoft-Windows-WinRT
+Microsoft-Windows-WinSATMediaFiles
+Microsoft-Windows-WMIPerf
+Microsoft-Windows-WordBreaking
+Microsoft-Windows-WorkplaceJoin
+Microsoft-Windows-WPD-LegacyWmdmFeature
+Microsoft-Windows-WPD-UltimatePortableDeviceFeature-Feature
+Microsoft-Windows-Xps
+Microsoft-Xbox
+MSMQ-Driver-Package
+MultiPoint
+Networking-MPSSVC-Rules-EnterpriseEdition-Package
+OpenSSH-Client-Package
+openssh-client-package-Wrapper
+RemoteDesktopServices
+Sensors-Universal
+Server-Help
+Windows-Defender
+WindowsSearchEngineSKU-Group
+Microsoft-OneCore-Multimedia-CastingCommon
+Microsoft-OneCore-Multimedia-CastingReceiver
+Microsoft-OneCore-Multimedia-CastingTransmitter
+Microsoft-OneCore-DeviceUpdateCenter
+Microsoft-OneCore-DirectX-Database
+Microsoft-OneCore-IsolatedUserMode
+Microsoft-Onecore-SPP-VirtualDevice
+Microsoft-OneCore-VirtualizationBasedSecurity
+Microsoft-Windows-WMPNetworkSharingService