diff --git a/.bin/Scripts/build_pe.ps1 b/.bin/Scripts/build_pe.ps1
new file mode 100644
index 00000000..4a08a1b4
--- /dev/null
+++ b/.bin/Scripts/build_pe.ps1
@@ -0,0 +1,262 @@
+# Wizard Kit: Windows PE Build Tool
+
+## Init ##
+#Requires -Version 3.0
+#Requires -RunAsAdministrator
+if (Test-Path Env:\DEBUG) {
+ Set-PSDebug -Trace 1
+}
+$Host.UI.RawUI.WindowTitle = "Wizard Kit: Windows PE Build Tool"
+$WD = $(Split-Path $MyInvocation.MyCommand.Path)
+$Bin = (Get-Item $WD -Force).Parent.FullName
+$Root = (Get-Item $Bin -Force).Parent.FullName
+$Temp = "{0}\tmp" -f $Bin
+$Date = Get-Date -UFormat "%Y-%m-%d"
+$Host.UI.RawUI.BackgroundColor = "Black"
+$Host.UI.RawUI.ForegroundColor = "White"
+# $ProgressPreference = "silentlyContinue"
+$SplitWindow = @()
+$WinPEPackages = @(
+ "WinPE-EnhancedStorage.cab",
+ "en-us\WinPE-EnhancedStorage_en-us.cab",
+ "WinPE-FMAPI.cab",
+ "WinPE-WMI.cab",
+ "en-us\WinPE-WMI_en-us.cab"
+)
+ # Install WinPE-WMI before you install WinPE-NetFX.
+ # "WinPE-NetFx.cab",
+ # "en-us\WinPE-NetFx_en-us.cab",
+
+ # Install WinPE-WMI and WinPE-NetFX before you install WinPE-Scripting.
+ # "WinPE-Scripting.cab",
+ # "en-us\WinPE-Scripting_en-us.cab",
+
+ # Install WinPE-WMI, WinPE-NetFX, and WinPE-Scripting before you install WinPE-PowerShell.
+ # "WinPE-PowerShell.cab",
+ # "en-us\WinPE-PowerShell_en-us.cab",
+
+ # Install WinPE-WMI, WinPE-NetFX, WinPE-Scripting, and WinPE-PowerShell before you install WinPE-DismCmdlets.
+ # "WinPE-DismCmdlets.cab",
+ # "en-us\WinPE-DismCmdlets_en-us.cab",
+
+ # Install WinPE-WMI, WinPE-NetFX, WinPE-Scripting, and WinPE-PowerShell before you install WinPE-SecureBootCmdlets.
+ # "WinPE-SecureBootCmdlets.cab",
+
+ # Install WinPE-WMI, WinPE-NetFX, WinPE-Scripting, and WinPE-PowerShell before you install WinPE-StorageWMI.
+ # "WinPE-StorageWMI.cab",
+ # "en-us\WinPE-StorageWMI_en-us.cab",
+
+## Fake DandISetEnv.bat ##
+# $DVars = @(
+ # @("DISMRoot", "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\amd64\DISM"),
+ # @("BCDBootRoot", "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\amd64\BCDBoot"),
+ # @("OSCDImgRoot", "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\amd64\Oscdimg"),
+ # @("WdsmcastRoot", "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\amd64\Wdsmcast"),
+ # @("HelpIndexerRoot", "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\HelpIndexer"),
+ # @("WSIMRoot", "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\WSIM"),
+ # @("WinPERoot", "C:\Program Files (x86)\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment")
+# )
+# foreach ($d in $DVars) {
+ # $varName = $d[0]
+ # $varValue = $d[1]
+ # Set-Item -Path Env:$varName -Value $varValue
+ # Set-Item -Path Env:PATH -Value ($Env:PATH + ";$varValue")
+# }
+$DISM = "{0}\DISM.exe" -f $Env:DISMRoot
+
+## Functions ##
+function Ask-User ($text = "Kotaero") {
+ $text += " [Y/N]"
+ while ($true) {
+ $answer = read-host $text
+ if ($answer -imatch "^(y|yes)$") {
+ $answer = $true
+ break
+ } elseif ($answer -imatch "^(n|no|nope)$") {
+ $answer = $false
+ break
+ }
+ }
+ $answer
+}
+function Abort {
+ Write-Host -ForegroundColor "Red" "`nAborted."
+ WKPause "Press Enter to exit... "
+ exit
+}
+function MakeClean {
+ $Folders = @(
+ "$Root\Mount",
+ "$Root\PEFiles")
+ $Clean = $false
+ foreach ($f in $Folders) {
+ if (Test-Path $f) {
+ Write-Host -ForegroundColor "Yellow" ("Found: {0}" -f $f)
+ $Clean = $true
+ }
+ }
+ if (($Clean) -and (Ask-User "Delete the above folder(s)?")) {
+ foreach ($f in $Folders) {
+ if (Test-Path $f) {
+ Remove-Item -Path $f -Recurse -Force
+ }
+ }
+ }
+}
+function DownloadFile ($Path, $Name, $Url) {
+ $OutFile = "{0}\{1}" -f $Path, $Name
+
+ Write-Host ("Downloading: {0}" -f $Name)
+ New-Item -Type Directory $Path 2>&1 | Out-Null
+ try {
+ Invoke-Webrequest -Uri $Url -OutFile $OutFile
+ }
+ catch {
+ Write-Host (" ERROR: Failed to download file." ) -ForegroundColor "Red"
+ }
+}
+function FindDynamicUrl ($SourcePage, $RegEx) {
+ $Url = ""
+
+ # Get source page
+ Invoke-Webrequest -Uri $SourcePage -OutFile "tmp_page"
+
+ # Search for real url
+ $Url = Get-Content "tmp_page" | Where-Object {$_ -imatch $RegEx}
+ $Url = $Url -ireplace '.*(a |)href="([^"]+)".*', "$2"
+ $Url = $Url -ireplace ".*(a |)href='([^']+)'.*", "$2"
+
+ # Remove tmp_page
+ Remove-Item "tmp_page"
+
+ return $Url
+}
+function WKPause ($Message = "Press Enter to continue... ") {
+ Write-Host $Message -NoNewLine
+ Read-Host
+}
+
+## PowerShell equivalent of Python's "if __name__ == '__main__'"
+# Code based on StackOverflow comments
+# Question: https://stackoverflow.com/q/4693947
+# Using answer: https://stackoverflow.com/a/5582692
+# Asked by: https://stackoverflow.com/users/65164/mark-mascolino
+# Answer by: https://stackoverflow.com/users/696808/bacon-bits
+if ($MyInvocation.InvocationName -ne ".") {
+ # Clear-Host
+ Write-Host "Wizard Kit: Windows PE Build Tool`n"
+
+ ## Prep ##
+ try {
+ Import-Module -Name $Env:DISMRoot -ErrorAction "stop"
+ }
+ catch {
+ Write-Host -ForegroundColor "Red" "ERROR: Failed to load DISM CmdLet"
+ Abort
+ }
+ Push-Location "$WD"
+ MakeClean
+
+ ## Build ##
+ foreach ($Arch in @("amd64", "x86")) {
+ $Drivers = "$Root\Drivers\%arch"
+ $Mount = "$Root\Mount"
+ $PEFiles = "$Root\PEFiles\$arch"
+
+ # Copy WinPE files
+ Write-Host "Copying files..."
+ $Cmd = ("{0}\copype.cmd" -f $Env:WinPERoot)
+ Start-Process $Cmd -ArgumentList @($Arch, $PEFiles) -NoNewWindow -Wait
+
+ # Remove unwanted items
+ foreach ($SubDir in @("media", "media\Boot", "media\EFI\Microsoft\Boot")) {
+ foreach ($Item in Get-ChildItem "$PEFiles\$SubDir") {
+ if ($Item.Name -inotmatch "^(boot|efi|en-us|sources|fonts|resources|bcd|memtest)") {
+ Remove-Item -Path $Item.FullName -Recurse -Force
+ }
+ }
+ }
+
+ # Mount image
+ Write-Host "Mounting image..."
+ New-Item -Path $Mount -ItemType "directory" -Force | Out-Null
+ Mount-WindowsImage -Path $Mount -ImagePath "$PEFiles\media\sources\boot.wim" -Index 1 | Out-Null
+
+ # Add packages
+ Write-Host "Adding packages:"
+ foreach ($Package in $WinPEPackages) {
+ $PackagePath = ("{0}\{1}\WinPE_OCs\{2}" -f $Env:WinPERoot, $Arch, $Package)
+ Write-Host " $Package..."
+ Add-WindowsPackage –PackagePath $PackagePath –Path $Mount | Out-Null
+ }
+
+ # Set RamDisk size
+ $ArgumentList = @(
+ ('/Image:"{0}"' -f $Mount),
+ "/Set-ScratchSpace:512"
+ )
+ Start-Process $DISM -ArgumentList $ArgumentList -NoNewWindow -Wait
+
+ # Add WK tools
+ Write-Host "Copying tools..."
+ Copy-Item -Path "$Root\WK\$Arch" -Destination "$Mount\WK" -Recurse -Force
+ Copy-Item -Path "$Root\WK\_include\*" -Destination "$Mount\WK" -Recurse -Force
+ if ($Arch -eq "amd64") {
+ $DestIni = "$Mount\WK\HWiNFO\HWiNFO64.INI"
+ } else {
+ $DestIni = "$Mount\WK\HWiNFO\HWiNFO32.INI"
+ }
+ Move-Item -Path "$Mount\WK\HWiNFO\HWiNFO.INI" -Destination $DestIni -Force
+ Copy-Item -Path "$Root\WinPE.jpg" -Destination "$Mount\WK\ConEmu\ConEmu.jpg" -Recurse -Force
+ Copy-Item -Path "$Root\Scripts" -Destination "$Mount\WK\Scripts" -Recurse -Force
+
+ # Add System32 items
+ Copy-Item -Path "$Root\System32\*" -Destination "$Mount\Windows\System32" -Recurse -Force
+ $ArgumentList = @("/f", "$Mount\Windows\System32\winpe.jpg", "/a")
+ Start-Process "C:\Windows\System32\takeown.exe" -ArgumentList $ArgumentList -NoNewWindow -Wait
+ $ArgumentList = @("$Mount\Windows\System32\winpe.jpg", "/grant", "Administrators:F")
+ Start-Process "C:\Windows\System32\icacls.exe" -ArgumentList $ArgumentList -NoNewWindow -Wait
+ Copy-Item -Path "$Root\WinPE.jpg" -Destination "$Mount\Windows\System32\winpe.jpg" -Recurse -Force
+
+ # Update registry
+ Write-Host "Updating Registry..."
+ $Reg = "C:\Windows\System32\reg.exe"
+ Start-Process $Reg -ArgumentList @("load", "HKLM\WinPE-SW", "$Mount\Windows\System32\config\SOFTWARE") -NoNewWindow -Wait
+ Start-Process $Reg -ArgumentList @("load", "HKLM\WinPE-SYS", "$Mount\Windows\System32\config\SYSTEM") -NoNewWindow -Wait
+
+ # Add 7-Zip and Python to path
+ $RegPath = "HKLM:\WinPE-SYS\ControlSet001\Control\Session Manager\Environment"
+ $RegKey = Get-ItemProperty -Path $RegPath
+ $NewValue = "{0};%SystemDrive%\WK\7-Zip;%SystemDrive%\WK\python;%SystemDrive%\WK\wimlib" -f $RegKey.Path
+ Set-ItemProperty -Path $RegPath -Name "Path" -Value $NewValue -Force | Out-Null
+
+ # Replace Notepad
+ $RegPath = "HKLM:\WinPE-SW\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe"
+ $NewValue = 'wscript "X:\WK\NotepadPlusPlus\npp.vbs"'
+ New-Item -Path $RegPath -Force | Out-Null
+ New-ItemProperty -Path $RegPath -Name "Debugger" -Value $NewValue -Force | Out-Null
+
+ # Run garbage collection to release potential stale handles
+ ## Credit: https://jrich523.wordpress.com/2012/03/06/powershell-loading-and-unloading-registry-hives/
+ Start-Sleep -Seconds 2
+ [gc]::collect()
+
+ # Unload registry hives
+ Start-Sleep -Seconds 2
+ Start-Process $Reg -ArgumentList @("unload", "HKLM\WinPE-SW") -NoNewWindow -Wait
+ Start-Process $Reg -ArgumentList @("unload", "HKLM\WinPE-SYS") -NoNewWindow -Wait
+
+ # Unmount image
+ Write-Host "Dismounting image..."
+ Dismount-WindowsImage -Path $Mount -Save
+
+ # Create ISO
+ $ArgumentList = @("/iso", $PEFiles, "$Root\wk-winpe-$Date-$Arch.iso")
+ $Cmd = "{0}\MakeWinPEMedia.cmd" -f $Env:WinPERoot
+ Start-Process $Cmd -ArgumentList $ArgumentList -NoNewWindow -Wait
+ }
+
+ ## Done ##
+ Pop-Location
+ WKPause "Press Enter to exit... "
+}
diff --git a/.gitignore b/.gitignore
index 4ee6ed6a..661aa0d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
-*iso
-Scripts/__pycache__
+*.bak
+*.iso
+.bin/Scripts/__pycache__
+.bin/tmp
+Drivers
+Logs
Mount
-PEFiles
\ No newline at end of file
+PEFiles
+Scripts/__pycache__
diff --git a/Build PE.cmd b/Build PE.cmd
new file mode 100644
index 00000000..49b04d4a
--- /dev/null
+++ b/Build PE.cmd
@@ -0,0 +1,113 @@
+:: Wizard Kit: Windows PE Build Tool Launcher ::
+
+@echo off
+
+:Init
+setlocal EnableDelayedExpansion
+title Wizard Kit: Windows PE Build Tool
+call :CheckFlags %*
+call :CheckElevation || goto Exit
+call :FindKitsRoot || goto ErrorKitNotFound
+set "dandi_set_env=%adk_root%\Deployment Tools\DandISetEnv.bat"
+set "ps_script=%~dp0\.bin\Scripts\build_pe.ps1"
+
+:LaunchPrep
+rem Verify scripts exists
+if not exist "%dandi_set_env%" (goto ErrorKitNotFound)
+if not exist "%ps_script%" (goto ErrorPSScriptMissing)
+call "%dandi_set_env%" || goto ErrorUnknown
+
+:Launch
+PowerShell -ExecutionPolicy bypass -File %ps_script%"
+goto Exit
+
+:: Functions ::
+:CheckElevation
+rem Code based on StackOverflow comments
+rem Question: https://stackoverflow.com/q/4051883
+rem Using answer: https://stackoverflow.com/a/21295806
+rem Asked by: https://stackoverflow.com/users/272237/flacs
+rem Edited by: https://stackoverflow.com/users/330315/a-horse-with-no-name
+rem Answer by: https://stackoverflow.com/users/3198799/and31415
+fsutil dirty query %systemdrive% >nul
+if %errorlevel% neq 0 (
+ call :RequestElevation
+ rem reset errorlevel to 1 to abort the current non-elevated script
+ color 00
+)
+@exit /b %errorlevel%
+
+:CheckFlags
+rem Loops through all arguments to check for accepted flags
+set DEBUG=
+for %%f in (%*) do (
+ if /i "%%f" == "/DEBUG" (@echo on & set "DEBUG=/DEBUG")
+)
+@exit /b 0
+
+:FindKitsRoot
+set "adk_root="
+set "found="
+set "r_vname=KitsRoot10"
+
+rem Check registry for WADK
+set "r_path=HKLM\Software\Wow6432Node\Microsoft\Windows Kits\Installed Roots"
+reg query "%r_path%" /v %r_vname% >nul 2>&1 && set "found=True"
+if not defined found (
+ rem 32-bit systems?
+ set "r_path=HKLM\Software\Microsoft\Windows Kits\Installed Roots"
+ reg query "!r_path!" /v %r_vname% >nul 2>&1 && set "found=True"
+)
+for /f "skip=2 tokens=2*" %%i in ('reg query "%r_path%" /v %r_vname%') do (
+ set adk_root=%%j\Assessment and Deployment Kit
+)
+rem Set errorlevel if necessary
+if not defined adk_root color 00
+if not defined found color 00
+@exit /b %errorlevel%
+
+:RequestElevation
+set "cscript=%systemroot%\system32\cscript.exe"
+set "vb_script=.bin\tmp\Elevate.vbs"
+mkdir ".bin\tmp" 2>nul
+
+rem Create VB script
+echo Set UAC = CreateObject^("Shell.Application"^) > "%vb_script%"
+echo UAC.ShellExecute "%~s0", "", "", "runas", 3 >> "%vb_script%"
+
+rem Run
+"%cscript%" //nologo "%vb_script%" || goto ErrorUnknown
+del "%vb_script%"
+@exit /b 0
+
+:: Errors ::
+:ErrorKitNotFound
+echo.
+echo ERROR: Windows ADK installation not found.
+goto Abort
+
+:ErrorPSScriptMissing
+echo.
+echo ERROR: build_pe.ps1 script not found.
+goto Abort
+
+:ErrorUnknown
+echo.
+echo ERROR: Encountered an unknown error.
+goto Abort
+
+:Abort
+color 4e
+echo Aborted.
+echo.
+echo Press any key to exit...
+pause>nul
+color
+rem Set errorlevel to 1 by calling color incorrectly
+color 00
+goto Exit
+
+:: Cleanup and exit ::
+:Exit
+endlocal
+exit /b %errorlevel%
diff --git a/WK/amd64/CPU-Z/cpuz.ini b/WK/_include/CPU-Z/cpuz.ini
similarity index 100%
rename from WK/amd64/CPU-Z/cpuz.ini
rename to WK/_include/CPU-Z/cpuz.ini
diff --git a/WK/amd64/ConEmu/ConEmu.xml b/WK/_include/ConEmu/ConEmu.xml
similarity index 100%
rename from WK/amd64/ConEmu/ConEmu.xml
rename to WK/_include/ConEmu/ConEmu.xml
diff --git a/WK/x86/HWiNFO/HWiNFO32.INI b/WK/_include/HWiNFO/HWiNFO.INI
similarity index 100%
rename from WK/x86/HWiNFO/HWiNFO32.INI
rename to WK/_include/HWiNFO/HWiNFO.INI
diff --git a/WK/amd64/NotepadPlusPlus/config.xml b/WK/_include/NotepadPlusPlus/config.xml
similarity index 100%
rename from WK/amd64/NotepadPlusPlus/config.xml
rename to WK/_include/NotepadPlusPlus/config.xml
diff --git a/WK/_include/NotepadPlusPlus/npp.vbs b/WK/_include/NotepadPlusPlus/npp.vbs
new file mode 100644
index 00000000..3fb12a41
--- /dev/null
+++ b/WK/_include/NotepadPlusPlus/npp.vbs
@@ -0,0 +1,33 @@
+'// DISCLAIMER
+'// THIS COMES WITH NO WARRANTY, IMPLIED OR OTHERWISE. USE AT YOUR OWN RISK
+'// IF YOU ARE NOT COMFORTABLE EDITING THE REGISTRY THEN DO NOT USE THIS SCRIPT
+'//
+'// NOTES:
+'// This affects all users.
+'// This will prevent ANY executable named notepad.exe from running located anywhere on this computer!!
+'//
+'// Save this text to your notepad++ folder as a text file named npp.vbs (some AV don't like vbs, get a different AV :-P )
+'//
+'// USAGE
+'// 1)
+'// Navigate to registry key HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\
+'//
+' // 2)
+'// Add new subkey called notepad.exe
+'// This step is what tells windows to use the notepad++ exe, to undo simply delete this key
+'//
+'// 3)
+'// Create new Sting Value called Debugger
+'//
+'// 4)
+'// Modify value and enter wscript.exe "path to npp.vbs" e.g. wscript.exe "C:\Program Files\Notepad++\npp.vbs"
+
+Option Explicit
+Dim sCmd, x
+sCmd = """" & LeftB(WScript.ScriptFullName, LenB(WScript.ScriptFullName) - LenB(WScript.ScriptName)) & "notepad++.exe" & """ """
+For x = 1 To WScript.Arguments.Count - 1
+ sCmd = sCmd & WScript.Arguments(x) & " "
+Next
+sCmd = sCmd & """"
+CreateObject("WScript.Shell").Run sCmd, 1, True
+WScript.Quit
\ No newline at end of file
diff --git a/WK/x86/Q-Dir/Q-Dir.ini b/WK/_include/Q-Dir/Q-Dir.ini
similarity index 99%
rename from WK/x86/Q-Dir/Q-Dir.ini
rename to WK/_include/Q-Dir/Q-Dir.ini
index 18f44d38..ac926a8c 100644
--- a/WK/x86/Q-Dir/Q-Dir.ini
+++ b/WK/_include/Q-Dir/Q-Dir.ini
@@ -4,7 +4,6 @@ QDir_Id=0
useColorStart=1
Als=12
designe_mode=2
-WinRC=8;15;968;689
showCmd=3
StartCrash=0
default_tab=
diff --git a/WK/amd64/HWiNFO/HWiNFO64.INI b/WK/amd64/HWiNFO/HWiNFO64.INI
deleted file mode 100644
index 23133936..00000000
--- a/WK/amd64/HWiNFO/HWiNFO64.INI
+++ /dev/null
@@ -1,209 +0,0 @@
-[LogfileSettings]
-COMP=1
-COMP_SP=1
-COMP_Name=1
-COMP_Os=1
-COMP_User=0
-CPU=1
-CPU_Name=1
-CPU_ID=1
-CPU_Vendor=1
-CPU_Stepping=1
-CPU_Type=1
-CPU_BrandID=1
-CPU_PN=1
-CPU_Clock=1
-CPU_MaxFreq=1
-CPU_CacheL1=1
-CPU_CacheL2=1
-CPU_TLB_I=1
-CPU_TLB_D=1
-CPU_Features=1
-CPU_PIROM=1
-MEM=1
-MEM_TotalSize=1
-MEM_Timing=1
-MEM_Row=1
-MEM_Row_Size=1
-MEM_Row_Type=1
-MEM_Row_Speed=1
-MEM_Row_Model=1
-MEM_Row_ECC=1
-MEM_Row_Date=1
-MEM_Row_SN=1
-MEM_Row_Cfg=1
-MEM_Row_Latency=1
-MEM_Row_Features=1
-MEM_Row_iFeatures=1
-BUS=1
-BUS_PCI=1
-BUS_PCI_DevName=1
-BUS_PCI_DevNumber=1
-BUS_PCI_Resources=1
-BUS_PCI_Features=1
-BUS_PCI_DevSpecific=1
-BUS_PCIX_Features=1
-BUS_PCIe_Features=1
-BUS_PCI_DRV_INFO=1
-BUS_EISA=1
-DMI=1
-DMI_0=1
-DMI_1=1
-DMI_2=1
-DMI_3=1
-DMI_4=1
-DMI_5=1
-DMI_6=1
-DMI_7=1
-DMI_8=1
-DMI_9=1
-DMI_10=1
-DMI_11=1
-DMI_12=1
-DMI_13=1
-DMI_14=1
-DMI_15=1
-DMI_16=1
-DMI_17=1
-DMI_18=1
-DMI_19=1
-DMI_20=1
-DMI_21=1
-DMI_22=1
-DMI_23=1
-DMI_24=1
-DMI_25=1
-DMI_26=1
-DMI_27=1
-DMI_28=1
-DMI_29=1
-DMI_30=1
-DMI_31=1
-DMI_32=1
-DMI_33=1
-DMI_34=1
-DMI_35=1
-DMI_36=1
-DMI_37=1
-DMI_38=1
-DMI_39=1
-DMI_129=1
-DMI_130=1
-DMI_131=1
-VIDEO=1
-VIDEO_Chipset=1
-VIDEO_Memory=1
-VIDEO_Card=1
-VIDEO_Bus=1
-VIDEO_RAMDAC=1
-VIDEO_BIOSver=1
-VIDEO_Clock=1
-VIDEO_HWID=1
-VIDEO_DRV_INFO=1
-VIDEO_DirectX=1
-MON=1
-MON_Name=1
-MON_SN=1
-MON_Date=1
-MON_Dimensions=1
-MON_DisplayType=1
-MON_InputSignal=1
-MON_Gamma=1
-MON_DPMSinput=1
-MON_DPMSmodes=1
-MOBO=1
-MOBO_Model=1
-MOBO_Chipset=1
-MOBO_CompName=1
-MOBO_MachineType=1
-MOBO_Slots=1
-MOBO_BIOS_Manuf=1
-MOBO_BIOS_Date=1
-MOBO_PNP_Devs=1
-MOBO_PNP_Nodes=1
-MOBO_ACPI_Devs=1
-MOBO_ACPI_Enum=1
-DRIVE=1
-DRIVE_IDE=1
-DRIVE_IDE_Ctrller=1
-DRIVE_IDE_Channel=1
-DRIVE_IDE_Model=1
-DRIVE_IDE_Rev=1
-DRIVE_IDE_SN=1
-DRIVE_IDE_Capacity=1
-DRIVE_IDE_Geometry=1
-DRIVE_IDE_Cache=1
-DRIVE_IDE_Xfer=1
-DRIVE_IDE_BasicCapab=1
-DRIVE_IDE_ATA2Capab=1
-DRIVE_IDE_SMART=1
-DRIVE_SCSI=1
-DRIVE_SCSI_ID=1
-DRIVE_SCSI_Desc=1
-DRIVE_SCSI_Class=1
-DRIVE_Floppy=1
-NETWORK=1
-NETWORK_HWID=1
-NETWORK_DRV_INFO=1
-AUDIO=1
-AUDIO_DRV_INFO=1
-AUDIO_HWID=1
-PORTS=1
-BUS_USB=1
-BUS_USB_DRV_INFO=1
-BATTERY=1
-SENSORS=1
-
-[Settings]
-HighestIdeAddress=0
-AcpiEnum=0
-SWSMI=1
-DebugMode=0
-SMBus=1
-TempScale=C
-AC97CodecID=1
-SkipProblematicPciDev=0
-GPUI2C=1
-LPC=1
-DefReportType=5
-TPM=0
-PCIdirect=1
-OpenSystemSummary=0
-RememberPreferences=1
-LargeFonts=0
-OpenSensors=0
-MinimalizeMainWnd=0
-MinimalizeSensors=0
-PersistentDriver=0
-UseHPET=1
-AutoUpdate=0
-GPUI2CNVAPI=1
-GPUI2CADL=0
-SensorsOnly=0
-AcpiEval=1
-CpuClkFromBusClk=1
-BusClkPolling=1
-SMBusAdrExclude=11111111111111110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000
-GPUI2CBusExclude=00000000
-SensorsSM=1
-IoctlKernel=0
-SummaryOnly=0
-WakeGPUs=1
-KeepTheme=0
-FlushBuffers=1
-iMEsupport=1
-GPUI2Ccaching=1
-CSMI_SAS_Support=1
-DebugDirect=1
-MinimalizeSensorsClose=0
-WakeGPUsExt=0
-PollSleepingGPUs=0
-ShowWelcomeAndProgress=1
-EnablePchTherm=0
-ReorderGPUs=1
-NvmlSupport=1
-DecimalSeparator=.
-ThousandsSeparator=,
-CsvSeparator=,
-MinimizeGraphs=1
-TextButtons=0
diff --git a/WK/amd64/Q-Dir/Q-Dir.ini b/WK/amd64/Q-Dir/Q-Dir.ini
deleted file mode 100644
index f6532f37..00000000
--- a/WK/amd64/Q-Dir/Q-Dir.ini
+++ /dev/null
@@ -1,69 +0,0 @@
-[Start]
-m_lang_id=1
-QDir_Id=0
-useColorStart=1
-Als=12
-designe_mode=2
-WinRC=66;87;1026;761
-showCmd=3
-StartCrash=0
-default_tab=
-Max=1
-show_ext_in_type=1
-title_info=1
-adresbar_style=1
-useTreeColor=1
-useColor=1
-[Favoriten]
-Ordner=.\Favoriten\
-[Q]
-Link=.\Favoriten\Quick-Link\
-[Q-Dir]
-Lizenz=1
-
-
-
-
-
-[Vorschau]
-Filter=*.avi;*.bmp;*.gif;*.ico;*.jpeg;*.jpg;*.mp*;*.pdf;*.png;*.wm*;
-[Filter2]
-0=#Hidden=1=-1=1=1=-1=0
-1=*.zip;*.rar;*.gz;*.7z;=1=00AA00=-1=1=-1=0
-2=*.mp*;*.avi;*.wma;=1=DD0058=-1=1=-1=0
-3=#DIR=1=008800=-1=1=-1=0
-4=*.jpg;*.jpeg;*.png,*.gif;*.bmp;*.ico=1=BB00BB=-1=1=-1=0
-5=*.html;*.htm;*.url=1=456789=-1=1=-1=0
-6=*.pl;*.cgi;*.php;*.pdf;*.doc;*.rtf;*.xls=1=BB8844=-1=1=-1=0
-7=*.cpp;*.hpp;*.h=1=DD0058=-1=1=-1=0
-8=*.exe;*.dll;*.bat=1=FF0000=-1=1=-1=0
-9=*=1=0000BB=-1=1=-1=0
-10=#BG=1=-1=-1=1=-1=0
-11=#BG-A=1=-1=-1=1=-1=0
-[Ordner]
-Filter=
-[Column_OS_6.1_Ploder1]
-Spatlen_::{20D04FE0-3AEA-1069-A2D8-08002B30309D}=%1C%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%F1%F1%F1%F1%14%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%D0%02%00%00%CC%02%00%00%31%53%50%53%05%D5%CD%D5%9C%2E%1B%10%93%97%08%00%2B%2C%F9%AE%83%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%46%00%4D%00%54%00%49%00%44%00%00%00%08%00%00%00%4E%00%00%00%7B%00%42%00%37%00%32%00%35%00%46%00%31%00%33%00%30%00%2D%00%34%00%37%00%45%00%46%00%2D%00%31%00%30%00%31%00%41%00%2D%00%41%00%35%00%46%00%31%00%2D%00%30%00%32%00%36%00%30%00%38%00%43%00%39%00%45%00%45%00%42%00%41%00%43%00%7D%00%00%00%00%00%33%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%44%00%69%00%72%00%65%00%63%00%74%00%69%00%6F%00%6E%00%00%00%13%00%00%00%01%00%00%00%5B%00%00%00%0A%00%00%00%00%53%00%6F%00%72%00%74%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%1C%00%00%00%01%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%01%00%00%00%25%00%00%00%14%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%56%00%69%00%65%00%77%00%00%00%0B%00%00%00%FF%FF%00%00%1B%00%00%00%0A%00%00%00%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%04%00%00%00%23%00%00%00%12%00%00%00%00%49%00%63%00%6F%00%6E%00%53%00%69%00%7A%00%65%00%00%00%13%00%00%00%10%00%00%00%BD%00%00%00%10%00%00%00%00%43%00%6F%00%6C%00%49%00%6E%00%66%00%6F%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%78%00%00%00%FD%DF%DF%FD%10%00%00%00%00%00%00%00%00%00%00%00%04%00%00%00%18%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%8C%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%04%00%00%00%AF%00%00%00%35%4B%17%9B%FF%40%D2%11%A2%7E%00%C0%4F%C3%08%71%03%00%00%00%70%00%00%00%35%4B%17%9B%FF%40%D2%11%A2%7E%00%C0%4F%C3%08%71%02%00%00%00%70%00%00%00%2F%00%00%00%1E%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%50%00%49%00%44%00%00%00%13%00%00%00%04%00%00%00%1F%00%00%00%0E%00%00%00%00%46%00%46%00%6C%00%61%00%67%00%73%00%00%00%13%00%00%00%05%00%20%40%31%00%00%00%20%00%00%00%00%4C%00%6F%00%67%00%69%00%63%00%61%00%6C%00%56%00%69%00%65%00%77%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%01%00%00%00%00%00%00%00%00%00%00%00|CODEMODE1|-1905896973|772
-Spatlen_291=%1C%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%F1%F1%F1%F1%14%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%D0%02%00%00%CC%02%00%00%31%53%50%53%05%D5%CD%D5%9C%2E%1B%10%93%97%08%00%2B%2C%F9%AE%83%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%46%00%4D%00%54%00%49%00%44%00%00%00%08%00%00%00%4E%00%00%00%7B%00%30%00%30%00%30%00%30%00%30%00%30%00%30%00%30%00%2D%00%30%00%30%00%30%00%30%00%2D%00%30%00%30%00%30%00%30%00%2D%00%30%00%30%00%30%00%30%00%2D%00%30%00%30%00%30%00%30%00%30%00%30%00%30%00%30%00%30%00%30%00%30%00%30%00%7D%00%00%00%00%00%33%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%44%00%69%00%72%00%65%00%63%00%74%00%69%00%6F%00%6E%00%00%00%13%00%00%00%01%00%00%00%5B%00%00%00%0A%00%00%00%00%53%00%6F%00%72%00%74%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%1C%00%00%00%01%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%01%00%00%00%25%00%00%00%14%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%56%00%69%00%65%00%77%00%00%00%0B%00%00%00%00%00%00%00%1B%00%00%00%0A%00%00%00%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%04%00%00%00%23%00%00%00%12%00%00%00%00%49%00%63%00%6F%00%6E%00%53%00%69%00%7A%00%65%00%00%00%13%00%00%00%10%00%00%00%BD%00%00%00%10%00%00%00%00%43%00%6F%00%6C%00%49%00%6E%00%66%00%6F%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%78%00%00%00%FD%DF%DF%FD%10%00%00%00%00%00%00%00%00%00%00%00%04%00%00%00%18%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%EE%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0E%00%00%00%69%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%04%00%00%00%91%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0C%00%00%00%46%00%00%00%2F%00%00%00%1E%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%50%00%49%00%44%00%00%00%13%00%00%00%00%00%00%00%1F%00%00%00%0E%00%00%00%00%46%00%46%00%6C%00%61%00%67%00%73%00%00%00%13%00%00%00%05%00%20%40%31%00%00%00%20%00%00%00%00%4C%00%6F%00%67%00%69%00%63%00%61%00%6C%00%56%00%69%00%65%00%77%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%01%00%00%00%00%00%00%00%00%00%00%00|CODEMODE1|-563719693|772
-[Column_OS_6.1_Ploder2]
-Spatlen_::{20D04FE0-3AEA-1069-A2D8-08002B30309D}=%1C%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%F1%F1%F1%F1%14%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%D0%02%00%00%CC%02%00%00%31%53%50%53%05%D5%CD%D5%9C%2E%1B%10%93%97%08%00%2B%2C%F9%AE%83%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%46%00%4D%00%54%00%49%00%44%00%00%00%08%00%00%00%4E%00%00%00%7B%00%42%00%37%00%32%00%35%00%46%00%31%00%33%00%30%00%2D%00%34%00%37%00%45%00%46%00%2D%00%31%00%30%00%31%00%41%00%2D%00%41%00%35%00%46%00%31%00%2D%00%30%00%32%00%36%00%30%00%38%00%43%00%39%00%45%00%45%00%42%00%41%00%43%00%7D%00%00%00%00%00%33%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%44%00%69%00%72%00%65%00%63%00%74%00%69%00%6F%00%6E%00%00%00%13%00%00%00%01%00%00%00%5B%00%00%00%0A%00%00%00%00%53%00%6F%00%72%00%74%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%1C%00%00%00%01%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%01%00%00%00%25%00%00%00%14%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%56%00%69%00%65%00%77%00%00%00%0B%00%00%00%FF%FF%00%00%1B%00%00%00%0A%00%00%00%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%04%00%00%00%23%00%00%00%12%00%00%00%00%49%00%63%00%6F%00%6E%00%53%00%69%00%7A%00%65%00%00%00%13%00%00%00%10%00%00%00%BD%00%00%00%10%00%00%00%00%43%00%6F%00%6C%00%49%00%6E%00%66%00%6F%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%78%00%00%00%FD%DF%DF%FD%10%00%00%00%00%00%00%00%00%00%00%00%04%00%00%00%18%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%8C%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%04%00%00%00%AF%00%00%00%35%4B%17%9B%FF%40%D2%11%A2%7E%00%C0%4F%C3%08%71%03%00%00%00%70%00%00%00%35%4B%17%9B%FF%40%D2%11%A2%7E%00%C0%4F%C3%08%71%02%00%00%00%70%00%00%00%2F%00%00%00%1E%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%50%00%49%00%44%00%00%00%13%00%00%00%04%00%00%00%1F%00%00%00%0E%00%00%00%00%46%00%46%00%6C%00%61%00%67%00%73%00%00%00%13%00%00%00%05%00%20%40%31%00%00%00%20%00%00%00%00%4C%00%6F%00%67%00%69%00%63%00%61%00%6C%00%56%00%69%00%65%00%77%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%01%00%00%00%00%00%00%00%00%00%00%00|CODEMODE1|-1905896973|772
-[Column_OS_6.1_Ploder3]
-Spatlen_::{20D04FE0-3AEA-1069-A2D8-08002B30309D}=%1C%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%F1%F1%F1%F1%14%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%D0%02%00%00%CC%02%00%00%31%53%50%53%05%D5%CD%D5%9C%2E%1B%10%93%97%08%00%2B%2C%F9%AE%83%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%46%00%4D%00%54%00%49%00%44%00%00%00%08%00%00%00%4E%00%00%00%7B%00%42%00%37%00%32%00%35%00%46%00%31%00%33%00%30%00%2D%00%34%00%37%00%45%00%46%00%2D%00%31%00%30%00%31%00%41%00%2D%00%41%00%35%00%46%00%31%00%2D%00%30%00%32%00%36%00%30%00%38%00%43%00%39%00%45%00%45%00%42%00%41%00%43%00%7D%00%00%00%00%00%33%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%44%00%69%00%72%00%65%00%63%00%74%00%69%00%6F%00%6E%00%00%00%13%00%00%00%01%00%00%00%5B%00%00%00%0A%00%00%00%00%53%00%6F%00%72%00%74%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%1C%00%00%00%01%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%01%00%00%00%25%00%00%00%14%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%56%00%69%00%65%00%77%00%00%00%0B%00%00%00%FF%FF%00%00%1B%00%00%00%0A%00%00%00%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%04%00%00%00%23%00%00%00%12%00%00%00%00%49%00%63%00%6F%00%6E%00%53%00%69%00%7A%00%65%00%00%00%13%00%00%00%10%00%00%00%BD%00%00%00%10%00%00%00%00%43%00%6F%00%6C%00%49%00%6E%00%66%00%6F%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%78%00%00%00%FD%DF%DF%FD%10%00%00%00%00%00%00%00%00%00%00%00%04%00%00%00%18%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%8C%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%04%00%00%00%AF%00%00%00%35%4B%17%9B%FF%40%D2%11%A2%7E%00%C0%4F%C3%08%71%03%00%00%00%70%00%00%00%35%4B%17%9B%FF%40%D2%11%A2%7E%00%C0%4F%C3%08%71%02%00%00%00%70%00%00%00%2F%00%00%00%1E%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%50%00%49%00%44%00%00%00%13%00%00%00%04%00%00%00%1F%00%00%00%0E%00%00%00%00%46%00%46%00%6C%00%61%00%67%00%73%00%00%00%13%00%00%00%05%00%20%40%31%00%00%00%20%00%00%00%00%4C%00%6F%00%67%00%69%00%63%00%61%00%6C%00%56%00%69%00%65%00%77%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%01%00%00%00%00%00%00%00%00%00%00%00|CODEMODE1|-1905896973|772
-[Column_OS_6.1_Ploder4]
-Spatlen_::{20D04FE0-3AEA-1069-A2D8-08002B30309D}=%1C%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%F1%F1%F1%F1%14%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%D0%02%00%00%CC%02%00%00%31%53%50%53%05%D5%CD%D5%9C%2E%1B%10%93%97%08%00%2B%2C%F9%AE%83%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%46%00%4D%00%54%00%49%00%44%00%00%00%08%00%00%00%4E%00%00%00%7B%00%42%00%37%00%32%00%35%00%46%00%31%00%33%00%30%00%2D%00%34%00%37%00%45%00%46%00%2D%00%31%00%30%00%31%00%41%00%2D%00%41%00%35%00%46%00%31%00%2D%00%30%00%32%00%36%00%30%00%38%00%43%00%39%00%45%00%45%00%42%00%41%00%43%00%7D%00%00%00%00%00%33%00%00%00%22%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%44%00%69%00%72%00%65%00%63%00%74%00%69%00%6F%00%6E%00%00%00%13%00%00%00%01%00%00%00%5B%00%00%00%0A%00%00%00%00%53%00%6F%00%72%00%74%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%1C%00%00%00%01%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%01%00%00%00%25%00%00%00%14%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%56%00%69%00%65%00%77%00%00%00%0B%00%00%00%FF%FF%00%00%1B%00%00%00%0A%00%00%00%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%04%00%00%00%23%00%00%00%12%00%00%00%00%49%00%63%00%6F%00%6E%00%53%00%69%00%7A%00%65%00%00%00%13%00%00%00%10%00%00%00%BD%00%00%00%10%00%00%00%00%43%00%6F%00%6C%00%49%00%6E%00%66%00%6F%00%00%00%42%00%00%00%1E%00%00%00%70%00%72%00%6F%00%70%00%34%00%32%00%39%00%34%00%39%00%36%00%37%00%32%00%39%00%35%00%00%00%00%00%78%00%00%00%FD%DF%DF%FD%10%00%00%00%00%00%00%00%00%00%00%00%04%00%00%00%18%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%0A%00%00%00%8C%00%00%00%30%F1%25%B7%EF%47%1A%10%A5%F1%02%60%8C%9E%EB%AC%04%00%00%00%AF%00%00%00%35%4B%17%9B%FF%40%D2%11%A2%7E%00%C0%4F%C3%08%71%03%00%00%00%70%00%00%00%35%4B%17%9B%FF%40%D2%11%A2%7E%00%C0%4F%C3%08%71%02%00%00%00%70%00%00%00%2F%00%00%00%1E%00%00%00%00%47%00%72%00%6F%00%75%00%70%00%42%00%79%00%4B%00%65%00%79%00%3A%00%50%00%49%00%44%00%00%00%13%00%00%00%04%00%00%00%1F%00%00%00%0E%00%00%00%00%46%00%46%00%6C%00%61%00%67%00%73%00%00%00%13%00%00%00%05%00%20%40%31%00%00%00%20%00%00%00%00%4C%00%6F%00%67%00%69%00%63%00%61%00%6C%00%56%00%69%00%65%00%77%00%4D%00%6F%00%64%00%65%00%00%00%13%00%00%00%01%00%00%00%00%00%00%00%00%00%00%00|CODEMODE1|-1905896973|772
-[Programs_State]
-Disable=0
-[Quick-Links]
-WK=%systemdrive%/WK
-[Options]
-Start=7
-[X-Size]
-mode=1
-dig=0
-fld_size=1
-ths_sep=1
-type=0
-precent=1
-ff_cnt=1
-block_no_focus=1
-nosort_fld_size=1
diff --git a/WK/x86/CPU-Z/cpuz.ini b/WK/x86/CPU-Z/cpuz.ini
deleted file mode 100644
index e10ce749..00000000
--- a/WK/x86/CPU-Z/cpuz.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-[CPU-Z]
-VERSION=1.7.7.0
-TextFontName=
-TextFontSize=14
-TextFontColor=000080
-LabelFontName=
-LabelFontSize=14
-ACPI=1
-PCI=1
-MaxPCIBus=256
-DMI=1
-Sensor=1
-SMBus=1
-Display=1
-UseDisplayAPI=1
-BusClock=1
-Chipset=1
-SPD=1
-XOC=0
-CheckUpdates=0
diff --git a/WK/x86/ConEmu/ConEmu.xml b/WK/x86/ConEmu/ConEmu.xml
deleted file mode 100644
index 8a2049b9..00000000
--- a/WK/x86/ConEmu/ConEmu.xml
+++ /dev/null
@@ -1,765 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/WK/x86/NotepadPlusPlus/config.xml b/WK/x86/NotepadPlusPlus/config.xml
deleted file mode 100644
index 3a88a83e..00000000
--- a/WK/x86/NotepadPlusPlus/config.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
- standard
- hide
-
- vertical
- hide
-
- no
- yes
- no
- no
- yes
- yes
- no
- yes
-
-
-
-
- yes
- yes
- 2
-
-
-
-
-
- hide
-
-
-
-
-
-
-
-
-
- yes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/WinPE.jpg b/WinPE.jpg
new file mode 100644
index 00000000..51eeb3c8
Binary files /dev/null and b/WinPE.jpg differ
diff --git a/make.cmd b/make.cmd
deleted file mode 100644
index 1e47ff46..00000000
--- a/make.cmd
+++ /dev/null
@@ -1,177 +0,0 @@
-@echo off
-
-:Init
-setlocal EnableDelayedExpansion
-title WK-WinPE creation tool
-color 1b
-pushd %~dp0
-
-:Flags
-for %%f in (%*) do (
- if /i "%%f" == "/DEBUG" (@echo on)
-)
-
-:GetDate
-:: Credit to SS64.com Code taken from http://ss64.com/nt/syntax-getdate.html
-:: Use WMIC to retrieve date and time in ISO 8601 format.
-FOR /F "skip=1 tokens=1-6" %%G IN ('WMIC Path Win32_LocalTime Get Day^,Hour^,Minute^,Month^,Second^,Year /Format:table') DO (
-IF "%%~L"=="" goto s_done
- Set _yyyy=%%L
- Set _mm=00%%J
- Set _dd=00%%G
- Set _hour=00%%H
- SET _minute=00%%I
-)
-:s_done
-:: Pad digits with leading zeros
-Set _mm=%_mm:~-2%
-Set _dd=%_dd:~-2%
-Set _hour=%_hour:~-2%
-Set _minute=%_minute:~-2%
-Set iso_date=%_yyyy%-%_mm%-%_dd%
-
-:Variables
-set "wd=%cd%"
-set "winpe_ocs=%programfiles(x86)%\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment"
-set "pe_out=!wd!\pe_out"
-
-:CheckForCleanup
-echo Scanning for old build folders...
-set "found_old="
-if exist "!wd!\mount" (
- echo. Found: "!wd!\mount"
- set "found_old=true"
-)
-if exist "!wd!\pe_files" (
- echo. Found: "!wd!\pe_files"
- set "found_old=true"
-)
-if defined found_old (
- goto Cleanup
-) else (
- echo. No build folders found.
-)
-goto :BuildBoth
-
-:Cleanup
-echo.
-choice /t 30 /c YN /d N /m "Delete the above folders?"
-if %errorlevel% neq 1 goto Abort
-rmdir /s /q "!wd!\mount"
-rmdir /s /q "!wd!\pe_files"
-
-:BuildBoth
-for %%a in (amd64 x86) do (
- rem set vars
- set "arch=%%a"
- set "drivers=!wd!\Drivers\!arch!"
- set "mount=!wd!\mount\!arch!"
- set "pe_files=!wd!\pe_files\!arch!"
- set "winpe_ocs=%programfiles(x86)%\Windows Kits\10\Assessment and Deployment Kit\Windows Preinstallation Environment\!arch!\WinPE_OCs"
-
- rem Copy main files
- call copype.cmd !arch! "!pe_files!"
- for %%t in (bg-bg cs-cz da-dk de-de el-gr en-gb es-es es-mx et-ee fi-fi fr-ca fr-fr hr-hr hu-hu it-it ja-jp ko-kr lt-lt lv-lv nb-no nl-nl pl-pl pt-br pt-pt ro-ro ru-ru sk-sk sl-si sr-latn-cs sr-latn-rs sv-se tr-tr uk-ua zh-cn zh-hk zh-tw) do (
- rmdir /s /q "!pe_files!\media\%%t"
- rmdir /s /q "!pe_files!\media\Boot\%%t"
- rmdir /s /q "!pe_files!\media\EFI\Microsoft\Boot\%%t"
- )
-
- rem Mount Image
- mkdir "!mount!"
- dism /mount-image /imagefile:"!pe_files!\media\sources\boot.wim" /index:1 /mountdir:"!mount!" /logpath:"dism.log"
-
- rem Add Packages - More info: https://msdn.microsoft.com/en-us/library/windows/hardware/dn938382.aspx
- dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-EnhancedStorage.cab" /logpath:"dism.log"
- dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-FMAPI.cab" /logpath:"dism.log"
- dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-WMI.cab" /logpath:"dism.log"
- dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-EnhancedStorage_en-us.cab" /logpath:"dism.log"
- dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-WMI_en-us.cab" /logpath:"dism.log"
-
- rem rem Install WinPE-WMI before you install WinPE-NetFX.
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-NetFx.cab" /logpath:"dism.log"
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-NetFx_en-us.cab" /logpath:"dism.log"
-
- rem rem Install WinPE-WMI and WinPE-NetFX before you install WinPE-Scripting.
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-Scripting.cab" /logpath:"dism.log"
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-Scripting_en-us.cab" /logpath:"dism.log"
-
- rem rem Install WinPE-WMI, WinPE-NetFX, and WinPE-Scripting before you install WinPE-PowerShell.
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-PowerShell.cab" /logpath:"dism.log"
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-PowerShell_en-us.cab" /logpath:"dism.log"
-
- rem rem Install WinPE-WMI, WinPE-NetFX, WinPE-Scripting, and WinPE-PowerShell before you install WinPE-DismCmdlets.
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-DismCmdlets.cab" /logpath:"dism.log"
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-DismCmdlets_en-us.cab" /logpath:"dism.log"
-
- rem rem Install WinPE-WMI, WinPE-NetFX, WinPE-Scripting, and WinPE-PowerShell before you install WinPE-SecureBootCmdlets.
- rem rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-SecureBootCmdlets.cab" /logpath:"dism.log"
-
- rem rem Install WinPE-WMI, WinPE-NetFX, WinPE-Scripting, and WinPE-PowerShell before you install WinPE-StorageWMI.
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\WinPE-StorageWMI.cab" /logpath:"dism.log"
- rem dism /add-package /image:"!mount!" /packagepath:"!winpe_ocs!\en-us\WinPE-StorageWMI_en-us.cab" /logpath:"dism.log"
-
- rem Add Drivers
- REM dism /add-driver /image:"!mount!" /driver:"!drivers!" /recurse /logpath:"dism.log"
-
- rem Force RamDisk size to try and avoid capture-image errors
- dism /image:"!mount!" /set-scratchspace:512
-
- rem Add WK Stuff
- del "!wd!\WK\Scripts\WK.log"
- mkdir "!mount!\WK"
- robocopy /s /r:3 /w:0 "!wd!\WK\!arch!" "!mount!\WK"
- mkdir "!mount!\WK\Scripts"
- robocopy /s /r:3 /w:0 "!wd!\Scripts" "!mount!\WK\Scripts"
-
- rem Add System32 Stuff
- copy /y "!wd!\System32\menu.cmd" "!mount!\Windows\System32\menu.cmd"
- copy /y "!wd!\System32\Winpeshl.ini" "!mount!\Windows\System32\Winpeshl.ini"
-
- rem Background
- takeown /f "!mount!\Windows\System32\winpe.jpg" /a
- icacls "!mount!\Windows\System32\winpe.jpg" /grant administrators:F
- copy /y "!wd!\System32\winpe.jpg" "!mount!\Windows\System32\winpe.jpg"
- copy /y "!wd!\System32\winpe.jpg" "!mount!\WK\ConEmu\ConEmu.jpg"
-
- rem Registry Edits
- reg load HKLM\WinPE-SW "!mount!\Windows\System32\config\SOFTWARE"
- reg load HKLM\WinPE-SYS "!mount!\Windows\System32\config\SYSTEM"
-
- rem Add 7-Zip and Python to path
- reg add "HKLM\WinPE-SYS\ControlSet001\Control\Session Manager\Environment" /v Path /t REG_EXPAND_SZ /d "%%SystemRoot%%\system32;%%SystemRoot%%;%%SystemRoot%%\System32\Wbem;%%SYSTEMROOT%%\System32\WindowsPowerShell\v1.0\;%%SystemDrive%%\WK\7-Zip;%%SystemDrive%%\WK\python;%%SystemDrive%%\WK\wimlib" /f
-
- rem Replace Notepad
- reg add "HKLM\WinPE-SW\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /v Debugger /t REG_SZ /d "X:\WK\NotepadPlusPlus\notepadplusplus.exe /z" /f
-
- rem Unload registry hives
- reg unload HKLM\WinPE-SW
- reg unload HKLM\WinPE-SYS
-
- rem Unmount Image
- dism /unmount-image /mountdir:"!mount!" /commit
-
- rem Create ISO
- del "wk-winpe-!iso_date!-!arch!.iso"
- call makewinpemedia.cmd /iso "!pe_files!" "wk-winpe-!iso_date!-!arch!.iso"
-)
-goto Done
-
-:Abort
-color 4e
-echo.
-echo Aborted.
-goto Exit
-
-:Done
-echo.
-echo Done.
-goto Exit
-
-:Exit
-echo.
-echo Press any key to exit...
-pause>nul
-popd
-color
-endlocal
\ No newline at end of file