Show title before getting ticket_number

Bugfix: menu_setup()
Bugfix: find_windows_image()
2017-12-01 12:42:46 -08:00 · 2017-12-01 12:42:23 -08:00 · 2017-12-01 12:41:39 -08:00 · 2017-12-01 12:27:53 -08:00 · 2017-12-01 12:27:26 -08:00 · 2017-12-01 12:26:37 -08:00
31 changed files with 4669 additions and 2592 deletions
--- a/.bin/Scripts/build_pe.ps1
+++ b/.bin/Scripts/build_pe.ps1
@ -0,0 +1,576 @@
+# 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 = "$Bin\tmp"
+$Date = Get-Date -UFormat "%Y-%m-%d"
+$Host.UI.RawUI.BackgroundColor = "Black"
+$Host.UI.RawUI.ForegroundColor = "White"
+# $ProgressPreference = "silentlyContinue"
+$HostSystem32 = "{0}\System32" -f $Env:SystemRoot
+$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: $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"
+        $DownloadErrors += 1
+    }
+}
+function FindDynamicUrl ($SourcePage, $RegEx) {
+    # 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"
+
+    $Url | Select-Object -First 1
+}
+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`n`n`n`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
+    
+    if (Ask-User "Update Tools?") {
+        $DownloadErrors = 0
+        
+        ## Download Tools ##
+        $ToolSources = @(
+            # 7-Zip
+            @("7z-installer.msi", "http://www.7-zip.org/a/7z1701.msi"),
+            @("7z-extra.7z", "http://www.7-zip.org/a/7z1701-extra.7z"),
+            # Blue Screen View
+            @("bluescreenview64.zip", "http://www.nirsoft.net/utils/bluescreenview-x64.zip"),
+            @("bluescreenview32.zip", "http://www.nirsoft.net/utils/bluescreenview.zip"),
+            # ConEmu
+            @("ConEmuPack.7z", "https://github.com/Maximus5/ConEmu/releases/download/v17.11.09/ConEmuPack.171109.7z"),
+            # Fast Copy
+            @("fastcopy64.zip", "http://ftp.vector.co.jp/69/28/2323/FastCopy332_x64.zip"),
+            @("fastcopy32.zip", "http://ftp.vector.co.jp/69/28/2323/FastCopy332.zip"),
+            # HWiNFO
+            @("hwinfo64.zip", "http://app.oldfoss.com:81/download/HWiNFO/hw64_560.zip"),
+            @("hwinfo32.zip", "http://app.oldfoss.com:81/download/HWiNFO/hw32_560.zip"),
+            # Killer Network Drivers
+            @(
+                "killerinf.zip",
+                ("http://www.killernetworking.com"+(FindDynamicUrl "http://www.killernetworking.com/driver-downloads/item/killer-drivers-inf" "Download Killer-Ethernet").replace('&amp;', '&'))
+            ),
+            # Notepad++
+            @("npp_amd64.7z", "https://notepad-plus-plus.org/repository/7.x/7.5.2/npp.7.5.2.bin.minimalist.x64.7z"),
+            @("npp_x86.7z", "https://notepad-plus-plus.org/repository/7.x/7.5.2/npp.7.5.2.bin.minimalist.7z"),
+            # NT Password Editor
+            @("ntpwed.zip", "http://cdslow.org.ru/files/ntpwedit/ntpwed07.zip"),
+            # Prime95
+            @("prime95_64.zip", "http://www.mersenne.org/ftp_root/gimps/p95v294b5.win64.zip"),
+            @("prime95_32.zip", "http://www.mersenne.org/ftp_root/gimps/p95v294b5.win32.zip"),
+            # ProduKey
+            @("produkey64.zip", "http://www.nirsoft.net/utils/produkey-x64.zip"),
+            @("produkey32.zip", "http://www.nirsoft.net/utils/produkey.zip"),
+            # Python
+            @("python64.zip", "https://www.python.org/ftp/python/3.6.3/python-3.6.3-embed-amd64.zip"),
+            @("python32.zip", "https://www.python.org/ftp/python/3.6.3/python-3.6.3-embed-win32.zip"),
+            # Python: psutil
+            @(
+                "psutil64.whl",
+                (FindDynamicUrl "https://pypi.python.org/pypi/psutil" "href=.*-cp36-cp36m-win_amd64.whl")
+            ),
+            @(
+                "psutil32.whl",
+                (FindDynamicUrl "https://pypi.python.org/pypi/psutil" "href=.*-cp36-cp36m-win32.whl")
+            ),
+            # Q-Dir
+            @("qdir64.zip", "https://www.softwareok.com/Download/Q-Dir_Portable_x64.zip"),
+            @("qdir32.zip", "https://www.softwareok.com/Download/Q-Dir_Portable.zip"),
+            # TestDisk / PhotoRec
+            @("testdisk64.zip", "https://www.cgsecurity.org/testdisk-7.1-WIP.win64.zip"),
+            @("testdisk32.zip", "https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip")
+        )
+        foreach ($Tool in $ToolSources) {
+            DownloadFile -Path $Temp -Name $Tool[0] -Url $Tool[1]
+        }
+        
+        ## Bail ##
+        # If errors were encountered during downloads
+        if ($DownloadErrors -gt 0) {
+            Abort
+        }
+        
+        ## Extract ##
+        # 7-Zip
+        Write-Host "Extracting: 7-Zip"
+        try {
+            $ArgumentList = @("/a", "$Temp\7z-installer.msi", "TARGETDIR=$Temp\7zi", "/qn")
+            Start-Process -FilePath "$HostSystem32\msiexec.exe" -ArgumentList $ArgumentList -Wait
+            $SevenZip = "$Temp\7zi\Files\7-Zip\7z.exe"
+            $ArgumentList = @(
+                "e", "$Temp\7z-extra.7z", "-o$Root\WK\amd64\7-Zip",
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "x64\7za.exe", "*.txt")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "e", "$Temp\7z-extra.7z", "-o$Root\WK\x86\7-Zip",
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "7za.exe", "*.txt")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\7z*" -Recurse
+            $SevenZip = "$Root\WK\x86\7-Zip\7za.exe"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+
+        # Blue Screen View
+        Write-Host "Extracting: BlueScreenView"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\bluescreenview64.zip", "-o$Root\WK\amd64\BlueScreenView",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "x", "$Temp\bluescreenview32.zip", "-o$Root\WK\x86\BlueScreenView",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\bluescreenview*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        
+        # ConEmu
+        Write-Host "Extracting: ConEmu"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\ConEmuPack.7z", "-o$Root\WK\amd64\ConEmu",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Root\WK\amd64\ConEmu\ConEmu.exe"
+            Remove-Item "$Root\WK\amd64\ConEmu\ConEmu.map"
+            Move-Item "$Root\WK\amd64\ConEmu\ConEmu64.exe" "$Root\WK\amd64\ConEmu\ConEmu.exe" -Force
+            Move-Item "$Root\WK\amd64\ConEmu\ConEmu64.map" "$Root\WK\amd64\ConEmu\ConEmu.map" -Force
+            $ArgumentList = @(
+                "x", "$Temp\ConEmuPack.7z", "-o$Root\WK\x86\ConEmu",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Root\WK\x86\ConEmu\ConEmu64.exe"
+            Remove-Item "$Root\WK\x86\ConEmu\ConEmu64.map"
+            Remove-Item "$Temp\ConEmuPack*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+
+        # Fast Copy
+        Write-Host "Extracting: FastCopy"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\fastcopy64.zip", "-o$Root\WK\amd64\FastCopy",
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "-x!setup.exe", "-x!*.dll")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "e", "$Temp\fastcopy32.zip", "-o$Root\WK\x86\FastCopy",
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "-x!setup.exe", "-x!*.dll")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\fastcopy*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        
+        # Killer Network Driver
+        Write-Host "Extracting: Killer Network Driver"
+        try {
+            $ArgumentList = @(
+                "e", "$Temp\killerinf.zip", "-o$Root\Drivers\amd64\Killer",
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "Production\Windows10-x64\Eth\*")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "e", "$Temp\killerinf.zip", "-o$Root\Drivers\x86\Killer",
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "Production\Windows10-x86\Eth\*")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\killerinf*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        
+        # HWiNFO
+        Write-Host "Extracting: HWiNFO"
+        try {
+            $ArgumentList = @(
+                "e", "$Temp\hwinfo64.zip", "-o$Root\WK\amd64\HWiNFO",
+                "-aoa", "-bso0", "-bse0", "-bsp0", "HWiNFO64.exe")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "e", "$Temp\hwinfo32.zip", "-o$Root\WK\x86\HWiNFO",
+                "-aoa", "-bso0", "-bse0", "-bsp0", "HWiNFO32.exe")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\hwinfo*"
+            Move-Item "$Root\WK\amd64\HWiNFO\HWiNFO64.exe" "$Root\WK\amd64\HWiNFO\HWiNFO.exe" -Force
+            Move-Item "$Root\WK\x86\HWiNFO\HWiNFO32.exe" "$Root\WK\x86\HWiNFO\HWiNFO.exe" -Force
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        
+        # Notepad++
+        Write-Host "Extracting: Notepad++"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\npp_amd64.7z", "-o$Root\WK\amd64\NotepadPlusPlus",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "x", "$Temp\npp_x86.7z", "-o$Root\WK\x86\NotepadPlusPlus",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\npp*"
+            Move-Item "$Root\WK\amd64\NotepadPlusPlus\notepad++.exe" "$Root\WK\amd64\NotepadPlusPlus\notepadplusplus.exe" -Force
+            Move-Item "$Root\WK\x86\NotepadPlusPlus\notepad++.exe" "$Root\WK\x86\NotepadPlusPlus\notepadplusplus.exe" -Force
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+
+        # NT Password Editor
+        Write-Host "Extracting: NT Password Editor"
+        try {
+            $ArgumentList = @(
+                "e", "$Temp\ntpwed.zip", ('-o"{0}\WK\amd64\NT Password Editor"' -f $Root),
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "ntpwedit64.exe", "*.txt")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Move-Item "$Root\WK\amd64\NT Password Editor\ntpwedit64.exe" "$Root\WK\amd64\NT Password Editor\ntpwedit.exe" -Force
+            $ArgumentList = @(
+                "e", "$Temp\ntpwed.zip", ('-o"{0}\WK\x86\NT Password Editor"' -f $Root),
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "ntpwedit.exe", "*.txt")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\ntpwed*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        
+        # PhotoRec / TestDisk
+        Write-Host "Extracting: PhotoRec / TestDisk"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\testdisk64.zip", "-o$Root\WK\amd64\TestDisk",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            # Remove destination since Move-Item -Force can't handle this recursive merge
+            Remove-Item "$Root\WK\amd64\TestDisk" -Recurse -Force
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Move-Item "$Root\WK\amd64\TestDisk\testdisk-7.1-WIP\*" "$Root\WK\amd64\TestDisk" -Force
+            Remove-Item "$Root\WK\amd64\TestDisk\testdisk-7.1-WIP" -Recurse -Force
+            $ArgumentList = @(
+                "x", "$Temp\testdisk32.zip", "-o$Root\WK\x86\TestDisk",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            # Remove destination since Move-Item -Force can't handle this recursive merge
+            Remove-Item "$Root\WK\x86\TestDisk" -Recurse -Force
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Move-Item "$Root\WK\x86\TestDisk\testdisk-7.1-WIP\*" "$Root\WK\x86\TestDisk" -Force
+            Remove-Item "$Root\WK\x86\TestDisk\testdisk-7.1-WIP" -Recurse -Force
+            Remove-Item "$Temp\testdisk*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        
+        # Prime95
+        Write-Host "Extracting: Prime95"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\prime95_64.zip", "-o$Root\WK\amd64\Prime95",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "x", "$Temp\prime95_32.zip", "-o$Root\WK\x86\Prime95",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\prime95*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        
+        # ProduKey
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\produkey64.zip", "-o$Root\WK\amd64\ProduKey",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "x", "$Temp\produkey32.zip", "-o$Root\WK\x86\ProduKey",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\produkey*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        
+        # Python (x64)
+        Write-Host "Extracting: Python (x64)"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\python64.zip", "-o$Root\WK\amd64\python",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "x", "$Temp\psutil64.whl", "-o$Root\WK\amd64\python",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+
+        # Python (x32)
+        Write-Host "Extracting: Python (x32)"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\python32.zip", "-o$Root\WK\x86\python",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "x", "$Temp\psutil32.whl", "-o$Root\WK\x86\python",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+        Remove-Item "$Temp\python*"
+        Remove-Item "$Temp\*.whl"
+    
+        # Q-Dir
+        Write-Host "Extracting: Q-Dir"
+        try {
+            $ArgumentList = @(
+                "x", "$Temp\qdir64.zip", "-o$Root\WK\amd64",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "x", "$Temp\qdir32.zip", "-o$Root\WK\x86",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Temp\qdir*"
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
+        }
+    }
+    
+    ## 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 -FilePath $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 drivers
+        Add-WindowsDriver -Path $Mount -Driver $Drivers -Recurse | Out-Null
+        
+        # Add packages
+        Write-Host "Adding packages:"
+        $WinPEPackages = @(
+            "WinPE-EnhancedStorage",
+            "WinPE-FMAPI",
+            "WinPE-WMI",
+            "WinPE-SecureStartup"
+        )
+        foreach ($Package in $WinPEPackages) {
+            $PackagePath = ("{0}\{1}\WinPE_OCs\{2}.cab" -f $Env:WinPERoot, $Arch, $Package)
+            Write-Host "    $Package..."
+            Add-WindowsPackage –PackagePath $PackagePath –Path $Mount | Out-Null
+            $LangPackagePath = ("{0}\{1}\WinPE_OCs\en-us\{2}_en-us.cab" -f $Env:WinPERoot, $Arch, $Package)
+            if (Test-Path $LangPackagePath) {
+                Add-WindowsPackage –PackagePath $LangPackagePath –Path $Mount | Out-Null
+            }
+        }
+        
+        # Set RamDisk size
+        $ArgumentList = @(
+            ('/Image:"{0}"' -f $Mount),
+            "/Set-ScratchSpace:512"
+        )
+        Start-Process -FilePath $DISM -ArgumentList $ArgumentList -NoNewWindow -Wait
+        
+        # Add tools
+        Write-Host "Copying tools..."
+        Copy-Item -Path "$Root\WK\$Arch" -Destination "$Mount\.bin" -Recurse -Force
+        Copy-Item -Path "$Root\WK\_include\*" -Destination "$Mount\.bin" -Recurse -Force
+        if ($Arch -eq "amd64") {
+            $DestIni = "$Mount\.bin\HWiNFO\HWiNFO64.INI"
+        } else {
+            $DestIni = "$Mount\.bin\HWiNFO\HWiNFO32.INI"
+        }
+        Move-Item -Path "$Mount\.bin\HWiNFO\HWiNFO.INI" -Destination $DestIni -Force
+        Copy-Item -Path "$Root\WinPE.jpg" -Destination "$Mount\.bin\ConEmu\ConEmu.jpg" -Recurse -Force
+        Copy-Item -Path "$Root\Scripts" -Destination "$Mount\.bin\Scripts" -Recurse -Force
+        
+        # Add System32 items
+        $HostSystem32 = "{0}\System32" -f $Env:SystemRoot
+        Copy-Item -Path "$Root\System32\*" -Destination "$Mount\Windows\System32" -Recurse -Force
+        $ArgumentList = @("/f", "$Mount\Windows\System32\winpe.jpg", "/a")
+        Start-Process -FilePath "$HostSystem32\takeown.exe" -ArgumentList $ArgumentList -NoNewWindow -Wait
+        $ArgumentList = @("$Mount\Windows\System32\winpe.jpg", "/grant", "Administrators:F")
+        Start-Process -FilePath "$HostSystem32\icacls.exe" -ArgumentList $ArgumentList -NoNewWindow -Wait
+        Copy-Item -Path "$Root\WinPE.jpg" -Destination "$Mount\Windows\System32\winpe.jpg" -Recurse -Force
+        
+        # Load registry hives
+        Write-Host "Updating Registry..."
+        $Reg = "$HostSystem32\reg.exe"
+        $ArgumentList = @("load", "HKLM\WinPE-SW", "$Mount\Windows\System32\config\SOFTWARE")
+        Start-Process -FilePath $Reg -ArgumentList $ArgumentList -NoNewWindow -Wait
+        $ArgumentList = @("load", "HKLM\WinPE-SYS", "$Mount\Windows\System32\config\SYSTEM")
+        Start-Process -FilePath $Reg -ArgumentList $ArgumentList -NoNewWindow -Wait
+        
+        # Add tools to path
+        ## .NET code to properly handle REG_EXPAND_SZ values
+        ## Credit: https://www.sepago.com/blog/2013/08/22/reading-and-writing-regexpandsz-data-with-powershell
+        ## By: Marius Gawenda
+        $Hive = [Microsoft.Win32.Registry]::LocalMachine
+        $RegPath = "WinPE-SYS\ControlSet001\Control\Session Manager\Environment"
+        $RegKey = $Hive.OpenSubKey($RegPath)
+        $CurValue = $RegKey.GetValue(
+            "Path", $false, [Microsoft.Win32.RegistryValueOptions]::DoNotExpandEnvironmentNames)
+        $NewValue = "$CurValue;%SystemDrive%\.bin\7-Zip;%SystemDrive%\.bin\python;%SystemDrive%\.bin\wimlib"
+        Set-ItemProperty -Path "HKLM:\$RegPath" -Name "Path" -Value $NewValue -Force | Out-Null
+        $Hive.close()
+        $RegKey.close()
+        
+        # Replace Notepad
+        $RegPath = "HKLM:\WinPE-SW\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe"
+        $NewValue = 'cmd /c "%SystemDrive%\.bin\NotepadPlusPlus\npp.cmd"'
+        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 -FilePath $Reg -ArgumentList @("unload", "HKLM\WinPE-SW") -NoNewWindow -Wait
+        Start-Process -FilePath $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 -FilePath $Cmd -ArgumentList $ArgumentList -NoNewWindow -Wait
+    }
+
+    ## Done ##
+    Pop-Location
+    Write-Host "`nDone."
+    WKPause "Press Enter to exit... "
+}
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,10 @@
-*iso
-Scripts/__pycache__
-dism*
-mount
-pe_files
+**/__pycache__/*
+*.bak
+*.iso
+.bin/tmp
+Drivers
+Logs
+Mount
+PEFiles
+WK/amd64/
+WK/x86/
--- a/PE.cmd
+++ b/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%
--- a/Scripts/functions.py
+++ b/Scripts/functions.py
--- a/Scripts/functions/backup.py
+++ b/Scripts/functions/backup.py
@ -0,0 +1,153 @@
+# Wizard Kit PE: Functions - Backup
+
+from functions.disk import *
+
+# Regex
+REGEX_BAD_PATH_NAMES = re.compile(
+    r'([<>:"/\\\|\?\*]'
+    r'|^(CON|PRN|AUX|NUL|COM\d*|LPT\d*)$)'
+    r'|^\s+'
+    r'|[\s\.]+$',
+    re.IGNORECASE)
+
+def backup_partition(disk, partition):
+    if par['Image Exists'] or par['Number'] in disk['Bad Partitions']:
+        raise GenericAbort
+    
+    cmd = [
+        global_vars['Tools']['wimlib-imagex'],
+        'capture'
+        '{}:\\'.format(par['Letter']),
+        par['Image Path'],
+        par['Image Name'], # Image name
+        par['Image Name'], # Image description
+        ' --compress=none',
+        ]
+    dest_dir = re.sub(r'(.*)\\.*$', r'\1', par['Image Path'], re.IGNORECASE)
+    os.makedirs(dest_dir, exist_ok=True)
+    run_program(cmd)
+
+def fix_path(path):
+    return REGEX_BAD_PATH_NAMES.sub('_', path)
+
+def prep_disk_for_backup(destination, disk, ticket_number):
+    disk['Clobber Risk'] = []
+    width = len(str(len(disk['Partitions'])))
+
+    # Get partition totals
+    disk['Bad Partitions'] = [par['Number'] for par in disk['Partitions']
+        if is_bad_partition(partition)]
+    num_valid_partitions = len(disk['Partitions']) - len(disk['Bad Partitions'])
+    disk['Valid Partitions'] = num_valid_partitions
+    if disk['Valid Partitions'] <= 0:
+        print_error('ERROR: No partitions can be backed up for this disk')
+        raise GenericAbort
+    
+    # Prep partitions
+    for par in disk['Partitions']:
+        display = 'Partition {num:>{width}}:\t{size} {fs}'.format(
+            num = par['Number'],
+            width = width,
+            size = par['Size'],
+            fs = par['FileSystem'])
+        
+        if par['Number'] in disk['Bad Partitions']:
+            # Set display string using partition description & OS type
+            display = '  * {display}\t\t{q}{name}{q}\t{desc} ({os})'.format(
+                display = display,
+                q = '"' if par['Name'] != '' else '',
+                name = par['Name'],
+                desc = par['Description'],
+                os = par['OS'])
+            display = '{YELLOW}{display}{CLEAR}'.format(
+                display=display, **COLORS)
+        else:
+            # Update info for WIM capturing
+            par['Image Name'] = par['Name'] if par['Name'] else 'Unknown'
+            if 'IP' in destination:
+                par['Image Path'] = r'\\{}\{}\{}'.format(
+                    destination['IP'], destination['Share'], ticket_number)
+            else:
+                par['Image Path'] = r'{}:\{}'.format(
+                    ticket_number, destination['Letter'])
+            par['Image Path'] += r'\{}_{}.wim'.format(
+                par['Number'], par['Image Name'])
+            par['Image Path'] = fix_path(par['Image Path'])
+
+            # Check for existing backups
+            par['Image Exists'] = os.path.exists(par['Image Path'])
+            if par['Image Exists']:
+                disk['Clobber Risk'].append(par['Number'])
+                display = '{}  + {}'.format(COLORS['BLUE'], display)
+            else:
+                display = '{}    {}'.format(COLORS['CLEAR'], display)
+            
+            # Append rest of Display String for valid/clobber partitions
+            display += ' (Used: {used})\t{q}{name}{q}{CLEAR}'.format(
+                used = par['Used Space'],
+                q = '"' if par['Name'] != '' else '',
+                name = par['Name'],
+                **COLORS)
+        # For all partitions
+        par['Display String'] = display
+    
+    # Set description for bad partitions
+    warnings = '\n'
+    if disk['Bad Partitions']:
+        warnings += '{}  * Unsupported filesystem{}\n'.format(
+            COLORS['YELLOW'], COLORS['CLEAR'])
+    if disk['Clobber Risk']:
+        warnings += '{}  + Backup exists on {}{}\n'.format(
+            COLORS['BLUE'], destination['Name'], COLORS['CLEAR'])
+    if disk['Bad Partitions'] or disk['Clobber Risk']:
+        warnings += '\n{}Marked partition(s) will NOT be backed up.{}\n'.format(
+            COLORS['YELLOW'], COLORS['CLEAR'])
+    disk['Backup Warnings'] = warnings
+
+def select_backup_destination(auto_select=True):
+    # Build menu
+    destinations = [s for s in BACKUP_SERVERS if s['Mounted']]
+    actions = [
+        {'Name': 'Main Menu', 'Letter': 'M'},
+        ]
+
+    # Size check
+    for dest in destinations:
+        if 'IP' in dest:
+            dest['Usage'] = shutil.disk_usage(r'\\{IP}\{Share}'.format(**dest))
+        else:
+            dest['Usage'] = shutil.disk_usage('{}:\\'.format(dest['Letter']))
+        dest['Free Space'] = human_readable_size(dest['Usage'].free)
+        dest['Display Name'] = '{Name} ({Free Space} available)'.format(**dest)
+
+    # Bail
+    if not destinations:
+        print_warning('No backup destinations found.')
+        raise GenericAbort
+    
+    # Skip menu?
+    if len(destinations) == 1 and auto_select:
+        return destinations[0]
+    
+    selection = menu_select(
+        title = 'Where are we backing up to?',
+        main_entries = destinations,
+        action_entries = actions)
+    if selection == 'M':
+        raise GenericAbort
+    else:
+        return destinations[int(selection)-1]
+
+def verify_wim_backup(partition):
+    if not os.path.exists(partition['Image Path']):
+        raise PathNotFoundError
+    cmd = [
+        global_vars['Tools']['wimlib-imagex'],
+        'verify',
+        partition['Image Path'],
+        ' --nocheck',
+        ]
+    run_program(cmd)
+
+if __name__ == '__main__':
+    print("This file is not meant to be called directly.")
--- a/Scripts/functions/common.py
+++ b/Scripts/functions/common.py
@ -0,0 +1,701 @@
+# Wizard Kit PE: Functions - Common
+
+import os
+import psutil
+import re
+import shutil
+import subprocess
+import sys
+import time
+import traceback
+import winreg
+
+from subprocess import CalledProcessError
+
+from settings.main import *
+from settings.tools import *
+
+# Global variables
+global_vars = {}
+
+# STATIC VARIABLES
+COLORS = {
+    'CLEAR': '\033[0m',
+    'RED': '\033[31m',
+    'GREEN': '\033[32m',
+    'YELLOW': '\033[33m',
+    'BLUE': '\033[34m'
+}
+HKU = winreg.HKEY_USERS
+HKCU = winreg.HKEY_CURRENT_USER
+HKLM = winreg.HKEY_LOCAL_MACHINE
+
+# Error Classes
+class BIOSKeyNotFoundError(Exception):
+    pass
+
+class BinNotFoundError(Exception):
+    pass
+
+class GenericAbort(Exception):
+    pass
+
+class GenericError(Exception):
+    pass
+
+class GenericRepair(Exception):
+    pass
+
+class MultipleInstallationsError(Exception):
+    pass
+
+class NotInstalledError(Exception):
+    pass
+
+class NoProfilesError(Exception):
+    pass
+
+class PathNotFoundError(Exception):
+    pass
+
+class UnsupportedOSError(Exception):
+    pass
+
+# General functions
+def abort():
+    """Abort script."""
+    print_warning('Aborted.')
+    sleep(5)
+    exit_script()
+
+def ask(prompt='Kotaero!'):
+    """Prompt the user with a Y/N question, log answer, and return a bool."""
+    answer = None
+    prompt = '{} [Y/N]: '.format(prompt)
+    while answer is None:
+        tmp = input(prompt)
+        if re.search(r'^y(es|)$', tmp, re.IGNORECASE):
+            answer = True
+        elif re.search(r'^n(o|ope|)$', tmp, re.IGNORECASE):
+            answer = False
+    message = '{prompt}{answer_text}'.format(
+        prompt = prompt,
+        answer_text = 'Yes' if answer else 'No')
+    print_log(message=message)
+    return answer
+
+def clear_screen():
+    """Simple wrapper for cls."""
+    os.system('cls')
+
+def convert_to_bytes(size):
+    """Convert human-readable size str to bytes and return an int."""
+    size = str(size)
+    tmp = re.search(r'(\d+)\s+([KMGT]B)', size.upper())
+    if tmp:
+        size = int(tmp.group(1))
+        units = tmp.group(2)
+        if units == 'TB':
+            size *= 1099511627776
+        elif units == 'GB':
+            size *= 1073741824
+        elif units == 'MB':
+            size *= 1048576
+        elif units == 'KB':
+            size *= 1024
+    else:
+        return -1
+
+    return size
+
+def exit_script(return_value=0):
+    """Exits the script after some cleanup and opens the log (if set)."""
+    # Remove dirs (if empty)
+    for dir in ['BackupDir', 'LogDir', 'TmpDir']:
+        try:
+            dir = global_vars[dir]
+            os.rmdir(dir)
+        except Exception:
+            pass
+
+    # Open Log (if it exists)
+    log = global_vars.get('LogFile', '')
+    if log and os.path.exists(log):
+        try:
+            extract_item('NotepadPlusPlus', silent=True)
+            popen_program(
+                [global_vars['Tools']['NotepadPlusPlus'],
+                global_vars['LogFile']])
+        except Exception:
+            print_error('ERROR: Failed to extract Notepad++ and open log.')
+            pause('Press Enter to exit...')
+
+    # Kill Caffeine if still running
+    kill_process('caffeine.exe')
+
+    # Exit
+    sys.exit(return_value)
+
+def extract_item(item, filter='', silent=False):
+    """Extract item from .cbin into .bin."""
+    cmd = [
+        global_vars['Tools']['SevenZip'], 'x', '-aos', '-bso0', '-bse0',
+        '-p{ArchivePassword}'.format(**global_vars),
+        r'-o{BinDir}\{item}'.format(item=item, **global_vars),
+        r'{CBinDir}\{item}.7z'.format(item=item, **global_vars),
+        filter]
+    if not silent:
+        print_standard('Extracting "{item}"...'.format(item=item))
+    try:
+        run_program(cmd)
+    except subprocess.CalledProcessError:
+        if not silent:
+            print_warning('WARNING: Errors encountered while exctracting data')
+
+def get_ticket_number():
+    """Get TicketNumber from user, save in LogDir, and return as str."""
+    ticket_number = None
+    while ticket_number is None:
+        _input = input('Enter ticket number: ')
+        if re.match(r'^([0-9]+([-_]?\w+|))$', _input):
+            ticket_number = _input
+            with open(r'{LogDir}\TicketNumber'.format(**global_vars), 'w') as f:
+                f.write(ticket_number)
+    return ticket_number
+
+def human_readable_size(size, decimals=0):
+    """Convert size in bytes to a human-readable format and return a str."""
+    # Prep string formatting
+    width = 3+decimals
+    if decimals > 0:
+        width += 1
+
+    # Convert size to int
+    try:
+        size = int(size)
+    except ValueError:
+        size = convert_to_bytes(size)
+
+    # Verify we have a valid size
+    if size < 0:
+        return '{size:>{width}} b'.format(size='???', width=width)
+
+    # Convert to sensible units
+    if size >= 1099511627776:
+        size /= 1099511627776
+        units = 'Tb'
+    elif size >= 1073741824:
+        size /= 1073741824
+        units = 'Gb'
+    elif size >= 1048576:
+        size /= 1048576
+        units = 'Mb'
+    elif size >= 1024:
+        size /= 1024
+        units = 'Kb'
+    else:
+        units = ' b'
+    
+    # Return
+    return '{size:>{width}.{decimals}f} {units}'.format(
+        size=size, width=width, decimals=decimals, units=units)
+
+def kill_process(name):
+    """Kill any running caffeine.exe processes."""
+    for proc in psutil.process_iter():
+        if proc.name() == name:
+            proc.kill()
+
+def major_exception():
+    """Display traceback and exit"""
+    print_error('Major exception')
+    print_warning(SUPPORT_MESSAGE)
+    print(traceback.format_exc())
+    print_log(traceback.format_exc())
+    sleep(30)
+    pause('Press Enter to exit...')
+    exit_script(1)
+
+def menu_select(title='~ Untitled Menu ~',
+    prompt='Please make a selection', secret_exit=False,
+    main_entries=[], action_entries=[], disabled_label='DISABLED'):
+    """Display options in a menu and return selected option as a str."""
+    # Bail early
+    if not main_entries and not action_entries:
+        raise Exception("MenuError: No items given")
+
+    # Set title
+    if 'Title' in global_vars:
+        title = '{}\n\n{}'.format(global_vars['Title'], title)
+
+    # Build menu
+    menu_splash =   '{}\n\n'.format(title)
+    width =         len(str(len(main_entries)))
+    valid_answers = []
+    if (secret_exit):
+        valid_answers.append('Q')
+
+    # Add main entries
+    for i in range(len(main_entries)):
+        entry = main_entries[i]
+        # Add Spacer
+        if ('CRLF' in entry):
+            menu_splash += '\n'
+        entry_str = '{number:>{width}}: {name}'.format(
+                number =    i+1,
+                width =     width,
+                name =      entry.get('Display Name', entry['Name']))
+        if entry.get('Disabled', False):
+            entry_str = '{YELLOW}{entry_str} ({disabled}){CLEAR}'.format(
+                entry_str = entry_str,
+                disabled =  disabled_label,
+                **COLORS)
+        else:
+            valid_answers.append(str(i+1))
+        menu_splash += '{}\n'.format(entry_str)
+    menu_splash += '\n'
+
+    # Add action entries
+    for entry in action_entries:
+        # Add Spacer
+        if ('CRLF' in entry):
+            menu_splash += '\n'
+        valid_answers.append(entry['Letter'])
+        menu_splash += '{letter:>{width}}: {name}\n'.format(
+            letter =    entry['Letter'].upper(),
+            width =     len(str(len(action_entries))),
+            name =      entry['Name'])
+    menu_splash += '\n'
+
+    answer = ''
+
+    while (answer.upper() not in valid_answers):
+        os.system('cls')
+        print(menu_splash)
+        answer = input('{}: '.format(prompt))
+
+    return answer.upper()
+
+def non_clobber_rename(full_path):
+    """Append suffix to path, if necessary, to avoid clobbering path"""
+    new_path = full_path
+    _i = 1;
+    while os.path.exists(new_path):
+        new_path = '{path}_{i}'.format(i=_i, path=full_path)
+        _i += 1
+
+    return new_path
+
+def pause(prompt='Press Enter to continue... '):
+    """Simple pause implementation."""
+    input(prompt)
+
+def ping(addr='google.com'):
+    """Attempt to ping addr."""
+    cmd = ['ping', '-n', '2', addr]
+    run_program(cmd)
+
+def popen_program(cmd, pipe=False, minimized=False, shell=False, **kwargs):
+    """Run program and return a subprocess.Popen object."""
+    startupinfo=None
+    if minimized:
+        startupinfo = subprocess.STARTUPINFO()
+        startupinfo.dwFlags = subprocess.STARTF_USESHOWWINDOW
+        startupinfo.wShowWindow = 6
+
+    if pipe:
+        popen_obj = subprocess.Popen(cmd, shell=shell, startupinfo=startupinfo,
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    else:
+        popen_obj = subprocess.Popen(cmd, shell=shell, startupinfo=startupinfo)
+
+    return popen_obj
+
+def print_error(*args, **kwargs):
+    """Prints message to screen in RED."""
+    print_standard(*args, color=COLORS['RED'], **kwargs)
+
+def print_info(*args, **kwargs):
+    """Prints message to screen in BLUE."""
+    print_standard(*args, color=COLORS['BLUE'], **kwargs)
+
+def print_standard(message='Generic info',
+    color=None, end='\n', timestamp=True, **kwargs):
+    """Prints message to screen and log (if set)."""
+    display_message = message
+    if color:
+        display_message = color + message + COLORS['CLEAR']
+    # **COLORS is used below to support non-"standard" color printing
+    print(display_message.format(**COLORS), end=end, **kwargs)
+    print_log(message, end, timestamp)
+
+def print_success(*args, **kwargs):
+    """Prints message to screen in GREEN."""
+    print_standard(*args, color=COLORS['GREEN'], **kwargs)
+
+def print_warning(*args, **kwargs):
+    """Prints message to screen in YELLOW."""
+    print_standard(*args, color=COLORS['YELLOW'], **kwargs)
+
+def print_log(message='', end='\n', timestamp=True):
+    time_str = time.strftime("%Y-%m-%d %H%M%z: ") if timestamp else ''
+    if 'LogFile' in global_vars and global_vars['LogFile'] is not None:
+        with open(global_vars['LogFile'], 'a') as f:
+            for line in message.splitlines():
+                f.write('{timestamp}{line}{end}'.format(
+                    timestamp = time_str,
+                    line =      line,
+                    end =       end))
+
+def run_program(cmd, args=[], check=True, pipe=True, shell=False):
+    """Run program and return a subprocess.CompletedProcess object."""
+    if args:
+        # Deprecated so let's raise an exception to find & fix all occurances
+        print_error('ERROR: Using args is no longer supported.')
+        raise Exception
+    cmd = [c for c in cmd if c]
+    if shell:
+        cmd = ' '.join(cmd)
+
+    if pipe:
+        process_return = subprocess.run(cmd, check=check, shell=shell,
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    else:
+        process_return = subprocess.run(cmd, check=check, shell=shell)
+
+    return process_return
+
+def set_title(title='~Some Title~'):
+    """Set title.
+    
+    Used for window title and menu titles."""
+    global_vars['Title'] = title
+    os.system('title {}'.format(title))
+
+def show_info(message='~Some message~', info='~Some info~', indent=8, width=32):
+    """Display info with formatting."""
+    print_standard('{indent}{message:<{width}}{info}'.format(
+        indent=' '*indent, width=width, message=message, info=info))
+
+def sleep(seconds=2):
+    """Wait for a while."""
+    time.sleep(seconds)
+
+def stay_awake():
+    """Prevent the system from sleeping or hibernating."""
+    # Bail if caffeine is already running
+    for proc in psutil.process_iter():
+        if proc.name() == 'caffeine.exe':
+            return
+    # Extract and run
+    extract_item('Caffeine', silent=True)
+    try:
+        popen_program(global_vars['Tools']['Caffeine'])
+    except Exception:
+        print_error('ERROR: No caffeine available.')
+        print_warning('Please set the power setting to High Performance.')
+
+def get_exception(s):
+    """Get exception by name, returns Exception object."""
+    return getattr(sys.modules[__name__], s)
+
+def try_and_print(message='Trying...',
+    function=None, cs='CS', ns='NS', other_results={},
+    catch_all=True, print_return=False, silent_function=True,
+    indent=8, width=32, *args, **kwargs):
+    """Run function, print if successful or not, and return dict.
+
+    other_results is in the form of
+        {
+            'Warning': {'ExceptionClassName': 'Result Message'},
+            'Error':   {'ExceptionClassName': 'Result Message'}
+            }
+        The the ExceptionClassNames will be excepted conditions
+        and the result string will be printed in the correct color.
+    catch_all=False will result in unspecified exceptions being re-raised."""
+    err = None
+    out = None
+    w_exceptions = other_results.get('Warning', {}).keys()
+    w_exceptions = tuple(get_exception(e) for e in w_exceptions)
+    e_exceptions = other_results.get('Error', {}).keys()
+    e_exceptions = tuple(get_exception(e) for e in e_exceptions)
+    w_results = other_results.get('Warning', {})
+    e_results = other_results.get('Error', {})
+
+    # Run function and catch errors
+    print_standard('{indent}{message:<{width}}'.format(
+        indent=' '*indent, message=message, width=width), end='', flush=True)
+    try:
+        out = function(*args, **kwargs)
+        if print_return:
+            print_standard(out[0], timestamp=False)
+            for item in out[1:]:
+                print_standard('{indent}{item}'.format(
+                    indent=' '*(indent+width), item=item))
+        elif silent_function:
+            print_success(cs, timestamp=False)
+    except w_exceptions as e:
+        _result = w_results.get(e.__class__.__name__, 'Warning')
+        print_warning(_result, timestamp=False)
+        err = e
+    except e_exceptions as e:
+        _result = e_results.get(e.__class__.__name__, 'Error')
+        print_error(_result, timestamp=False)
+        err = e
+    except Exception:
+        print_error(ns, timestamp=False)
+        err = traceback.format_exc()
+
+    # Return or raise?
+    if err and not catch_all:
+        raise
+    else:
+        return {'CS': not bool(err), 'Error': err, 'Out': out}
+
+def upload_data(path, file):
+    """Add CLIENT_INFO_SERVER to authorized connections and upload file."""
+    if not ENABLED_UPLOAD_DATA:
+        raise GenericError('Feature disabled.')
+    
+    extract_item('PuTTY', filter='wizkit.ppk psftp.exe', silent=True)
+
+    # Authorize connection to the server
+    winreg.CreateKey(HKCU, r'Software\SimonTatham\PuTTY\SshHostKeys')
+    with winreg.OpenKey(HKCU, r'Software\SimonTatham\PuTTY\SshHostKeys',
+        access=winreg.KEY_WRITE) as key:
+        winreg.SetValueEx(key,
+            'rsa2@22:{IP}'.format(**CLIENT_INFO_SERVER), 0,
+            winreg.REG_SZ, CLIENT_INFO_SERVER['RegEntry'])
+
+    # Write batch file
+    with open(r'{TmpDir}\psftp.batch'.format(**global_vars),
+        'w', encoding='ascii') as f:
+        f.write('lcd "{path}"\n'.format(path=path))
+        f.write('cd "{Share}"\n'.format(**CLIENT_INFO_SERVER))
+        f.write('mkdir {TicketNumber}\n'.format(**global_vars))
+        f.write('cd {TicketNumber}\n'.format(**global_vars))
+        f.write('put "{file}"\n'.format(file=file))
+
+    # Upload Info
+    cmd = [
+        global_vars['Tools']['PuTTY-PSFTP'],
+        '-noagent',
+        '-i', r'{BinDir}\PuTTY\wizkit.ppk'.format(**global_vars),
+        '{User}@{IP}'.format(**CLIENT_INFO_SERVER),
+        '-b', r'{TmpDir}\psftp.batch'.format(**global_vars)]
+    run_program(cmd)
+
+def upload_info():
+    """Upload compressed Info file to the NAS as set in settings.main.py."""
+    if not ENABLED_UPLOAD_DATA:
+        raise GenericError('Feature disabled.')
+    
+    path = '{ClientDir}'.format(**global_vars)
+    file = 'Info_{Date-Time}.7z'.format(**global_vars)
+    upload_data(path, file)
+
+def compress_info():
+    """Compress ClientDir info folders with 7-Zip for upload_info()."""
+    path = '{ClientDir}'.format(**global_vars)
+    file = 'Info_{Date-Time}.7z'.format(**global_vars)
+    _cmd = [
+        global_vars['Tools']['SevenZip'],
+        'a', '-t7z', '-mx=9', '-bso0', '-bse0',
+        r'{}\{}'.format(path, file),
+        r'{ClientDir}\Info'.format(**global_vars)]
+    run_program(_cmd)
+
+def wait_for_process(name, poll_rate=3):
+    """Wait for process by name."""
+    running = True
+    while running:
+        sleep(poll_rate)
+        running = False
+        for proc in psutil.process_iter():
+            if re.search(r'^{}'.format(name), proc.name(), re.IGNORECASE):
+                running = True
+    sleep(1)
+
+# global_vars functions
+def init_global_vars():
+    """Sets global variables based on system info."""
+    print_info('Initializing')
+    os.system('title Wizard Kit')
+    init_functions = [
+        ['Checking .bin...',        find_bin],
+        ['Checking environment...', set_common_vars],
+        ['Checking OS...',          check_os],
+        ['Checking tools...',       check_tools],
+        ['Creating folders...',     make_tmp_dirs],
+        ['Clearing collisions...',  clean_env_vars],
+        ]
+    try:
+        for f in init_functions:
+            try_and_print(
+                message=f[0], function=f[1],
+                cs='Done', ns='Error', catch_all=False)
+    except:
+        major_exception()
+
+def check_os():
+    """Set OS specific variables."""
+    tmp = {}
+    
+    # Query registry
+    _reg_path = winreg.OpenKey(
+        HKLM, r'SOFTWARE\Microsoft\Windows NT\CurrentVersion')
+    for key in ['CSDVersion', 'CurrentBuild', 'CurrentBuildNumber',
+        'CurrentVersion', 'ProductName']:
+        try:
+            tmp[key] = winreg.QueryValueEx(_reg_path, key)[0]
+            if key in ['CurrentBuild', 'CurrentBuildNumber']:
+                tmp[key] = int(tmp[key])
+        except ValueError:
+            # Couldn't convert Build to int so this should be interesting...
+            tmp[key] = 0
+        except Exception:
+            tmp[key] = 'Unknown'
+
+    # Determine OS bit depth
+    tmp['Arch'] = 32
+    if 'PROGRAMFILES(X86)' in global_vars['Env']:
+        tmp['Arch'] = 64
+
+    # Determine OS Name
+    tmp['Name'] = '{ProductName} {CSDVersion}'.format(**tmp)
+    if tmp['CurrentBuild'] == 9600:
+        tmp['Name'] += ' Update' # Win 8.1u
+    if tmp['CurrentBuild'] == 10240:
+        tmp['Name'] += ' Release 1507 "Threshold 1"'
+    if tmp['CurrentBuild'] == 10586:
+        tmp['Name'] += ' Release 1511 "Threshold 2"'
+    if tmp['CurrentBuild'] == 14393:
+        tmp['Name'] += ' Release 1607 "Redstone 1" / "Anniversary Update"'
+    if tmp['CurrentBuild'] == 15063:
+        tmp['Name'] += ' Release 1703 "Redstone 2" / "Creators Update"'
+    if tmp['CurrentBuild'] == 16299:
+        tmp['Name'] += ' Release 1709 "Redstone 3" / "Fall Creators Update"'
+    tmp['Name'] = tmp['Name'].replace('Service Pack ', 'SP')
+    tmp['Name'] = tmp['Name'].replace('Unknown Release', 'Release')
+    tmp['Name'] = re.sub(r'\s+', ' ', tmp['Name'])
+
+    # Determine OS version
+    name = '{Name} x{Arch}'.format(**tmp)
+    if tmp['CurrentVersion'] == '6.0':
+        tmp['Version'] = 'Vista'
+        name += ' (very outdated)'
+    elif tmp['CurrentVersion'] == '6.1':
+        tmp['Version'] = '7'
+        if tmp['CSDVersion'] == 'Service Pack 1':
+            name += ' (outdated)'
+        else:
+            name += ' (very outdated)'
+    elif tmp['CurrentVersion'] in ['6.2', '6.3']:
+        if int(tmp['CurrentBuildNumber']) <= 9600:
+            tmp['Version'] = '8'
+        elif int(tmp['CurrentBuildNumber']) >= 10240:
+            tmp['Version'] = '10'
+        if tmp['CurrentBuild'] in [9200, 10240, 10586]:
+            name += ' (very outdated)'
+        elif tmp['CurrentBuild'] in [9600, 14393, 15063]:
+            name += ' (outdated)'
+        elif tmp['CurrentBuild'] == 16299:
+            pass # Current Win10
+        else:
+            name += ' (unrecognized)'
+    tmp['DisplayName'] = name
+    
+    # == vista ==
+    # 6.0.6000
+    # 6.0.6001
+    # 6.0.6002
+    # ==== 7 ====
+    # 6.1.7600
+    # 6.1.7601
+    # 6.1.7602
+    # ==== 8 ====
+    # 6.2.9200
+    # === 8.1 ===
+    # 6.3.9200
+    # === 8.1u ==
+    # 6.3.9600
+    # === 10 v1507 "Threshold 1" ==
+    # 6.3.10240
+    # === 10 v1511 "Threshold 2" ==
+    # 6.3.10586
+    # === 10 v1607 "Redstone 1" "Anniversary Update" ==
+    # 6.3.14393
+    # === 10 v1703 "Redstone 2" "Creators Update" ==
+    # 6.3.15063
+    # === 10 v1709 "Redstone 3" "Fall Creators Update" ==
+    # 6.3.16299
+    global_vars['OS'] = tmp
+
+def check_tools():
+    """Set tool variables based on OS bit-depth and tool availability."""
+    if global_vars['OS'].get('Arch', 32) == 64:
+        global_vars['Tools'] = {
+            k: v.get('64', v.get('32')) for (k, v) in TOOLS.items()}
+    else:
+        global_vars['Tools'] = {k: v.get('32') for (k, v) in TOOLS.items()}
+
+    # Fix paths
+    global_vars['Tools'] = {k: os.path.join(global_vars['BinDir'], v)
+        for (k, v) in global_vars['Tools'].items()}
+
+def clean_env_vars():
+    """Remove conflicting global_vars and env variables.
+    
+    This fixes an issue where both global_vars and
+    global_vars['Env'] are expanded at the same time."""
+    for key in global_vars.keys():
+        global_vars['Env'].pop(key, None)
+
+def find_bin():
+    """Find .bin folder in the cwd or it's parents."""
+    wd = os.getcwd()
+    base = None
+    while base is None:
+        if os.path.exists('.bin'):
+            base = os.getcwd()
+            break
+        if re.fullmatch(r'\w:\\', os.getcwd()):
+            break
+        os.chdir('..')
+    os.chdir(wd)
+    if base is None:
+        raise BinNotFoundError
+    global_vars['BaseDir'] = base
+
+def make_tmp_dirs():
+    """Make temp directories."""
+    os.makedirs(global_vars['BackupDir'], exist_ok=True)
+    os.makedirs(global_vars['LogDir'], exist_ok=True)
+    os.makedirs(global_vars['TmpDir'], exist_ok=True)
+
+def set_common_vars():
+    """Set common variables."""
+    global_vars['Date'] =               time.strftime("%Y-%m-%d")
+    global_vars['Date-Time'] =          time.strftime("%Y-%m-%d_%H%M_%z")
+    global_vars['Env'] =                os.environ.copy()
+
+    global_vars['ArchivePassword'] =    ARCHIVE_PASSWORD
+    global_vars['BinDir'] =             r'{BaseDir}\.bin'.format(
+        **global_vars)
+    global_vars['CBinDir'] =            r'{BaseDir}\.cbin'.format(
+        **global_vars)
+    global_vars['ClientDir'] =          r'{SYSTEMDRIVE}\{prefix}'.format(
+        prefix=KIT_NAME_SHORT, **global_vars['Env'])
+    global_vars['BackupDir'] =          r'{ClientDir}\Backups\{Date}'.format(
+        **global_vars)
+    global_vars['LogDir'] =             r'{ClientDir}\Info\{Date}'.format(
+        **global_vars)
+    global_vars['ProgBackupDir'] =      r'{ClientDir}\Backups'.format(
+        **global_vars)
+    global_vars['QuarantineDir'] =      r'{ClientDir}\Quarantine'.format(
+        **global_vars)
+    global_vars['TmpDir'] =             r'{BinDir}\tmp'.format(
+        **global_vars)
+
+if __name__ == '__main__':
+    print("This file is not meant to be called directly.")
--- a/Scripts/functions/data.py
+++ b/Scripts/functions/data.py
@ -0,0 +1,607 @@
+# Wizard Kit PE: Functions - Data
+
+import ctypes
+
+from operator import itemgetter
+
+from functions.common import *
+
+# Classes
+class LocalDisk():
+    def __init__(self, disk):
+        self.disk = disk
+        self.name = disk.mountpoint.upper()
+        self.path = self.name
+    def is_dir(self):
+        # Should always be true
+        return True
+
+# Regex
+REGEX_EXCL_ITEMS = re.compile(
+    r'^(\.(AppleDB|AppleDesktop|AppleDouble'
+    r'|com\.apple\.timemachine\.supported|dbfseventsd'
+    r'|DocumentRevisions-V100.*|DS_Store|fseventsd|PKInstallSandboxManager'
+    r'|Spotlight.*|SymAV.*|symSchedScanLockxz|TemporaryItems|Trash.*'
+    r'|vol|VolumeIcon\.icns)|desktop\.(ini|.*DB|.*DF)'
+    r'|(hiberfil|pagefile)\.sys|lost\+found|Network\.*Trash\.*Folder'
+    r'|Recycle[dr]|System\.*Volume\.*Information|Temporary\.*Items'
+    r'|Thumbs\.db)$',
+    re.IGNORECASE)
+REGEX_EXCL_ROOT_ITEMS = re.compile(
+    r'^\\?(boot(mgr|nxt)$|Config.msi'
+    r'|(eula|globdata|install|vc_?red)'
+    r'|.*.sys$|System Volume Information|RECYCLER?|\$Recycle\.bin'
+    r'|\$?Win(dows(.old.*|\.~BT|)$|RE_)|\$GetCurrent|Windows10Upgrade'
+    r'|PerfLogs|Program Files|SYSTEM.SAV'
+    r'|.*\.(esd|swm|wim|dd|map|dmg|image)$)',
+    re.IGNORECASE)
+REGEX_INCL_ROOT_ITEMS = re.compile(
+    r'^\\?(AdwCleaner|(My\s*|)(Doc(uments?( and Settings|)|s?)|Downloads'
+    r'|Media|Music|Pic(ture|)s?|Vid(eo|)s?)'
+    r'|{prefix}(-?Info|-?Transfer|)'
+    r'|(ProgramData|Recovery|Temp.*|Users)$'
+    r'|.*\.(log|txt|rtf|qb\w*|avi|m4a|m4v|mp4|mkv|jpg|png|tiff?)$)'
+    r''.format(prefix=KIT_NAME_SHORT),
+    re.IGNORECASE)
+REGEX_WIM_FILE = re.compile(
+    r'\.wim$',
+    re.IGNORECASE)
+REGEX_WINDOWS_OLD = re.compile(
+    r'^\\Win(dows|)\.old',
+    re.IGNORECASE)
+
+# STATIC VARIABLES
+FAST_COPY_EXCLUDES = [
+    r'\*.esd',
+    r'\*.swm',
+    r'\*.wim',
+    r'\*.dd',
+    r'\*.dd.tgz',
+    r'\*.dd.txz',
+    r'\*.map',
+    r'\*.dmg',
+    r'\*.image',
+    r'$RECYCLE.BIN',
+    r'$Recycle.Bin',
+    r'.AppleDB',
+    r'.AppleDesktop',
+    r'.AppleDouble',
+    r'.com.apple.timemachine.supported',
+    r'.dbfseventsd',
+    r'.DocumentRevisions-V100*',
+    r'.DS_Store',
+    r'.fseventsd',
+    r'.PKInstallSandboxManager',
+    r'.Spotlight*',
+    r'.SymAV*',
+    r'.symSchedScanLockxz',
+    r'.TemporaryItems',
+    r'.Trash*',
+    r'.vol',
+    r'.VolumeIcon.icns',
+    r'desktop.ini',
+    r'Desktop?DB',
+    r'Desktop?DF',
+    r'hiberfil.sys',
+    r'lost+found',
+    r'Network?Trash?Folder',
+    r'pagefile.sys',
+    r'Recycled',
+    r'RECYCLER',
+    r'System?Volume?Information',
+    r'Temporary?Items',
+    r'Thumbs.db',
+    ]
+FAST_COPY_ARGS = [
+    '/cmd=noexist_only',
+    '/utf8',
+    '/skip_empty_dir',
+    '/linkdest',
+    '/no_ui',
+    '/auto_close',
+    '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
+    ]
+# Code borrowed from: https://stackoverflow.com/a/29075319
+SEM_NORMAL = ctypes.c_uint()
+SEM_FAILCRITICALERRORS = 1
+SEM_NOOPENFILEERRORBOX = 0x8000
+SEM_FAIL = SEM_NOOPENFILEERRORBOX | SEM_FAILCRITICALERRORS
+
+def cleanup_transfer(dest_path):
+    """Fix attributes and move extraneous items outside the Transfer folder."""
+    try:
+        # Remove dest_path if empty
+        os.rmdir(dest_path)
+    except OSError:
+        pass
+    if not os.path.exists(dest_path):
+        # Bail if dest_path was empty and removed
+        raise Exception
+    
+    # Fix attributes
+    cmd = ['attrib', '-a', '-h', '-r', '-s', dest_path]
+    run_program(cmd, check=False)
+    
+    for root, dirs, files in os.walk(dest_path, topdown=False):
+        for name in dirs:
+            # Remove empty directories and junction points
+            try:
+                os.rmdir(os.path.join(root, name))
+            except OSError:
+                pass
+        for name in files:
+            # "Remove" files based on exclusion regex
+            if REGEX_EXCL_ITEMS.search(name):
+                # Make dest folder
+                dest_name = root.replace(dest_path, dest_path+'.Removed')
+                os.makedirs(dest_name, exist_ok=True)
+                # Set dest filename
+                dest_name = os.path.join(dest_name, name)
+                dest_name = non_clobber_rename(dest_name)
+                source_name = os.path.join(root, name)
+                try:
+                    shutil.move(source_name, dest_name)
+                except Exception:
+                    pass
+
+def is_valid_wim_file(item):
+    """Checks if the provided os.DirEntry is a valid WIM file, returns bool."""
+    valid = bool(item.is_file() and REGEX_WIM_FILE.search(item.name))
+    if valid:
+        extract_item('wimlib', silent=True)
+        cmd = [global_vars['Tools']['wimlib-imagex'], 'info', item.path]
+        try:
+            run_program(cmd)
+        except subprocess.CalledProcessError:
+            valid = False
+            print_log('WARNING: Image "{}" damaged.'.format(item.name))
+    return valid
+
+def mount_backup_shares():
+    """Mount the backup shares unless labeled as already mounted."""
+    for server in BACKUP_SERVERS:
+        # Blindly skip if we mounted earlier
+        if server['Mounted']:
+            continue
+        
+        mount_network_share(server)
+
+def mount_network_share(server):
+    """Mount a network share defined by server."""
+    # Test connection
+    try:
+        ping(server['IP'])
+    except subprocess.CalledProcessError:
+        print_error(
+            r'Failed to mount \\{Name}\{Share}, {IP} unreachable.'.format(
+                **server))
+        sleep(1)
+        return False
+
+    # Mount
+    cmd = r'net use \\{IP}\{Share} /user:{User} {Pass}'.format(**server)
+    cmd = cmd.split(' ')
+    try:
+        run_program(cmd)
+    except Exception:
+        print_warning(r'Failed to mount \\{Name}\{Share} ({IP})'.format(
+            **server))
+        sleep(1)
+    else:
+        print_info('Mounted {Name}'.format(**server))
+        server['Mounted'] = True
+
+def run_fast_copy(items, dest):
+    """Copy items to dest using FastCopy."""
+    if not items:
+        raise Exception
+    
+    cmd = [global_vars['Tools']['FastCopy'], *FAST_COPY_ARGS]
+    if 'LogFile' in global_vars:
+        cmd.append('/logfile={LogFile}'.format(**global_vars))
+    cmd.extend(items)
+    cmd.append('/to={}\\'.format(dest))
+    
+    run_program(cmd)
+
+def run_wimextract(source, items, dest):
+    """Extract items from source WIM to dest folder."""
+    if not items:
+        raise Exception
+    extract_item('wimlib', silent=True)
+
+    # Write files.txt
+    with open(r'{TmpDir}\wim_files.txt'.format(**global_vars), 'w') as f:
+        # Defaults
+        for item in items:
+            f.write('{item}\n'.format(item=item))
+    sleep(1) # For safety?
+
+    # Extract files
+    cmd = [
+        global_vars['Tools']['wimlib-imagex'],
+        'extract',
+        source, '1',
+        r'@{TmpDir}\wim_files.txt'.format(**global_vars),
+        '--dest-dir={}\\'.format(dest),
+        '--no-acls',
+        '--nullglob']
+    run_program(cmd)
+
+def scan_source(source_obj, dest_path):
+    """Scan source for files/folders to transfer."""
+    selected_items = []
+    
+    if source_obj.is_dir():
+        # File-Based
+        print_standard('Scanning source (folder): {}'.format(source_obj.path))
+        selected_items = scan_source_path(source_obj.path, dest_path)
+    else:
+        # Image-Based
+        if REGEX_WIM_FILE.search(source_obj.name):
+            print_standard('Scanning source (image): {}'.format(
+                source_obj.path))
+            selected_items = scan_source_wim(source_obj.path, dest_path)
+        else:
+            print_error('ERROR: Unsupported image: {}'.format(
+                source_obj.path))
+            raise GenericError
+    
+    return selected_items
+
+def scan_source_path(source_path, dest_path, rel_path=None, interactive=True):
+    """Scan source folder for files/folders to transfer, returns list.
+    
+    This will scan the root and (recursively) any Windows.old folders."""
+    rel_path = '\\' + rel_path if rel_path else ''
+    if rel_path:
+        dest_path = dest_path + rel_path
+    selected_items = []
+    win_olds = []
+
+    # Root items
+    root_items = []
+    for item in os.scandir(source_path):
+        if REGEX_INCL_ROOT_ITEMS.search(item.name):
+            root_items.append(item.path)
+        elif not REGEX_EXCL_ROOT_ITEMS.search(item.name):
+            if (not interactive
+                or ask('Copy: "{}{}" ?'.format(rel_path, item.name))):
+                root_items.append(item.path)
+        if REGEX_WINDOWS_OLD.search(item.name):
+            win_olds.append(item)
+    if root_items:
+        selected_items.append({
+            'Message':      '{}Root Items...'.format(rel_path),
+            'Items':        root_items.copy(),
+            'Destination':  dest_path})
+
+    # Fonts
+    if os.path.exists(r'{}\Windows\Fonts'.format(source_path)):
+        selected_items.append({
+            'Message':      '{}Fonts...'.format(rel_path),
+            'Items':        [r'{}\Windows\Fonts'.format(rel_path)],
+            'Destination':  r'{}\Windows'.format(dest_path)})
+
+    # Registry
+    registry_items = []
+    for folder in ['config', 'OEM']:
+        folder = r'Windows\System32\{}'.format(folder)
+        folder = os.path.join(source_path, folder)
+        if os.path.exists(folder):
+            registry_items.append(folder)
+    if registry_items:
+        selected_items.append({
+            'Message': '{}Registry...'.format(rel_path),
+            'Items':        registry_items.copy(),
+            'Destination':  r'{}\Windows\System32'.format(dest_path)})
+
+    # Windows.old(s)
+    for old in win_olds:
+        selected_items.append(
+            scan_source_path(
+                old.path, dest_path, rel_path=old.name, interactive=False))
+    
+    # Done
+    return selected_items
+
+def scan_source_wim(source_wim, dest_path, rel_path=None, interactive=True):
+    """Scan source WIM file for files/folders to transfer, returns list.
+    
+    This will scan the root and (recursively) any Windows.old folders."""
+    rel_path = '\\' + rel_path if rel_path else ''
+    selected_items = []
+    win_olds = []
+
+    # Scan source
+    extract_item('wimlib', silent=True)
+    cmd = [
+        global_vars['Tools']['wimlib-imagex'], 'dir',
+        source_wim, '1']
+    try:
+        file_list = run_program(cmd)
+    except subprocess.CalledProcessError:
+        print_error('ERROR: Failed to get file list.')
+        raise
+
+    # Root Items
+    file_list = [i.strip()
+        for i in file_list.stdout.decode('utf-8', 'ignore').splitlines()
+        if i.count('\\') == 1 and i.strip() != '\\']
+    root_items = []
+    if rel_path:
+        file_list = [i.replace(rel_path, '') for i in file_list]
+    for item in file_list:
+        if REGEX_INCL_ROOT_ITEMS.search(item):
+            root_items.append(item)
+        elif not REGEX_EXCL_ROOT_ITEMS.search(item):
+            if (not interactive
+                or ask('Extract: "{}{}" ?'.format(rel_path, item))):
+                root_items.append('{}{}'.format(rel_path, item))
+        if REGEX_WINDOWS_OLD.search(item):
+            win_olds.append(item)
+    if root_items:
+        selected_items.append({
+            'Message':      '{}Root Items...'.format(rel_path),
+            'Items':        root_items.copy(),
+            'Destination':  dest_path})
+
+    # Fonts
+    if wim_contains(source_wim, r'{}Windows\Fonts'.format(rel_path)):
+        selected_items.append({
+            'Message':      '{}Fonts...'.format(rel_path),
+            'Items':        [r'{}\Windows\Fonts'.format(rel_path)],
+            'Destination':  dest_path})
+
+    # Registry
+    registry_items = []
+    for folder in ['config', 'OEM']:
+        folder = r'{}Windows\System32\{}'.format(rel_path, folder)
+        if wim_contains(source_wim, folder):
+            registry_items.append(folder)
+    if registry_items:
+        selected_items.append({
+            'Message':      '{}Registry...'.format(rel_path),
+            'Items':        registry_items.copy(),
+            'Destination':  dest_path})
+
+    # Windows.old(s)
+    for old in win_olds:
+        scan_source_wim(source_wim, dest_path, rel_path=old, interactive=False)
+    
+    # Done
+    return selected_items
+
+def select_destination(folder_path, prompt='Select destination'):
+    """Select destination drive, returns path as string."""
+    disk = select_volume(prompt)
+    if 'fixed' not in disk['Disk'].opts:
+        folder_path = folder_path.replace('\\', '-')
+    path = '{disk}{folder_path}_{Date}'.format(
+        disk = disk['Disk'].mountpoint,
+        folder_path = folder_path,
+        **global_vars)
+
+    # Avoid merging with existing folder
+    path = non_clobber_rename(path)
+    os.makedirs(path, exist_ok=True)
+
+    return path
+
+def select_source(ticket_number):
+    """Select backup from those found on the BACKUP_SERVERS for the ticket."""
+    selected_source = None
+    sources = []
+    mount_backup_shares()
+
+    # Check for ticket folders on servers
+    for server in BACKUP_SERVERS:
+        if server['Mounted']:
+            print_standard('Scanning {}...'.format(server['Name']))
+            for d in os.scandir(r'\\{IP}\{Share}'.format(**server)):
+                if (d.is_dir()
+                    and d.name.lower().startswith(ticket_number.lower())):
+                    # Add folder to sources
+                    sources.append({
+                        'Name': '{:9}| File-Based:     [DIR]  {}'.format(
+                            server['Name'], d.name),
+                        'Server': server,
+                        'Source': d})
+
+    # Check for images and subfolders
+    for ticket_path in sources.copy():
+        for item in os.scandir(ticket_path['Source'].path):
+            if item.is_dir():
+                # Add folder to sources
+                sources.append({
+                    'Name': r'{:9}| File-Based:     [DIR]  {}\{}'.format(
+                        ticket_path['Server']['Name'],  # Server
+                        ticket_path['Source'].name,     # Ticket folder
+                        item.name,                      # Sub-folder
+                        ),
+                    'Server': ticket_path['Server'],
+                    'Source': item})
+
+                # Check for images in folder
+                for subitem in os.scandir(item.path):
+                    if REGEX_WIM_FILE.search(item.name):
+                        # Add image to sources
+                        try:
+                            size = human_readable_size(item.stat().st_size)
+                        except Exception:
+                            size = '  ?  ?' # unknown
+                        sources.append({
+                            'Disabled': bool(not is_valid_wim_file(subitem)),
+                            'Name': r'{:9}| Image-Based:  {:>7}  {}\{}\{}'.format(
+                                ticket_path['Server']['Name'],  # Server
+                                size,                           # Size (duh)
+                                ticket_path['Source'].name,     # Ticket folder
+                                item.name,                      # Sub-folder
+                                subitem.name,                   # Image file
+                                ),
+                            'Server': ticket_path['Server'],
+                            'Source': subitem})
+            elif REGEX_WIM_FILE.search(item.name):
+                # Add image to sources
+                try:
+                    size = human_readable_size(item.stat().st_size)
+                except Exception:
+                    size = '  ?  ?' # unknown
+                sources.append({
+                    'Disabled': bool(not is_valid_wim_file(item)),
+                    'Name': r'{:9}| Image-Based:  {:>7}  {}\{}'.format(
+                        ticket_path['Server']['Name'],  # Server
+                        size,                           # Size (duh)
+                        ticket_path['Source'].name,     # Ticket folder
+                        item.name,                      # Image file
+                        ),
+                    'Server': ticket_path['Server'],
+                    'Source': item})
+    # Check for local sources
+    print_standard('Scanning for local sources...')
+    set_thread_error_mode(silent=True) # Prevents "No disk" popups
+    sys_drive = global_vars['Env']['SYSTEMDRIVE']
+    for d in psutil.disk_partitions():
+        if re.search(r'^{}'.format(sys_drive), d.mountpoint, re.IGNORECASE):
+            # Skip current OS drive
+            continue
+        if 'fixed' in d.opts:
+            # Skip DVD, etc
+            sources.append({
+                'Name': '{:9}| File-Based:     [DISK] {}'.format(
+                    '  Local', d.mountpoint),
+                'Source': LocalDisk(d)})
+    set_thread_error_mode(silent=False) # Return to normal
+
+    # Build Menu
+    sources.sort(key=itemgetter('Name'))
+    actions = [{'Name': 'Quit', 'Letter': 'Q'}]
+
+    # Select backup from sources
+    if len(sources) > 0:
+        selection = menu_select(
+            'Which backup are we using?',
+            main_entries=sources,
+            action_entries=actions,
+            disabled_label='DAMAGED')
+        if selection == 'Q':
+            umount_backup_shares()
+            exit_script()
+        else:
+            selected_source = sources[int(selection)-1]['Source']
+    else:
+        print_error('ERROR: No backups found for ticket: {}.'.format(
+            ticket_number))
+        umount_backup_shares()
+        pause("Press Enter to exit...")
+        exit_script()
+    
+    # Done
+    return selected_source
+
+def select_volume(title='Select disk', auto_select=True):
+    """Select disk from attached disks. returns dict."""
+    actions =   [{'Name': 'Quit', 'Letter': 'Q'}]
+    disks =     []
+    
+    # Build list of disks
+    set_thread_error_mode(silent=True) # Prevents "No disk" popups
+    for d in psutil.disk_partitions():
+        info = {
+            'Disk': d,
+            'Name': d.mountpoint}
+        try:
+            usage = psutil.disk_usage(d.device)
+            free = '{free} / {total} available'.format(
+                free = human_readable_size(usage.free, 2),
+                total = human_readable_size(usage.total, 2))
+        except Exception:
+            # Meh, leaving unsupported destinations out
+            pass
+            # free = 'Unknown'
+            # info['Disabled'] = True
+        else:
+            info['Display Name'] = '{}  ({})'.format(info['Name'], free)
+            disks.append(info)
+    set_thread_error_mode(silent=False) # Return to normal
+    
+    # Skip menu?
+    if len(disks) == 1 and auto_select:
+        return disks[0]
+    
+    # Show menu
+    selection = menu_select(title, main_entries=disks, action_entries=actions)
+    if selection == 'Q':
+        exit_script()
+    else:
+        return disks[int(selection)-1]
+
+def set_thread_error_mode(silent=True):
+    """Disable or Enable Windows error message dialogs.
+    
+    Disable when scanning for disks to avoid popups for empty cardreaders, etc
+    """
+    # Code borrowed from: https://stackoverflow.com/a/29075319
+    kernel32 = ctypes.WinDLL('kernel32')
+    
+    if silent:
+        kernel32.SetThreadErrorMode(SEM_FAIL, ctypes.byref(SEM_NORMAL))
+    else:
+        kernel32.SetThreadErrorMode(SEM_NORMAL, ctypes.byref(SEM_NORMAL))
+
+def transfer_source(source_obj, dest_path, selected_items):
+    """Transfer, or extract, files/folders from source to destination."""
+    if source_obj.is_dir():
+        # Run FastCopy for each selection "group"
+        for group in selected_items:
+            try_and_print(message=group['Message'],
+                function=run_fast_copy, cs='Done',
+                items=group['Items'],
+                dest=group['Destination'])
+    else:
+        if REGEX_WIM_FILE.search(source_obj.name):
+            # Extract files from WIM
+            for group in selected_items:
+                try_and_print(message=group['Message'],
+                    function=run_wimextract, cs='Done',
+                    source=source_obj.path,
+                    items=group['Items'],
+                    dest=group['Destination'])
+        else:
+            print_error('ERROR: Unsupported image: {}'.format(source_obj.path))
+            raise GenericError
+
+def umount_backup_shares():
+    """Unnount the backup shares regardless of current status."""
+    for server in BACKUP_SERVERS:
+        umount_network_share(server)
+
+def umount_network_share(server):
+    """Unnount a network share defined by server."""
+    cmd = r'net use \\{IP}\{Share} /delete'.format(**server)
+    cmd = cmd.split(' ')
+    try:
+        run_program(cmd)
+    except Exception:
+        print_error(r'Failed to umount \\{Name}\{Share}.'.format(**server))
+        sleep(1)
+    else:
+        print_info('Umounted {Name}'.format(**server))
+        server['Mounted'] = False
+
+def wim_contains(source_path, file_path):
+    """Check if the WIM contains a file or folder."""
+    _cmd = [
+        global_vars['Tools']['wimlib-imagex'], 'dir',
+        source_path, '1',
+        '--path={}'.format(file_path),
+        '--one-file-only']
+    try:
+        run_program(_cmd)
+    except subprocess.CalledProcessError:
+        return False
+    else:
+        return True
+
+if __name__ == '__main__':
+    print("This file is not meant to be called directly.")
--- a/Scripts/functions/disk.py
+++ b/Scripts/functions/disk.py
@ -0,0 +1,366 @@
+# Wizard Kit PE: Functions - Disk
+
+from functions.common import *
+from functions import partition_uids
+
+# Regex
+REGEX_BAD_PARTITION = re.compile(r'(RAW|Unknown)', re.IGNORECASE)
+REGEX_DISK_GPT = re.compile(
+    r'Disk ID: {[A-Z0-9]+-[A-Z0-9]+-[A-Z0-9]+-[A-Z0-9]+-[A-Z0-9]+}',
+    re.IGNORECASE)
+REGEX_DISK_MBR = re.compile(r'Disk ID: [A-Z0-9]+', re.IGNORECASE)
+REGEX_DISK_RAW = re.compile(r'Disk ID: 00000000', re.IGNORECASE)
+
+def assign_volume_letters():
+    with open(DISKPART_SCRIPT, 'w') as script:
+        for vol in get_volumes():
+            script.write('select volume {}\n'.format(vol['Number']))
+            script.write('assign\n')
+    
+    # Remove current letters
+    remove_volume_letters()
+    
+    # Run script
+    try:
+        run_program(['diskpart', '/s', DISKPART_SCRIPT])
+    except subprocess.CalledProcessError:
+        pass
+
+def get_boot_mode():
+    boot_mode = 'Legacy'
+    try:
+        reg_key = winreg.OpenKey(
+            winreg.HKEY_LOCAL_MACHINE, r'System\CurrentControlSet\Control')
+        reg_value = winreg.QueryValueEx(reg_key, 'PEFirmwareType')[0]
+        if reg_value == 2:
+            boot_mode = 'UEFI'
+    except:
+        boot_mode = 'Unknown'
+    
+    return boot_mode
+
+def get_disk_details(disk):
+    details = {}
+    with open(DISKPART_SCRIPT, 'w') as script:
+        script.write('select disk {}\n'.format(disk['Number']))
+        script.write('detail disk\n')
+    
+    try:
+        # Run script
+        output = run_program(['diskpart', '/s', DISKPART_SCRIPT])
+        output = output.stdout.decode().strip()
+    except subprocess.CalledProcessError:
+        pass
+    else:
+        # Remove empty lines
+        tmp = [s.strip() for s in output.splitlines() if s.strip() != '']
+        # Set disk name
+        details['Name'] = tmp[4]
+        # Split each line on ':' skipping those without ':'
+        tmp = [s.split(':') for s in tmp if ':' in s]
+        # Add key/value pairs to the details variable and return dict
+        details.update({key.strip(): value.strip() for (key, value) in tmp})
+    
+    return details
+    
+def get_disks():
+    disks = []
+    with open(DISKPART_SCRIPT, 'w') as script:
+        script.write('list disk\n')
+    
+    try:
+        # Run script
+        output = run_program(['diskpart', '/s', DISKPART_SCRIPT])
+        output = output.stdout.decode().strip()
+    except subprocess.CalledProcessError:
+        pass
+    else:
+        # Append disk numbers
+        for tmp in re.findall(r'Disk (\d+)\s+\w+\s+(\d+\s+\w+)', output):
+            num = tmp[0]
+            size = human_readable_size(tmp[1])
+            disks.append({'Number': num, 'Size': size})
+    
+    return disks
+
+def get_partition_details(disk, partition):
+    details = {}
+    with open(DISKPART_SCRIPT, 'w') as script:
+        script.write('select disk {}\n'.format(disk['Number']))
+        script.write('select partition {}\n'.format(partition['Number']))
+        script.write('detail partition\n')
+    
+    # Diskpart details
+    try:
+        # Run script
+        output = run_program(['diskpart', '/s', DISKPART_SCRIPT])
+        output = output.stdout.decode().strip()
+    except subprocess.CalledProcessError:
+        pass
+    else:
+        # Get volume letter or RAW status
+        tmp = re.search(r'Volume\s+\d+\s+(\w|RAW)\s+', output)
+        if tmp:
+            if tmp.group(1).upper() == 'RAW':
+                details['FileSystem'] = RAW
+            else:
+                details['Letter'] = tmp.group(1)
+        # Remove empty lines from output
+        tmp = [s.strip() for s in output.splitlines() if s.strip() != '']
+        # Split each line on ':' skipping those without ':'
+        tmp = [s.split(':') for s in tmp if ':' in s]
+        # Add key/value pairs to the details variable and return dict
+        details.update({key.strip(): value.strip() for (key, value) in tmp})
+    
+    # Get MBR type / GPT GUID for extra details on "Unknown" partitions
+    guid = partition_uids.lookup_guid(details['Type'])
+    if guid:
+        details.update({
+            'Description':  guid.get('Description', ''),
+            'OS':           guid.get('OS', '')})
+    
+    if 'Letter' in details:
+        # Disk usage
+        tmp = shutil.disk_usage('{}:\\'.format(details['Letter']))
+        details['Used Space'] = human_readable_size(tmp.used)
+        
+        # fsutil details
+        cmd = [
+            'fsutil',
+            'fsinfo',
+            'volumeinfo',
+            '{}:'.format(details['Letter'])
+            ]
+        try:
+            output = run_program(cmd)
+            output = output.stdout.decode().strip()
+        except subprocess.CalledProcessError:
+            pass
+        else:
+            # Remove empty lines from output
+            tmp = [s.strip() for s in output.splitlines() if s.strip() != '']
+            # Add "Feature" lines
+            details['File System Features'] = [s.strip() for s in tmp
+                if ':' not in s]
+            # Split each line on ':' skipping those without ':'
+            tmp = [s.split(':') for s in tmp if ':' in s]
+            # Add key/value pairs to the details variable and return dict
+            details.update({key.strip(): value.strip() for (key, value) in tmp})
+        
+    # Set Volume Name
+    details['Name'] = details.get('Volume Name', '')
+    
+    # Set FileSystem Type
+    if details.get('FileSystem', '') != 'RAW':
+        details['FileSystem'] = details.get('File System Name', 'Unknown')
+    
+    return details
+
+def get_partitions(disk):
+    partitions = []
+    with open(DISKPART_SCRIPT, 'w') as script:
+        script.write('select disk {}\n'.format(disk['Number']))
+        script.write('list partition\n')
+    
+    try:
+        # Run script
+        output = run_program(['diskpart', '/s', DISKPART_SCRIPT])
+        output = output.stdout.decode().strip()
+    except subprocess.CalledProcessError:
+        pass
+    else:
+        # Append partition numbers
+        regex = r'Partition\s+(\d+)\s+\w+\s+(\d+\s+\w+)\s+'
+        for tmp in re.findall(regex, output, re.IGNORECASE):
+            num = tmp[0]
+            size = human_readable_size(tmp[1])
+            partitions.append({'Number': num, 'Size': size})
+    
+    return partitions
+
+def get_table_type(disk):
+    part_type = 'Unknown'
+    with open(DISKPART_SCRIPT, 'w') as script:
+        script.write('select disk {}\n'.format(disk['Number']))
+        script.write('uniqueid disk\n')
+    
+    try:
+        output = run_program(['diskpart', '/s', DISKPART_SCRIPT])
+        output = output.stdout.decode().strip()
+    except subprocess.CalledProcessError:
+        pass
+    else:
+        if REGEX_DISK_GPT.search(output):
+            part_type = 'GPT'
+        elif REGEX_DISK_MBR.search(output):
+            part_type = 'MBR'
+        elif REGEX_DISK_RAW.search(output):
+            part_type = 'RAW'
+        else:
+            part_type = 'Unknown'
+    
+    return part_type
+
+def get_volumes():
+    vols = []
+    with open(DISKPART_SCRIPT, 'w') as script:
+        script.write('list volume\n')
+    
+    try:
+        # Run script
+        output = run_program(['diskpart', '/s', DISKPART_SCRIPT])
+        output = output.stdout.decode().strip()
+    except subprocess.CalledProcessError:
+        pass
+    else:
+        # Append volume numbers
+        for tmp in re.findall(r'Volume (\d+)\s+([A-Za-z]?)\s+', output):
+            vols.append({'Number': tmp[0], 'Letter': tmp[1]})
+    
+    return vols
+
+def is_bad_partition(par):
+    return 'Letter' not in par or REGEX_BAD_PARTITION.search(par['FileSystem'])
+
+def prep_disk_for_formatting(disk=None):
+    disk['Format Warnings'] = '\n'
+    width = len(str(len(disk['Partitions'])))
+    
+    # Bail early
+    if disk is None:
+        raise Exception('Disk not provided.')
+
+    # Set boot method and partition table type
+    disk['Use GPT'] = True
+    if (get_boot_mode() == 'UEFI'):
+        if (not ask("Setup Windows to use UEFI booting?")):
+            disk['Use GPT'] = False
+    else:
+        if (ask("Setup Windows to use BIOS/Legacy booting?")):
+            disk['Use GPT'] = False
+    
+    # Set Display and Warning Strings
+    if len(disk['Partitions']) == 0:
+        disk['Format Warnings'] += 'No partitions found\n'
+    for partition in disk['Partitions']:
+        display = '    Partition {num:>{width}}:\t{size} {fs}'.format(
+            num = partition['Number'],
+            width = width,
+            size = partition['Size'],
+            fs = partition['FileSystem'])
+        
+        if is_bad_partition(partition):
+            # Set display string using partition description & OS type
+            display += '\t\t{q}{name}{q}\t{desc} ({os})'.format(
+                display = display,
+                q = '"' if partition['Name'] != '' else '',
+                name = partition['Name'],
+                desc = partition['Description'],
+                os = partition['OS'])
+        else:
+            # List space used instead of partition description & OS type
+            display += ' (Used: {used})\t{q}{name}{q}'.format(
+                used = partition['Used Space'],
+                q = '"' if partition['Name'] != '' else '',
+                name = partition['Name'])
+        # For all partitions
+        partition['Display String'] = display
+
+def reassign_volume_letter(letter, new_letter='I'):
+    if not letter:
+        # Ignore
+        return None
+    try:
+        # Run script
+        with open(DISKPART_SCRIPT, 'w') as script:
+            script.write('select volume {}\n'.format(letter))
+            script.write('remove noerr\n')
+            script.write('assign letter={}\n'.format(new_letter))
+        run_program(['diskpart', '/s', DISKPART_SCRIPT])
+    except subprocess.CalledProcessError:
+        pass
+    else:
+        return new_letter
+
+def remove_volume_letters(keep=None):
+    if not keep:
+        keep = ''
+    with open(DISKPART_SCRIPT, 'w') as script:
+        for vol in get_volumes():
+            if vol['Letter'].upper() != keep.upper():
+                script.write('select volume {}\n'.format(vol['Number']))
+                script.write('remove noerr\n')
+    
+    # Run script
+    try:
+        run_program(['diskpart', '/s', DISKPART_SCRIPT])
+    except subprocess.CalledProcessError:
+        pass
+
+def scan_disks():
+    """Get details about the attached disks"""
+    disks = get_disks()
+
+    # Get disk details
+    for disk in disks:
+        # Get partition style
+        disk['Table'] = get_table_type(disk)
+
+        # Get disk name/model and physical details
+        disk.update(get_disk_details(disk))
+
+        # Get partition info for disk
+        disk['Partitions'] = get_partitions(disk)
+        
+        for partition in disk['Partitions']:
+            # Get partition details
+            partition.update(get_partition_details(disk, partition))
+
+    # Done
+    return disks
+
+def select_disk(title='Which disk?', disks=[]):
+    """Select a disk from the attached disks"""
+    # Build menu
+    disk_options = []
+    for disk in disks:
+        display_name = '{Size}\t[{Table}] ({Type}) {Name}'.format(**disk)
+        pwidth=len(str(len(disk['Partitions'])))
+        for partition in disk['Partitions']:
+            # Main text
+            p_name = 'Partition {num:>{width}}: {size} ({fs})'.format(
+                num = partition['Number'],
+                width = pwidth,
+                size = partition['Size'],
+                fs = partition['FileSystem'])
+            if partition['Name']:
+                p_name += '\t"{}"'.format(partition['Name'])
+            
+            # Show unsupported partition(s)
+            if is_bad_partition(partition):
+                p_display_name = '{YELLOW}{display}{CLEAR}'.format(
+                    display=p_name, **COLORS)
+            
+            display_name += '\n\t\t\t{}'.format(display_name)
+        if not disk['Partitions']:
+            display_name += '\n\t\t\t{}No partitions found.{}'.format(
+                COLORS['YELLOW'], COLORS['CLEAR'])
+
+        disk_options.append({'Name': display_name, 'Disk': disk})
+    actions = [
+        {'Name': 'Main Menu', 'Letter': 'M'},
+        ]
+
+    # Menu loop
+    selection = menu_select(
+        title = title,
+        main_entries = disk_options,
+        action_entries = actions)
+
+    if (selection.isnumeric()):
+        return disk_options[int(selection)-1]['Disk']
+    elif (selection == 'M'):
+        raise GenericAbort
+
+if __name__ == '__main__':
+    print("This file is not meant to be called directly.")
--- a/Scripts/functions/partition_uids.py
+++ b/Scripts/functions/partition_uids.py
@ -1,4 +1,4 @@
-# WK WinPE - PARTITION UIDs
+# Wizard Kit PE: Functions - PARTITION UIDs
 # sources:  https://en.wikipedia.org/wiki/GUID_Partition_Table
 #           https://en.wikipedia.org/wiki/Partition_type

--- a/Scripts/functions/windows_setup.py
+++ b/Scripts/functions/windows_setup.py
@ -0,0 +1,224 @@
+# Wizard Kit PE: Functions - Windows Setup
+
+from functions.data import *
+
+# STATIC VARIABLES
+WINDOWS_VERSIONS = [
+    {'Name': 'Windows 7 Home Basic',
+        'Image File': 'Win7',
+        'Image Name': 'Windows 7 HOMEBASIC'},
+    {'Name': 'Windows 7 Home Premium',
+        'Image File': 'Win7',
+        'Image Name': 'Windows 7 HOMEPREMIUM'},
+    {'Name': 'Windows 7 Professional', 
+        'Image File': 'Win7', 
+        'Image Name': 'Windows 7 PROFESSIONAL'},
+    {'Name': 'Windows 7 Ultimate', 
+        'Image File': 'Win7', 
+        'Image Name': 'Windows 7 ULTIMATE'},
+    
+    {'Name': 'Windows 8.1', 
+        'Image File': 'Win8', 
+        'Image Name': 'Windows 8.1',
+        'CRLF': True},
+    {'Name': 'Windows 8.1 Pro', 
+        'Image File': 'Win8', 
+        'Image Name': 'Windows 8.1 Pro'},
+    
+    {'Name': 'Windows 10 Home', 
+        'Image File': 'Win10', 
+        'Image Name': 'Windows 10 Home',
+        'CRLF': True},
+    {'Name': 'Windows 10 Pro', 
+        'Image File': 'Win10', 
+        'Image Name': 'Windows 10 Pro'},
+    ]
+
+def find_windows_image(windows_version):
+    """Search for a Windows source image file, returns dict.
+
+    Searches on local disks and then the WINDOWS_SERVER share."""
+    image = {}
+    imagefile = windows_version['Image File']
+    imagename = windows_version['Image Name']
+
+    # Search local source
+    for d in psutil.disk_partitions():
+        for ext in ['esd', 'wim', 'swm']:
+            path = '{}images\{}.{}'.format(d.mountpoint, imagefile, ext)
+            if os.path.isfile(path) and wim_contains_image(path, imagename):
+                image['Path'] = path
+                image['Source'] = letter
+                if ext == 'swm':
+                    image['Glob'] = '--ref="{}*.swm"'.format(image['Path'][:-4])
+                break
+
+    # Check for network source
+    if not image:
+        mount_windows_share()
+        if WINDOWS_SERVER['Mounted']:
+            for ext in ['esd', 'wim', 'swm']:
+                path = r'\\{}\{}\images\{}.ext'.format(
+                    WINDOWS_SERVER['IP'],
+                    WINDOWS_SERVER['Share'],
+                    imagefile,
+                    ext)
+                if os.path.isfile(path) and wim_contains_image(path, imagename):
+                    image['Path'] = path
+                    image['Source'] = None
+                    if ext == 'swm':
+                        image['Glob'] = '--ref="{}*.swm"'.format(
+                            image['Path'][:-4])
+                    break
+    
+    # Display image to be used (if any) and return
+    if image:
+        print_info('Using image: {}'.format(image['Path']))
+        return image
+    else:
+        print_error('Failed to find Windows source image for {}'.format(
+            windows_version['Name']))
+        raise GenericAbort
+
+def format_disk(disk, use_gpt):
+    """Format disk for use as a Windows OS disk."""
+    if use_gpt:
+        format_gpt(disk)
+    else:
+        format_mbr(disk)
+
+def format_gpt(disk):
+    """Format disk for use as a Windows OS disk using the GPT layout."""
+    with open(DISKPART_SCRIPT, 'w') as script:
+        # Partition table
+        script.write('select disk {}\n'.format(disk['Number']))
+        script.write('clean\n')
+        script.write('convert gpt\n')
+
+        # System partition
+        # NOTE: ESP needs to be >= 260 for Advanced Format 4K disks
+        script.write('create partition efi size=500\n')
+        script.write('format quick fs=fat32 label="System"\n')
+        script.write('assign letter="S"\n')
+
+        # Microsoft Reserved (MSR) partition
+        script.write('create partition msr size=128\n')
+
+        # Windows partition
+        script.write('create partition primary\n')
+        script.write('format quick fs=ntfs label="Windows"\n')
+        script.write('assign letter="W"\n')
+
+        # Recovery Tools partition
+        script.write('shrink minimum=500\n')
+        script.write('create partition primary\n')
+        script.write('format quick fs=ntfs label="Recovery Tools"\n')
+        script.write('assign letter="T"\n')
+        script.write('set id="de94bba4-06d1-4d40-a16a-bfd50179d6ac"\n')
+        script.write('gpt attributes=0x8000000000000001\n')
+
+    # Run script
+    run_program(['diskpart', '/s', DISKPART_SCRIPT])
+    time.sleep(2)
+
+def format_mbr(disk):
+    """Format disk for use as a Windows OS disk using the MBR layout."""
+    with open(DISKPART_SCRIPT, 'w') as script:
+        # Partition table
+        script.write('select disk {}\n'.format(disk['Number']))
+        script.write('clean\n')
+
+        # System partition
+        script.write('create partition primary size=100\n')
+        script.write('format fs=ntfs quick label="System Reserved"\n')
+        script.write('active\n')
+        script.write('assign letter="S"\n')
+
+        # Windows partition
+        script.write('create partition primary\n')
+        script.write('format fs=ntfs quick label="Windows"\n')
+        script.write('assign letter="W"\n')
+
+        # Recovery Tools partition
+        script.write('shrink minimum=500\n')
+        script.write('create partition primary\n')
+        script.write('format quick fs=ntfs label="Recovery"\n')
+        script.write('assign letter="T"\n')
+        script.write('set id=27\n')
+
+    # Run script
+    run_program(['diskpart', '/s', DISKPART_SCRIPT])
+    time.sleep(2)
+
+def mount_windows_share():
+    """Mount the  Windows images share unless labeled as already mounted."""
+    if not WINDOWS_SERVER['Mounted']:
+        mount_network_share(WINDOWS_SERVER)
+
+def select_windows_version():
+    actions = [
+        {'Name': 'Main Menu', 'Letter': 'M'},
+        ]
+
+    # Menu loop
+    selection = menu_select(
+        title = 'Which version of Windows are we installing?',
+        main_entries = WINDOWS_VERSIONS,
+        action_entries = actions)
+
+    if selection.isnumeric():
+        return WINDOWS_VERSIONS[int(selection)-1]
+    elif selection == 'M':
+        raise GenericAbort
+
+def setup_windows(windows_image, windows_version):
+    cmd = [
+        global_vars['Tools']['wimlib-imagex'],
+        'apply',
+        windows_image['Path'],
+        windows_version['Image Name'],
+        'W:\\']
+    if 'Glob' in windows_image:
+        cmd.extend(windows_image['Glob'])
+    run_program(cmd)
+
+def setup_windows_re(windows_version, windows_letter='W', tools_letter='T'):
+    win = r'{}:\Windows'.format(windows_letter)
+    winre = r'{}\System32\Recovery\WinRE.wim'.format(win)
+    dest = r'{}:\Recovery\WindowsRE'.format(tools_letter)
+    
+    # Copy WinRE.wim
+    os.makedirs(dest, exist_ok=True)
+    shutil.copy(winre, r'{}\WinRE.wim'.format(dest))
+    
+    # Set location
+    cmd = [
+        r'{}\System32\ReAgentc.exe'.format(win),
+        '/setreimage',
+        '/path', dest,
+        '/target', win]
+    run_program(cmd)
+
+def update_boot_partition(system_letter='S', windows_letter='W', mode='ALL'):
+    cmd = [
+        r'{}:\Windows\System32\bcdboot.exe'.format(windows_letter),
+        r'{}:\Windows'.format(windows_letter),
+        '/s', '{}:'.format(system_letter),
+        '/f', mode]
+    run_program(cmd)
+
+def wim_contains_image(filename, imagename):
+    cmd = [
+        global_vars['Tools']['wimlib-imagex'],
+        'info',
+        filename,
+        imagename]
+    try:
+        run_program(cmd)
+    except subprocess.CalledProcessError:
+        return False
+    
+    return True
+
+if __name__ == '__main__':
+    print("This file is not meant to be called directly.")
--- a/Scripts/functions/winpe_menus.py
+++ b/Scripts/functions/winpe_menus.py
@ -0,0 +1,392 @@
+# Wizard Kit PE: Menus
+
+from functions.backup import *
+from functions.disk import *
+from functions.windows_setup import *
+
+# STATIC VARIABLES
+FAST_COPY_PE_ARGS = [
+    '/cmd=noexist_only',
+    '/utf8',
+    '/skip_empty_dir',
+    '/linkdest',
+    '/no_ui',
+    '/auto_close',
+    '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
+    ]
+PE_TOOLS = {
+    'BlueScreenView': {
+        'Path': r'BlueScreenView\BlueScreenView.exe',
+        },
+    'FastCopy': {
+        'Path': r'FastCopy\FastCopy.exe',
+        'Args': FAST_COPY_PE_ARGS,
+        },
+    'HWiNFO': {
+        'Path': r'HWiNFO\HWiNFO.exe',
+        },
+    'NT Password Editor': {
+        'Path': r'NT Password Editor\ntpwedit.exe',
+        },
+    'Notepad++': {
+        'Path': r'NotepadPlusPlus\NotepadPlusPlus.exe',
+        },
+    'PhotoRec': {
+        'Path': r'TestDisk\photorec_win.exe',
+        'Args': ['-new_console:n'],
+        },
+    'Prime95': {
+        'Path': r'Prime95\prime95.exe',
+        },
+    'ProduKey': {
+        'Path': r'ProduKey\ProduKey.exe',
+        },
+    'Q-Dir': {
+        'Path': r'Q-Dir\Q-Dir.exe',
+        },
+    'TestDisk': {
+        'Path': r'TestDisk\testdisk_win.exe',
+        'Args': ['-new_console:n'],
+        },
+    }
+
+def menu_backup():
+    """Take backup images of partition(s) in the WIM format."""
+    errors = False
+    other_results = {
+        'Error': {
+            'CalledProcessError':   'Unknown Error',
+            'PathNotFoundError':    'Missing',
+        },
+        'Warning': {
+            'GenericAbort':         'Skipped',
+            'GenericRepair':        'Repaired',
+        }}
+    set_title('{}: Backup Menu'.format(KIT_NAME_FULL))
+
+    # Set ticket Number
+    clear_screen()
+    print_standard('{}\n'.format(global_vars['Title']))
+    ticket_number = get_ticket_number()
+
+    # Mount backup shares
+    mount_backup_shares()
+
+    # Select destination
+    destination = select_backup_destination()
+
+    # Scan disks
+    try_and_print(
+        message = 'Assigning letters...',
+        function = assign_volume_letters,
+        other_results = other_results)
+    result = try_and_print(
+        message = 'Getting disk info...',
+        function = scan_disks,
+        other_results = other_results)
+    if result['CS']:
+        disks = result['Out']
+    else:
+        print_error('ERROR: No disks found.')
+        raise GenericAbort
+    
+    # Select disk to backup
+    disk = select_disk('For which disk are we creating backups?', disks)
+    if not disk:
+        raise GenericAbort
+    
+    # "Prep" disk
+    prep_disk_for_backup(destination, disk, ticket_number)
+
+    # Display details for backup task
+    clear_screen()
+    print_info('Create Backup - Details:\n')
+    show_info(message='Ticket:', info=ticket_number)
+    show_info(
+        message = 'Source:',
+        info = '[{Table}] ({Type}) {Name} {Size}'.format(**disk),
+        )
+    show_info(
+        message = 'Destination:',
+        info = destination.get('Display Name', destination['Name']),
+        )
+    for par in disk['Partitions']:
+        show_info(message='', info=par['Display String'], width=20)
+    print_standard(disk['Backup Warnings'])
+
+    # Ask to proceed
+    if (not ask('Proceed with backup?')):
+        raise GenericAbort
+    
+    # Backup partition(s)
+    print_info('\n\nStarting task.\n')
+    for par in disk['Partitions']:
+        result = try_and_print(
+            message = 'Partition {} Backup...'.format(par['Number']),
+            function = backup_partition,
+            other_results = other_results,
+            disk = disk,
+            partition = par)
+        if not result['CS']:
+            errors = True
+            par['Error'] = result['Error']
+    
+    # Verify backup(s)
+    if disk['Valid Partitions']:
+        print_info('\n\n  Verifying backup images(s)\n')
+        for par in disk['Partitions']:
+            if par['Number'] in disk['Bad Partitions']:
+                continue # Skip verification
+            result = try_and_print(
+                message = 'Partition {} Image...'.format(par['Number']),
+                function = verify_wim_backup,
+                other_results = other_results,
+                partition = par)
+            if not result['CS']:
+                errors = True
+                par['Error'] = result['Error']
+
+    # Print summary
+    if errors:
+        print_warning('\nErrors were encountered and are detailed below.')
+        for par in [p for p in disk['Partitions'] if 'Error' in p]:
+            print_standard('    Partition {} Error:'.format(par['Number']))
+            if hasattr(par['Error'], 'stderr'):
+                try:
+                    par['Error'] = par['Error'].stderr.decode()
+                except:
+                    # Deal with badly formatted error message
+                    pass
+            if isinstance(par['Error'], basestring):
+                print_error('\t{}'.format(par['Error']))
+            else:
+                try:
+                    par['Error'] = par['Error'].splitlines()
+                    par['Error'] = [line.strip() for line in par['Error']]
+                    par['Error'] = [line for line in par['Error'] if line]
+                except:
+                    pass
+                for line in par['Error']:
+                    print_error('\t{}'.format(line))
+        time.sleep(30)
+    else:
+        print_success('\nNo errors were encountered during imaging.')
+        time.sleep(5)
+    pause('\nPress Enter to return to main menu... ')
+
+def menu_root():
+    menus = [
+        {'Name': 'Create Backups', 'Menu': menu_backup},
+        {'Name': 'Setup Windows', 'Menu': menu_setup},
+        {'Name': 'Misc Tools', 'Menu': menu_tools},
+        ]
+    actions = [
+        {'Name': 'Command Prompt', 'Letter': 'C'},
+        {'Name': 'Reboot', 'Letter': 'R'},
+        {'Name': 'Shutdown', 'Letter': 'S'},
+        ]
+
+    # Main loop
+    while True:
+        set_title(KIT_NAME_FULL)
+        selection = menu_select(
+            title = 'Main Menu',
+            main_entries = menus,
+            action_entries = actions,
+            secret_exit = True)
+
+        if (selection.isnumeric()):
+            try:
+                menus[int(selection)-1]['Menu']()
+            except GenericAbort:
+                print_warning('\nAborted\n')
+                pause('Press Enter to return to main menu... ')
+        elif (selection == 'C'):
+            run_program(['cmd', '-new_console:n'], check=False)
+        elif (selection == 'R'):
+            run_program(['wpeutil', 'reboot'])
+        elif (selection == 'S'):
+            run_program(['wpeutil', 'shutdown'])
+        else:
+            exit_script()
+
+def menu_setup():
+    """Format a disk (MBR/GPT), apply a Windows image, and setup boot files."""
+    errors = False
+    other_results = {
+        'Error': {
+            'CalledProcessError':   'Unknown Error',
+            'PathNotFoundError':    'Missing',
+        },
+        'Warning': {
+            'GenericAbort':         'Skipped',
+            'GenericRepair':        'Repaired',
+        }}
+    set_title('{}: Setup Menu'.format(KIT_NAME_FULL))
+
+    # Set ticket ID
+    clear_screen()
+    print_standard('{}\n'.format(global_vars['Title']))
+    ticket_number = get_ticket_number()
+
+    # Select the version of Windows to apply
+    windows_version = select_windows_version()
+    
+    # Find Windows image
+    windows_image = find_windows_image(windows_version)
+
+    # Scan disks
+    try_and_print(
+        message = 'Assigning letters...',
+        function = assign_volume_letters,
+        other_results = other_results)
+    result = try_and_print(
+        message = 'Getting disk info...',
+        function = scan_disks,
+        other_results = other_results)
+    if result['CS']:
+        disks = result['Out']
+    else:
+        print_error('ERROR: No disks found.')
+        raise GenericAbort
+    
+    # Select disk to use as the OS disk
+    dest_disk = select_disk('To which disk are we installing Windows?', disks)
+    if not disk:
+        raise GenericAbort
+    
+    # "Prep" disk
+    prep_disk_for_formatting(dest_disk)
+
+    # Display details for setup task
+    clear_screen()
+    print_info('Setup Windows - Details:\n')
+    show_info(message='Ticket:', info=ticket_number)
+    show_info(message='Installing:', info=windows_version['Name'])
+    show_info(
+        message = 'Boot Method:',
+        info = 'UEFI (GPT)' if dest_disk['Use GPT'] else 'Legacy (MBR)')
+    show_info(message='Using Image:', info=windows_version['Path'])
+    print_warning('    ERASING:    \t[{Table}] ({Type}) {Name} {Size}\n'.format(
+        **dest_disk))
+    for par in dest_disk['Partitions']:
+        print_warning(par['Display String'])
+    print_warning(dest_disk['Format Warnings'])
+    
+    if (not ask('Is this correct?')):
+        raise GenericAbort
+    
+    # Safety check
+    print_standard('\nSAFETY CHECK')
+    print_warning('All data will be DELETED from the '
+                  'disk & partition(s) listed above.')
+    print_warning('This is irreversible and will lead '
+                  'to {CLEAR}{RED}DATA LOSS.'.format(**COLORS))
+    if (not ask('Asking again to confirm, is this correct?')):
+        raise GenericAbort
+
+    # Remove volume letters so S, T, & W can be used below
+    remove_volume_letters(keep=windows_image['Source'])
+    new_letter = reassign_volume_letter(letter=windows_image['Source'])
+    if new_letter:
+        windows_image['Source'] = new_letter
+
+    # Format and partition disk
+    result = try_and_print(
+        message = 'Formatting disk...',
+        function = format_disk,
+        other_results = other_results,
+        disk = dest_disk,
+        use_gpt = dest_disk['Use GPT'])
+    if not result['CS']:
+        # We need to crash as the disk is in an unknown state
+        print_error('ERROR: Failed to format disk.')
+        raise GenericAbort
+
+    # Apply Image
+    result = try_and_print(
+        message = 'Applying image...',
+        function = setup_windows,
+        other_results = other_results,
+        windows_image = windows_image,
+        windows_version = windows_version)
+    if not result['CS']:
+        # We need to crash as the disk is in an unknown state
+        print_error('ERROR: Failed to apply image.')
+        raise GenericAbort
+    
+    # Create Boot files
+    try_and_print(
+        message = 'Updating boot files...',
+        function = update_boot_partition,
+        other_results = other_results)
+    
+    # Setup WinRE
+    try_and_print(
+        message = 'Updating recovery tools...',
+        function = setup_windows_re,
+        other_results = other_results,
+        windows_version = windows_version)
+
+    # Print summary
+    print_standard('\nDone.')
+    pause('\nPress Enter to return to main menu... ')
+
+def menu_tools():
+    tools = [{'Name': k} for k in sorted(PE_TOOLS.keys())]
+    actions = [{'Name': 'Main Menu', 'Letter': 'M'},]
+    set_title(KIT_NAME_FULL)
+
+    # Menu loop
+    while True:
+        selection = menu_select(
+            title = 'Tools Menu',
+            main_entries = tools,
+            action_entries = actions)
+        if (selection.isnumeric()):
+            tool = tools[int(selection)-1]
+            cmd = [PE_TOOLS[tool]['Path']] + PE_TOOLS[tool].get('Args', [])
+            if tool == 'Blue Screen View':
+                # Select path to scan
+                minidump_path = select_minidump_path()
+                if minidump_path:
+                    cmd.extend(['/MiniDumpFolder', minidump_path])
+            try:
+                popen_program(cmd)
+            except Exception:
+                print_error('Failed to run {prog}'.format(prog=tool['Name']))
+                time.sleep(2)
+                pause()
+        elif (selection == 'M'):
+            break
+
+def select_minidump_path():
+    dumps = []
+
+    # Assign volume letters first
+    assign_volume_letters()
+
+    # Search for minidumps
+    tmp = run_program('mountvol')
+    tmp = [d for d in re.findall(r'.*([A-Za-z]):\\', tmp.stdout.decode())]
+    # Remove RAMDisk letter
+    if 'X' in tmp:
+        tmp.remove('X')
+    for disk in tmp:
+        if os.path.exists('{}:\\Windows\\MiniDump'.format(disk)):
+            dumps.append({'Name': '{}:\\Windows\\MiniDump'.format(disk)})
+
+    # Check results before showing menu
+    if len(dumps) == 0:
+        print_error('  No BSoD / MiniDump paths found')
+        time.sleep(2)
+        return None
+
+    # Menu
+    selection = menu_select(
+        title = 'Which BSoD / MiniDump path are we scanning?',
+        main_entries = dumps)
+    return dumps[int(selection) - 1]['Name']
+
+if __name__ == '__main__':
+    print("This file is not meant to be called directly.")
--- a/Scripts/menu.py
+++ b/Scripts/menu.py
@ -1,277 +0,0 @@
-# WK WinPE Menu
-
-# Init
-import os
-import re
-import subprocess
-import sys
-import time
-import traceback
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-bin = os.path.abspath('..\\')
-sys.path.append(os.getcwd())
-from functions import *
-
-## Colors
-COLORS = {
-    'CLEAR': '\033[0m',
-    'RED': '\033[31m',
-    'GREEN': '\033[32m',
-    'YELLOW': '\033[33m',
-    'BLUE': '\033[34m'}
-
-def menu_backup_imaging():
-    """Take backup images of partition(s) in the WIM format and save them to a backup share"""
-    errors = False
-
-    # Set ticket ID
-    os.system('cls')
-    ticket_id = get_ticket_id()
-
-    # Mount backup shares
-    mount_backup_shares()
-
-    # Select destination
-    dest = select_destination()
-    if dest is None:
-        abort_to_main_menu('Aborting Backup Creation')
-
-    # Select disk to backup
-    disk = select_disk('For which drive are we creating backups?')
-    if disk is None:
-        abort_to_main_menu()
-    prep_disk_for_backup(dest, disk, ticket_id)
-
-    # Display details for backup task
-    os.system('cls')
-    print('Create Backup - Details:\n')
-    print('    Ticket:     \t{ticket_id}'.format(ticket_id=ticket_id))
-    print('    Source:     \t[{Table}] ({Type}) {Name} {Size}\n'.format(**disk))
-    print('    Destination:\t{name}'.format(name=dest.get('Display Name', dest['Name'])))
-    for par in disk['Partitions']:
-        print(par['Display String'])
-    print(disk['Backup Warnings'])
-
-    # Ask to proceed
-    if (not ask('Proceed with backup?')):
-        abort_to_main_menu('Aborting Backup Creation')
-    
-    # Backup partition(s)
-    print('\n\nStarting task.\n')
-    for par in disk['Partitions']:
-        try:
-            backup_partition(bin, disk, par)
-        except BackupError:
-            errors = True
-    
-    # Verify backup(s)
-    if disk['Valid Partitions'] > 1:
-        print('\n\n  Verifying backups\n')
-    else:
-        print('\n\n  Verifying backup\n')
-    for par in disk['Partitions']:
-        if par['Number'] in disk['Bad Partitions']:
-            continue # Skip verification
-        try:
-            verify_wim_backup(bin, par)
-        except BackupError:
-            errors = True
-
-    # Print summary
-    if errors:
-        print_warning('\nErrors were encountered and are detailed below.')
-        for par in [p for p in disk['Partitions'] if 'Error' in p]:
-            print('    Partition {Number} Error:'.format(**par))
-            for line in [line.strip() for line in par['Error'] if line.strip() != '']:
-                print_error('\t{line}'.format(line=line))
-        time.sleep(30)
-    else:
-        print_success('\nNo errors were encountered during imaging.')
-        time.sleep(5)
-    pause('\nPress Enter to return to main menu... ')
-
-def menu_windows_setup():
-    """Format a drive, partition for MBR or GPT, apply a Windows image, and rebuild the boot files"""
-    errors = False
-
-    # Set ticket ID
-    os.system('cls')
-    ticket_id = get_ticket_id()
-
-    # Select the version of Windows to apply
-    windows_version = select_windows_version()
-
-    # Select drive to use as the OS drive
-    dest_disk = select_disk('To which drive are we installing Windows?')
-    prep_disk_for_formatting(dest_disk)
-    
-    # Find Windows image
-    ## NOTE: Needs to happen AFTER select_disk() is called as there's a hidden assign_volume_letters().
-    ##       This changes the current letters thus preventing installing from a local source.
-    windows_image = find_windows_image(bin, windows_version)
-
-    # Display details for setup task
-    os.system('cls')
-    print('Setup Windows - Details:\n')
-    print('    Ticket:     \t{ticket_id}'.format(ticket_id=ticket_id))
-    print('    Installing: \t{winver}'.format(winver=windows_version['Name']))
-    print('    Boot Method:\t{_type}'.format(
-        _type='UEFI (GPT)' if dest_disk['Use GPT'] else 'Legacy (MBR)'))
-    print('    Using Image:\t{File}.{Ext}'.format(**windows_image))
-    print_warning('    ERASING:    \t[{Table}] ({Type}) {Name} {Size}\n'.format(**dest_disk))
-    for par in dest_disk['Partitions']:
-        print_warning(par['Display String'])
-    print_warning(dest_disk['Format Warnings'])
-    
-    if (not ask('Is this correct?')):
-        abort_to_main_menu('Aborting Windows setup')
-    
-    # Safety check    
-    print('\nSAFETY CHECK')
-    print_warning('All data will be DELETED from the drive and partition(s) listed above.')
-    print_warning('This is irreversible and will lead to {CLEAR}{RED}DATA LOSS.'.format(**COLORS))
-    if (not ask('Asking again to confirm, is this correct?')):
-        abort_to_main_menu('Aborting Windows setup')
-
-    # Release currently used volume letters (ensures that the drives will get S, T, & W as needed below)
-    remove_volume_letters(keep=windows_image['Source'])
-
-    # Format and partition drive
-    print('\n    Formatting Drive...     \t\t', end='', flush=True)
-    try:
-        if (dest_disk['Use GPT']):
-            format_gpt(dest_disk, windows_version['Family'])
-        else:
-            format_mbr(dest_disk, windows_version['Family'])
-        print_success('Complete.')
-    except:
-        # We need to crash as the drive is in an unknown state
-        print_error('Failed.')
-        raise
-
-    # Apply Image
-    print('    Applying Image...       \t\t', end='', flush=True)
-    try:
-        setup_windows(bin, windows_image, windows_version)
-        print_success('Complete.')
-    except subprocess.CalledProcessError:
-        print_error('Failed.')
-        errors = True
-    except:
-        # We need to crash as the OS is in an unknown state
-        print_error('Failed.')
-        raise
-    
-    # Create Boot files
-    print('    Update Boot Partition...\t\t', end='', flush=True)
-    try:
-        update_boot_partition()
-        print_success('Complete.')
-    except subprocess.CalledProcessError:
-        # Don't need to crash as this is (potentially) recoverable
-        print_error('Failed.')
-        errors = True
-    except:
-        print_error('Failed.')
-        raise
-    
-    # Setup WinRE
-    print('    Update Recovery Tools...\t\t', end='', flush=True)
-    try:
-        setup_windows_re(windows_version)
-        print_success('Complete.')
-    except SetupError:
-        print('Skipped.')
-    except:
-        # Don't need to crash as this is (potentially) recoverable
-        print_error('Failed.')
-        errors = True
-
-    # Print summary
-    if errors:
-        print_warning('\nErrors were encountered during setup.')
-        time.sleep(30)
-    else:
-        print_success('\nNo errors were encountered during setup.')
-        time.sleep(5)
-    pause('\nPress Enter to return to main menu... ')
-
-def menu_tools():
-    tools = [
-        {'Name': 'Blue Screen View', 'Folder': 'BlueScreenView', 'File': 'BlueScreenView.exe'},
-        {'Name': 'CPU-Z', 'Folder': 'CPU-Z', 'File': 'cpuz.exe'},
-        {'Name': 'Fast Copy', 'Folder': 'FastCopy', 'File': 'FastCopy.exe', 'Args': ['/log', '/logfile=X:\WK\Info\FastCopy.log', '/cmd=noexist_only', '/utf8', '/skip_empty_dir', '/linkdest', '/open_window', '/balloon=FALSE', r'/exclude=$RECYCLE.BIN;$Recycle.Bin;.AppleDB;.AppleDesktop;.AppleDouble;.com.apple.timemachine.supported;.dbfseventsd;.DocumentRevisions-V100*;.DS_Store;.fseventsd;.PKInstallSandboxManager;.Spotlight*;.SymAV*;.symSchedScanLockxz;.TemporaryItems;.Trash*;.vol;.VolumeIcon.icns;desktop.ini;Desktop?DB;Desktop?DF;hiberfil.sys;lost+found;Network?Trash?Folder;pagefile.sys;Recycled;RECYCLER;System?Volume?Information;Temporary?Items;Thumbs.db']},
-        {'Name': 'HWiNFO', 'Folder': 'HWiNFO', 'File': 'HWiNFO.exe'},
-        {'Name': 'NT Password Editor', 'Folder': 'NT Password Editor', 'File': 'ntpwedit.exe'},
-        {'Name': 'Notepad++', 'Folder': 'NotepadPlusPlus', 'File': 'notepadplusplus.exe'},
-        {'Name': 'PhotoRec', 'Folder': 'TestDisk', 'File': 'photorec_win.exe', 'Args': ['-new_console:n']},
-        {'Name': 'Prime95', 'Folder': 'Prime95', 'File': 'prime95.exe'},
-        {'Name': 'ProduKey', 'Folder': 'ProduKey', 'File': 'ProduKey.exe', 'Args': ['/external', '/ExtractEdition:1']},
-        {'Name': 'Q-Dir', 'Folder': 'Q-Dir', 'File': 'Q-Dir.exe'},
-        {'Name': 'TestDisk', 'Folder': 'TestDisk', 'File': 'testdisk_win.exe', 'Args': ['-new_console:n']},
-        ]
-    actions = [
-        {'Name': 'Main Menu', 'Letter': 'M'},
-        ]
-
-    # Menu loop
-    while True:
-        selection = menu_select('Tools Menu', tools, actions)
-
-        if (selection.isnumeric()):
-            tool = tools[int(selection)-1]
-            cmd = ['{bin}\\{folder}\\{file}'.format(bin=bin, folder=tool['Folder'], file=tool['File'])]
-            if tool['Name'] == 'Blue Screen View':
-                # Select path to scan
-                minidump_path = select_minidump_path()
-                if minidump_path is not None:
-                    tool['Args'] = ['/MiniDumpFolder', minidump_path]
-            if 'Args' in tool:
-                cmd += tool['Args']
-            try:
-                subprocess.Popen(cmd)
-            except:
-                print_error('Failed to run {prog}'.format(prog=tool['Name']))
-            time.sleep(2)
-        elif (selection == 'M'):
-            break
-
-def menu_main():
-    menus = [
-        {'Name': 'Create Backups', 'Menu': menu_backup_imaging},
-        {'Name': 'Setup Windows', 'Menu': menu_windows_setup},
-        {'Name': 'Misc Tools', 'Menu': menu_tools},
-        ]
-    actions = [
-        {'Name': 'Command Prompt', 'Letter': 'C'},
-        {'Name': 'Reboot', 'Letter': 'R'},
-        {'Name': 'Shutdown', 'Letter': 'S'},
-        ]
-
-    # Main loop
-    while True:
-        selection = menu_select('Main Menu', menus, actions, secret_exit=True)
-
-        if (selection.isnumeric()):
-            try:
-                menus[int(selection)-1]['Menu']()
-            except AbortError:
-                pass
-            except:
-                print_error('Major exception in: {menu}'.format(menu=menus[int(selection)-1]['Name']))
-                print_warning('  Please let The Wizard know and he\'ll look into it (Please include the details below).')
-                print(traceback.print_exc())
-                time.sleep(5)
-                print_info('  You can retry but if this crashes again an alternative approach may be required.')
-                pause('\nPress enter to return to the main menu')
-        elif (selection == 'C'):
-            run_program(['cmd', '-new_console:n'], check=False)
-        elif (selection == 'R'):
-            run_program(['wpeutil', 'reboot'])
-        elif (selection == 'S'):
-            run_program(['wpeutil', 'shutdown'])
-        else:
-            sys.exit(0)
-
-if __name__ == '__main__':
-    menu_main()
--- a/Scripts/settings/main.py
+++ b/Scripts/settings/main.py
@ -0,0 +1,68 @@
+# Wizard Kit PE: Settings - Main / Branding
+
+# Features
+ENABLED_UPLOAD_DATA = False
+
+# STATIC VARIABLES (also used by .cmd files)
+## Not using spaces aroung '=' for easier .cmd substrings
+ARCHIVE_PASSWORD='Abracadabra'
+KIT_NAME_FULL='Wizard Kit PE'
+KIT_NAME_SHORT='WKPE'
+OFFICE_SERVER_IP='10.0.0.10'
+QUICKBOOKS_SERVER_IP='10.0.0.10'
+SUPPORT_MESSAGE='Please let 2Shirt know by opening an issue on GitHub'
+TIME_ZONE='Pacific Standard Time' # Always use "Standard Time" (DST is applied correctly)
+
+# SERVER VARIABLES
+## NOTE: Windows can only use one user per server. This means that if
+##       one server serves multiple shares then you have to use the same
+##       user/password for all of those shares.
+BACKUP_SERVERS = [
+    {   'IP':       '10.0.0.10',
+        'Name':     'ServerOne',
+        'Mounted':  False,
+        'Share':    'Backups',
+        'User':     'restore',
+        'Pass':     'Abracadabra',
+    },
+    {   'IP':       '10.0.0.11',
+        'Name':     'ServerTwo',
+        'Mounted':  False,
+        'Share':    'Backups',
+        'User':     'restore',
+        'Pass':     'Abracadabra',
+    },
+]
+CLIENT_INFO_SERVER = {
+    'IP':           '10.0.0.10',
+    'RegEntry':     r'0x10001,0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
+    'Share':        '/srv/ClientInfo',
+    'User':         'upload',
+}
+OFFICE_SERVER = {
+    'IP':           OFFICE_SERVER_IP,
+    'Name':         'ServerOne',
+    'Mounted':      False,
+    'Share':        'Office',
+    'User':         'restore',
+    'Pass':         'Abracadabra',
+}
+QUICKBOOKS_SERVER = {
+    'IP':           QUICKBOOKS_SERVER_IP,
+    'Name':         'ServerOne',
+    'Mounted':      False,
+    'Share':        'QuickBooks',
+    'User':         'restore',
+    'Pass':         'Abracadabra',
+}
+WINDOWS_SERVER = {
+    'IP':           '10.0.0.10',
+    'Name':         'ServerOne',
+    'Mounted':      False,
+    'Share':        'Windows',
+    'User':         'restore',
+    'Pass':         'Abracadabra',
+}
+
+if __name__ == '__main__':
+    print("This file is not meant to be called directly.")
--- a/Scripts/settings/tools.py
+++ b/Scripts/settings/tools.py
@ -0,0 +1,55 @@
+# Wizard Kit PE: Settings - Tools
+
+TOOLS = {
+    # NOTE: BinDir will be prepended to these paths at runtime
+    'AIDA64': {
+        '32': r'AIDA64\aida64.exe'},
+    'AutoRuns': {
+        '32': r'Autoruns\autoruns.exe',
+        '64': r'Autoruns\autoruns64.exe'},
+    'BleachBit': {
+        '32': r'BleachBit\bleachbit_console.exe'},
+    'Caffeine': {
+        '32': r'Caffeine\caffeine.exe'},
+    'Du': {
+        '32': r'Du\du.exe',
+        '64': r'Du\du64.exe'},
+    'ERUNT': {
+        '32': r'ERUNT\ERUNT.EXE'},
+    'Everything': {
+        '32': r'Everything\Everything.exe',
+        '64': r'Everything\Everything64.exe'},
+    'FastCopy': {
+        '32': r'FastCopy\FastCopy.exe',
+        '64': r'FastCopy\FastCopy64.exe'},
+    'HitmanPro': {
+        '32': r'HitmanPro\HitmanPro.exe',
+        '64': r'HitmanPro\HitmanPro64.exe'},
+    'HWiNFO': {
+        '32': r'HWiNFO\HWiNFO.exe',
+        '64': r'HWiNFO\HWiNFO64.exe'},
+    'KVRT': {
+        '32': r'KVRT\KVRT.exe'},
+    'NotepadPlusPlus': {
+        '32': r'NotepadPlusPlus\notepadplusplus.exe'},
+    'ProduKey': {
+        '32': r'ProduKey\ProduKey.exe',
+        '64': r'ProduKey\ProduKey64.exe'},
+    'PuTTY-PSFTP': {
+        '32': r'PuTTY\PSFTP.EXE'},
+    'RKill': {
+        '32': r'RKill\RKill.exe'},
+    'SevenZip': {
+        '32': r'7-Zip\7za.exe',
+        '64': r'7-Zip\7za64.exe'},
+    'TDSSKiller': {
+        '32': r'TDSSKiller\TDSSKiller.exe'},
+    'wimlib-imagex': {
+        '32': r'wimlib\x32\wimlib-imagex.exe',
+        '64': r'wimlib\x64\wimlib-imagex.exe'},
+    'XMPlay': {
+        '32': r'XMPlay\xmplay.exe'},
+    }
+
+if __name__ == '__main__':
+    print("This file is not meant to be called directly.")
--- a/Scripts/winpe_root_menu.py
+++ b/Scripts/winpe_root_menu.py
@ -0,0 +1,23 @@
+# Wizard Kit PE: Root Menu
+
+import os
+import sys
+
+# Init
+os.chdir(os.path.dirname(os.path.realpath(__file__)))
+sys.path.append(os.getcwd())
+from functions.winpe_menus import *
+init_global_vars()
+set_title('{}: Root Menu'.format(KIT_NAME_FULL))
+global_vars['LogFile'] = r'{LogDir}\WinPE.log'.format(**global_vars)
+
+# STATIC VARIABLES
+DISKPART_SCRIPT = r'{}\diskpart.script'.format(global_vars['Env']['TMP'])
+
+if __name__ == '__main__':
+    try:
+        menu_root()
+    except SystemExit:
+        pass
+    except:
+        major_exception()
--- a/System32/Winpeshl.ini
+++ b/System32/Winpeshl.ini
@ -2,5 +2,5 @@
 [LaunchApps]
 wpeinit
 wpeutil updatebootinfo
-cd /d "%SystemDrive%\WK"
-"%SystemDrive%\WK\ConEmu\ConEmu.exe", /cmd cmd /k cd "%SystemDrive%\WK" & python "%SystemDrive%\WK\Scripts\menu.py"
+cd /d "%SystemDrive%\.bin"
+"%SystemDrive%\.bin\ConEmu\ConEmu.exe", /cmd cmd /k cd "%SystemDrive%\.bin" & python "%SystemDrive%\.bin\Scripts\menu.py"
--- a/System32/menu.cmd
+++ b/System32/menu.cmd
@ -1,2 +1,2 @@
@echo off
-python "%SystemDrive%\WK\Scripts\menu.py"
+python "%SystemDrive%\.bin\Scripts\menu.py"
--- a/WK/_include/CPU-Z/cpuz.ini
+++ b/WK/_include/CPU-Z/cpuz.ini
--- a/WK/_include/ConEmu/ConEmu.xml
+++ b/WK/_include/ConEmu/ConEmu.xml
--- a/WK/_include/HWiNFO/HWiNFO.INI
+++ b/WK/_include/HWiNFO/HWiNFO.INI
--- a/WK/_include/NotepadPlusPlus/config.xml
+++ b/WK/_include/NotepadPlusPlus/config.xml
@ -5,10 +5,10 @@
    <GUIConfigs>
        <GUIConfig name="ToolBar" visible="no">standard</GUIConfig>
        <GUIConfig name="StatusBar">hide</GUIConfig>
-        <GUIConfig name="TabBar" dragAndDrop="yes" drawTopBar="yes" drawInactiveTab="yes" reduce="yes" closeButton="yes" doubleClick2Close="no" vertical="no" multiLine="no" hide="yes" quitOnEmpty="no" />
+        <GUIConfig name="TabBar" dragAndDrop="yes" drawTopBar="yes" drawInactiveTab="yes" reduce="yes" closeButton="yes" doubleClick2Close="no" vertical="no" multiLine="no" hide="no" quitOnEmpty="no" />
        <GUIConfig name="ScintillaViewsSplitter">vertical</GUIConfig>
        <GUIConfig name="UserDefineDlg" position="undocked">hide</GUIConfig>
-        <GUIConfig name="TabSetting" replaceBySpace="no" size="4" />
+        <GUIConfig name="TabSetting" replaceBySpace="yes" size="4" />
        <GUIConfig name="noUpdate" intervalDays="15" nextUpdateDate="20080426">no</GUIConfig>
        <GUIConfig name="Auto-detection">yes</GUIConfig>
        <GUIConfig name="CheckHistoryFiles">no</GUIConfig>
@ -24,7 +24,7 @@
        <GUIConfig name="TaskList">yes</GUIConfig>
        <GUIConfig name="MRU">yes</GUIConfig>
        <GUIConfig name="URL">2</GUIConfig>
-        <GUIConfig name="globalOverride" fg="no" bg="no" font="no" fontSize="no" bold="no" italic="no" underline="no" />
+        <GUIConfig name="globalOverride" fg="no" bg="no" font="yes" fontSize="no" bold="no" italic="no" underline="no" />
        <GUIConfig name="auto-completion" autoCAction="3" triggerFromNbChar="1" autoCIgnoreNumbers="yes" funcParams="yes" />
        <GUIConfig name="auto-insert" parentheses="no" brackets="no" curlyBrackets="no" quotes="no" doubleQuotes="no" htmlXmlTag="no" />
        <GUIConfig name="sessionExt"></GUIConfig>
--- a/WK/_include/NotepadPlusPlus/npp.cmd
+++ b/WK/_include/NotepadPlusPlus/npp.cmd
@ -0,0 +1,3 @@
+@echo off
+
+start "" %SystemDrive%\.bin\NotepadPlusPlus\notepadplusplus.exe %2 %3 %4 %5 %6 %7 %8 %9
--- a/WK/_include/NotepadPlusPlus/stylers.model.xml
+++ b/WK/_include/NotepadPlusPlus/stylers.model.xml
--- a/WK/_include/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=
--- a/WK/amd64/HWiNFO/HWiNFO64.INI
+++ b/WK/amd64/HWiNFO/HWiNFO64.INI
@ -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
--- a/WK/amd64/NotepadPlusPlus/config.xml
+++ b/WK/amd64/NotepadPlusPlus/config.xml
@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252" ?>
-<NotepadPlus>
-    <FindHistory nbMaxFindHistoryPath="10" nbMaxFindHistoryFilter="10" nbMaxFindHistoryFind="10" nbMaxFindHistoryReplace="10" matchWord="no" matchCase="no" wrap="yes" directionDown="yes" fifRecuisive="yes" fifInHiddenFolder="no" dlgAlwaysVisible="no" fifFilterFollowsDoc="no" fifFolderFollowsDoc="no" searchMode="0" transparencyMode="1" transparency="150" dotMatchesNewline="no" />
-    <History nbMaxFile="10" inSubMenu="no" customLength="-1" />
-    <GUIConfigs>
-        <GUIConfig name="ToolBar" visible="no">standard</GUIConfig>
-        <GUIConfig name="StatusBar">hide</GUIConfig>
-        <GUIConfig name="TabBar" dragAndDrop="yes" drawTopBar="yes" drawInactiveTab="yes" reduce="yes" closeButton="yes" doubleClick2Close="no" vertical="no" multiLine="no" hide="yes" quitOnEmpty="no" />
-        <GUIConfig name="ScintillaViewsSplitter">vertical</GUIConfig>
-        <GUIConfig name="UserDefineDlg" position="undocked">hide</GUIConfig>
-        <GUIConfig name="TabSetting" replaceBySpace="no" size="4" />
-        <GUIConfig name="noUpdate" intervalDays="15" nextUpdateDate="20080426">no</GUIConfig>
-        <GUIConfig name="Auto-detection">yes</GUIConfig>
-        <GUIConfig name="CheckHistoryFiles">no</GUIConfig>
-        <GUIConfig name="TrayIcon">no</GUIConfig>
-        <GUIConfig name="MaitainIndent">yes</GUIConfig>
-        <GUIConfig name="TagsMatchHighLight" TagAttrHighLight="yes" HighLightNonHtmlZone="no">yes</GUIConfig>
-        <GUIConfig name="RememberLastSession">no</GUIConfig>
-        <GUIConfig name="DetectEncoding">yes</GUIConfig>
-        <GUIConfig name="NewDocDefaultSettings" format="0" encoding="4" lang="0" codepage="-1" openAnsiAsUTF8="yes" />
-        <GUIConfig name="langsExcluded" gr0="0" gr1="0" gr2="0" gr3="0" gr4="0" gr5="0" gr6="0" gr7="0" langMenuCompact="yes" />
-        <GUIConfig name="Print" lineNumber="yes" printOption="3" headerLeft="" headerMiddle="" headerRight="" footerLeft="" footerMiddle="" footerRight="" headerFontName="" headerFontStyle="0" headerFontSize="0" footerFontName="" footerFontStyle="0" footerFontSize="0" margeLeft="0" margeRight="0" margeTop="0" margeBottom="0" />
-        <GUIConfig name="Backup" action="0" useCustumDir="no" dir="" isSnapshotMode="no" snapshotBackupTiming="7000" />
-        <GUIConfig name="TaskList">yes</GUIConfig>
-        <GUIConfig name="MRU">yes</GUIConfig>
-        <GUIConfig name="URL">2</GUIConfig>
-        <GUIConfig name="globalOverride" fg="no" bg="no" font="no" fontSize="no" bold="no" italic="no" underline="no" />
-        <GUIConfig name="auto-completion" autoCAction="3" triggerFromNbChar="1" autoCIgnoreNumbers="yes" funcParams="yes" />
-        <GUIConfig name="auto-insert" parentheses="no" brackets="no" curlyBrackets="no" quotes="no" doubleQuotes="no" htmlXmlTag="no" />
-        <GUIConfig name="sessionExt"></GUIConfig>
-        <GUIConfig name="workspaceExt"></GUIConfig>
-        <GUIConfig name="MenuBar">hide</GUIConfig>
-        <GUIConfig name="Caret" width="1" blinkRate="600" />
-        <GUIConfig name="ScintillaGlobalSettings" enableMultiSelection="no" />
-        <GUIConfig name="openSaveDir" value="0" defaultDirPath="" />
-        <GUIConfig name="titleBar" short="no" />
-        <GUIConfig name="wordCharList" useDefault="yes" charsAdded="" />
-        <GUIConfig name="delimiterSelection" leftmostDelimiter="40" rightmostDelimiter="41" delimiterSelectionOnEntireDocument="no" />
-        <GUIConfig name="multiInst" setting="0" />
-        <GUIConfig name="MISC" fileSwitcherWithoutExtColumn="no" backSlashIsEscapeCharacterForSql="yes" newStyleSaveDlg="no" isFolderDroppedOpenFiles="no" />
-        <GUIConfig name="searchEngine" searchEngineChoice="1" searchEngineCustom="" />
-        <GUIConfig name="SmartHighLight" matchCase="no" wholeWordOnly="no" useFindSettings="no" onAnotherView="no">yes</GUIConfig>
-        <GUIConfig name="ScintillaPrimaryView" lineNumberMargin="show" bookMarkMargin="show" indentGuideLine="show" folderMarkStyle="box" lineWrapMethod="aligned" currentLineHilitingShow="show" scrollBeyondLastLine="no" disableAdvancedScrolling="no" wrapSymbolShow="hide" Wrap="no" borderEdge="yes" edge="no" edgeNbColumn="80" zoom="0" zoom2="0" whiteSpaceShow="hide" eolShow="hide" borderWidth="2" smoothFont="no" />
-        <GUIConfig name="DockingManager" leftWidth="200" rightWidth="200" topHeight="200" bottomHeight="200">
-            <ActiveTabs cont="0" activeTab="-1" />
-            <ActiveTabs cont="1" activeTab="-1" />
-            <ActiveTabs cont="2" activeTab="-1" />
-            <ActiveTabs cont="3" activeTab="-1" />
-        </GUIConfig>
-    </GUIConfigs>
-    <ProjectPanels>
-        <ProjectPanel id="0" workSpaceFile="" />
-        <ProjectPanel id="1" workSpaceFile="" />
-        <ProjectPanel id="2" workSpaceFile="" />
-    </ProjectPanels>
-</NotepadPlus>
--- a/WK/amd64/Q-Dir/Q-Dir.ini
+++ b/WK/amd64/Q-Dir/Q-Dir.ini
@ -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
--- a/WK/x86/CPU-Z/cpuz.ini
+++ b/WK/x86/CPU-Z/cpuz.ini
@ -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
--- a/WK/x86/ConEmu/ConEmu.xml
+++ b/WK/x86/ConEmu/ConEmu.xml
@ -1,765 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<key name="Software">
-	<key name="ConEmu">
-		<key name=".Vanilla" modified="2017-02-26 11:32:01" build="170118">
-			<value name="StartType" type="hex" data="02"/>
-			<value name="CmdLine" type="string" data=""/>
-			<value name="StartTasksFile" type="string" data=""/>
-			<value name="StartTasksName" type="string" data="{Shells::cmd}"/>
-			<value name="StartFarFolders" type="hex" data="00"/>
-			<value name="StartFarEditors" type="hex" data="00"/>
-			<value name="StartCreateDelay" type="ulong" data="100"/>
-			<value name="ColorTable00" type="dword" data="00303030"/>
-			<value name="ColorTable01" type="dword" data="00ff5b1f"/>
-			<value name="ColorTable02" type="dword" data="0000ffaf"/>
-			<value name="ColorTable03" type="dword" data="00ffff87"/>
-			<value name="ColorTable04" type="dword" data="002929ef"/>
-			<value name="ColorTable05" type="dword" data="00ff8ad1"/>
-			<value name="ColorTable06" type="dword" data="000087ff"/>
-			<value name="ColorTable07" type="dword" data="00c6c6c6"/>
-			<value name="ColorTable08" type="dword" data="00b2b2b2"/>
-			<value name="ColorTable09" type="dword" data="00d7af5f"/>
-			<value name="ColorTable10" type="dword" data="0000dba1"/>
-			<value name="ColorTable11" type="dword" data="00afd700"/>
-			<value name="ColorTable12" type="dword" data="004b4bff"/>
-			<value name="ColorTable13" type="dword" data="00a34eff"/>
-			<value name="ColorTable14" type="dword" data="004fe9fc"/>
-			<value name="ColorTable15" type="dword" data="00e7fdfd"/>
-			<value name="ColorTable16" type="dword" data="00000000"/>
-			<value name="ColorTable17" type="dword" data="00000080"/>
-			<value name="ColorTable18" type="dword" data="00008000"/>
-			<value name="ColorTable19" type="dword" data="00008080"/>
-			<value name="ColorTable20" type="dword" data="00800000"/>
-			<value name="ColorTable21" type="dword" data="00800080"/>
-			<value name="ColorTable22" type="dword" data="00808000"/>
-			<value name="ColorTable23" type="dword" data="00c0c0c0"/>
-			<value name="ColorTable24" type="dword" data="00808080"/>
-			<value name="ColorTable25" type="dword" data="000000ff"/>
-			<value name="ColorTable26" type="dword" data="0000ff00"/>
-			<value name="ColorTable27" type="dword" data="0000ffff"/>
-			<value name="ColorTable28" type="dword" data="00ff0000"/>
-			<value name="ColorTable29" type="dword" data="00ff00ff"/>
-			<value name="ColorTable30" type="dword" data="00ffff00"/>
-			<value name="ColorTable31" type="dword" data="00ffffff"/>
-			<value name="ExtendColors" type="hex" data="00"/>
-			<value name="ExtendColorIdx" type="hex" data="0e"/>
-			<value name="TextColorIdx" type="hex" data="10"/>
-			<value name="BackColorIdx" type="hex" data="10"/>
-			<value name="PopTextColorIdx" type="hex" data="10"/>
-			<value name="PopBackColorIdx" type="hex" data="10"/>
-			<value name="ExtendFonts" type="hex" data="00"/>
-			<value name="ExtendFontNormalIdx" type="hex" data="01"/>
-			<value name="ExtendFontBoldIdx" type="hex" data="0c"/>
-			<value name="ExtendFontItalicIdx" type="hex" data="0d"/>
-			<value name="CursorTypeActive" type="dword" data="000232c1"/>
-			<value name="CursorTypeInactive" type="dword" data="00823283"/>
-			<value name="ClipboardDetectLineEnd" type="hex" data="01"/>
-			<value name="ClipboardBashMargin" type="hex" data="00"/>
-			<value name="ClipboardTrimTrailing" type="hex" data="02"/>
-			<value name="ClipboardEOL" type="hex" data="00"/>
-			<value name="ClipboardArrowStart" type="hex" data="01"/>
-			<value name="ClipboardAllLines" type="hex" data="01"/>
-			<value name="ClipboardFirstLine" type="hex" data="01"/>
-			<value name="ClipboardClickPromptPosition" type="hex" data="02"/>
-			<value name="ClipboardDeleteLeftWord" type="hex" data="02"/>
-			<value name="TrueColorerSupport" type="hex" data="01"/>
-			<value name="VividColors" type="hex" data="01"/>
-			<value name="FadeInactive" type="hex" data="01"/>
-			<value name="FadeInactiveLow" type="hex" data="00"/>
-			<value name="FadeInactiveHigh" type="hex" data="d0"/>
-			<value name="ConVisible" type="hex" data="00"/>
-			<value name="UseInjects" type="hex" data="01"/>
-			<value name="SetDefaultTerminal" type="hex" data="00"/>
-			<value name="SetDefaultTerminalStartup" type="hex" data="00"/>
-			<value name="SetDefaultTerminalStartupTSA" type="hex" data="00"/>
-			<value name="DefaultTerminalAgressive" type="hex" data="01"/>
-			<value name="DefaultTerminalNoInjects" type="hex" data="00"/>
-			<value name="DefaultTerminalNewWindow" type="hex" data="00"/>
-			<value name="DefaultTerminalDebugLog" type="hex" data="00"/>
-			<value name="DefaultTerminalConfirm" type="hex" data="01"/>
-			<value name="DefaultTerminalApps" type="string" data="explorer.exe"/>
-			<value name="ProcessAnsi" type="hex" data="01"/>
-			<value name="AnsiExecution" type="hex" data="01"/>
-			<value name="AnsiAllowedCommands" type="multi">
-				<line data="cmd -cur_console:R /cGitShowBranch.cmd"/>
-			</value>
-			<value name="AnsiLog" type="hex" data="00"/>
-			<value name="AnsiLogPath" type="string" data="%UserProfile%\ConEmu\Logs\"/>
-			<value name="KillSshAgent" type="hex" data="01"/>
-			<value name="ProcessNewConArg" type="hex" data="01"/>
-			<value name="ProcessCmdStart" type="hex" data="00"/>
-			<value name="ProcessCtrlZ" type="hex" data="00"/>
-			<value name="SuppressBells" type="hex" data="01"/>
-			<value name="ConsoleExceptionHandler" type="hex" data="00"/>
-			<value name="UseClink" type="hex" data="01"/>
-			<value name="StoreTaskbarkTasks" type="hex" data="01"/>
-			<value name="StoreTaskbarCommands" type="hex" data="00"/>
-			<value name="JumpListAutoUpdate" type="hex" data="01"/>
-			<value name="SaveCmdHistory" type="hex" data="01"/>
-			<value name="CmdLineHistory" type="multi">
-				<line data="cmd.exe /k &quot;%ConEmuBaseDir%\CmdInit.cmd&quot;"/>
-			</value>
-			<value name="SingleInstance" type="hex" data="00"/>
-			<value name="ShowHelpTooltips" type="hex" data="01"/>
-			<value name="Multi" type="hex" data="01"/>
-			<value name="Multi.ShowButtons" type="hex" data="01"/>
-			<value name="Multi.ShowSearch" type="hex" data="01"/>
-			<value name="Multi.NumberInCaption" type="hex" data="00"/>
-			<value name="Multi.CloseConfirmFlags" type="hex" data="04"/>
-			<value name="Multi.NewConfirm" type="hex" data="00"/>
-			<value name="Multi.DupConfirm" type="hex" data="01"/>
-			<value name="Multi.DetachConfirm" type="hex" data="01"/>
-			<value name="Multi.UseArrows" type="hex" data="00"/>
-			<value name="Multi.UseNumbers" type="hex" data="01"/>
-			<value name="Multi.UseWinTab" type="hex" data="00"/>
-			<value name="Multi.AutoCreate" type="hex" data="00"/>
-			<value name="Multi.LeaveOnClose" type="hex" data="00"/>
-			<value name="Multi.HideOnClose" type="hex" data="00"/>
-			<value name="Multi.MinByEsc" type="hex" data="00"/>
-			<value name="MapShiftEscToEsc" type="hex" data="01"/>
-			<value name="Multi.Iterate" type="hex" data="01"/>
-			<value name="Multi.SplitWidth" type="hex" data="04"/>
-			<value name="Multi.SplitHeight" type="hex" data="04"/>
-			<value name="KeyboardHooks" type="hex" data="02"/>
-			<value name="FontName" type="string" data="Consolas"/>
-			<value name="FontName2" type="string" data=""/>
-			<value name="FontAutoSize" type="hex" data="00"/>
-			<value name="FontSize" type="ulong" data="14"/>
-			<value name="FontSizeX" type="ulong" data="0"/>
-			<value name="FontUseDpi" type="hex" data="01"/>
-			<value name="FontUseUnits" type="hex" data="01"/>
-			<value name="FontSizeX2" type="ulong" data="0"/>
-			<value name="FontSizeX3" type="ulong" data="0"/>
-			<value name="FontCharSet" type="hex" data="01"/>
-			<value name="Anti-aliasing" type="ulong" data="6"/>
-			<value name="FontBold" type="hex" data="00"/>
-			<value name="FontItalic" type="hex" data="00"/>
-			<value name="Monospace" type="hex" data="01"/>
-			<value name="CompressLongStrings" type="hex" data="01"/>
-			<value name="BackGround Image show" type="hex" data="01"/>
-			<value name="BackGround Image" type="string" data="ConEmu.jpg"/>
-			<value name="bgImageDarker" type="hex" data="60"/>
-			<value name="bgImageColors" type="dword" data="ffffffff"/>
-			<value name="bgOperation" type="hex" data="07"/>
-			<value name="bgPluginAllowed" type="hex" data="01"/>
-			<value name="AlphaValue" type="hex" data="ff"/>
-			<value name="AlphaValueSeparate" type="hex" data="00"/>
-			<value name="AlphaValueInactive" type="hex" data="92"/>
-			<value name="UserScreenTransparent" type="hex" data="00"/>
-			<value name="ColorKeyTransparent" type="hex" data="00"/>
-			<value name="ColorKeyValue" type="dword" data="00010101"/>
-			<value name="UseCurrentSizePos" type="hex" data="01"/>
-			<value name="AutoSaveSizePos" type="hex" data="00"/>
-			<value name="Cascaded" type="hex" data="00"/>
-			<value name="IntegralSize" type="hex" data="00"/>
-			<value name="WindowMode" type="dword" data="00000520"/>
-			<value name="ConWnd X" type="long" data="6"/>
-			<value name="ConWnd Y" type="long" data="6"/>
-			<value name="LastMonitor" type="string" data="0,0,1440,900"/>
-			<value name="ConWnd Width" type="dword" data="0200004b"/>
-			<value name="ConWnd Height" type="dword" data="02000033"/>
-			<value name="16bit Height" type="ulong" data="0"/>
-			<value name="QuakeStyle" type="hex" data="00"/>
-			<value name="Restore2ActiveMon" type="hex" data="00"/>
-			<value name="QuakeAnimation" type="ulong" data="300"/>
-			<value name="HideCaption" type="hex" data="01"/>
-			<value name="HideChildCaption" type="hex" data="01"/>
-			<value name="FocusInChildWindows" type="hex" data="01"/>
-			<value name="HideCaptionAlways" type="hex" data="00"/>
-			<value name="HideCaptionAlwaysFrame" type="hex" data="ff"/>
-			<value name="HideCaptionAlwaysDelay" type="ulong" data="2000"/>
-			<value name="HideCaptionAlwaysDisappear" type="ulong" data="2000"/>
-			<value name="DownShowHiddenMessage" type="hex" data="00"/>
-			<value name="DownShowExOnTopMessage" type="hex" data="00"/>
-			<value name="ConsoleFontName" type="string" data="Lucida Console"/>
-			<value name="ConsoleFontWidth" type="long" data="3"/>
-			<value name="ConsoleFontHeight" type="long" data="5"/>
-			<value name="DefaultBufferHeight" type="long" data="1000"/>
-			<value name="AutoBufferHeight" type="hex" data="01"/>
-			<value name="UseScrollLock" type="hex" data="01"/>
-			<value name="CmdOutputCP" type="long" data="0"/>
-			<value name="ComSpec.Type" type="hex" data="00"/>
-			<value name="ComSpec.Bits" type="hex" data="00"/>
-			<value name="ComSpec.UpdateEnv" type="hex" data="00"/>
-			<value name="ComSpec.EnvAddPath" type="hex" data="01"/>
-			<value name="ComSpec.EnvAddExePath" type="hex" data="01"/>
-			<value name="ComSpec.UncPaths" type="hex" data="00"/>
-			<value name="ComSpec.Path" type="string" data=""/>
-			<value name="EnvironmentSet" type="multi">
-				<line data="set PATH=%ConEmuBaseDir%\Scripts;%PATH%"/>
-			</value>
-			<value name="CTS.Intelligent" type="hex" data="01"/>
-			<value name="CTS.IntelligentExceptions" type="string" data="far|vim"/>
-			<value name="CTS.AutoCopy" type="hex" data="01"/>
-			<value name="CTS.ResetOnRelease" type="hex" data="01"/>
-			<value name="CTS.IBeam" type="hex" data="01"/>
-			<value name="CTS.EndOnTyping" type="hex" data="00"/>
-			<value name="CTS.EndOnKeyPress" type="hex" data="00"/>
-			<value name="CTS.EraseBeforeReset" type="hex" data="01"/>
-			<value name="CTS.Freeze" type="hex" data="00"/>
-			<value name="CTS.SelectBlock" type="hex" data="01"/>
-			<value name="CTS.SelectText" type="hex" data="01"/>
-			<value name="CTS.HtmlFormat" type="hex" data="00"/>
-			<value name="CTS.ForceLocale" type="dword" data="00000000"/>
-			<value name="CTS.RBtnAction" type="hex" data="03"/>
-			<value name="CTS.MBtnAction" type="hex" data="00"/>
-			<value name="CTS.ColorIndex" type="hex" data="e0"/>
-			<value name="ClipboardConfirmEnter" type="hex" data="01"/>
-			<value name="ClipboardConfirmLonger" type="ulong" data="200"/>
-			<value name="FarGotoEditorOpt" type="hex" data="01"/>
-			<value name="FarGotoEditorPath" type="string" data="far.exe /e%1:%2 &quot;%3&quot;"/>
-			<value name="HighlightMouseRow" type="hex" data="00"/>
-			<value name="HighlightMouseCol" type="hex" data="00"/>
-			<value name="FixFarBorders" type="hex" data="01"/>
-			<value name="Anti-aliasing2" type="hex" data="00"/>
-			<value name="FixFarBordersRanges" type="string" data="2013-25C4;"/>
-			<value name="ExtendUCharMap" type="hex" data="01"/>
-			<value name="EnhanceGraphics" type="hex" data="01"/>
-			<value name="EnhanceButtons" type="hex" data="00"/>
-			<value name="PartBrush75" type="hex" data="c8"/>
-			<value name="PartBrush50" type="hex" data="96"/>
-			<value name="PartBrush25" type="hex" data="5a"/>
-			<value name="PartBrushBlack" type="hex" data="20"/>
-			<value name="RightClick opens context menu" type="hex" data="02"/>
-			<value name="RightClickMacro2" type="string" data=""/>
-			<value name="SendAltTab" type="hex" data="00"/>
-			<value name="SendAltEsc" type="hex" data="00"/>
-			<value name="SendAltPrintScrn" type="hex" data="00"/>
-			<value name="SendPrintScrn" type="hex" data="00"/>
-			<value name="SendCtrlEsc" type="hex" data="00"/>
-			<value name="Min2Tray" type="hex" data="00"/>
-			<value name="AlwaysShowTrayIcon" type="hex" data="00"/>
-			<value name="SafeFarClose" type="hex" data="01"/>
-			<value name="SafeFarCloseMacro" type="string" data=""/>
-			<value name="FARuseASCIIsort" type="hex" data="00"/>
-			<value name="ShellNoZoneCheck" type="hex" data="00"/>
-			<value name="FixAltOnAltTab" type="hex" data="00"/>
-			<value name="UseAltGrayPlus" type="hex" data="01"/>
-			<value name="DisableMouse" type="hex" data="00"/>
-			<value name="RSelectionFix" type="hex" data="01"/>
-			<value name="MouseSkipActivation" type="hex" data="01"/>
-			<value name="MouseSkipMoving" type="hex" data="01"/>
-			<value name="MouseDragWindow" type="hex" data="01"/>
-			<value name="FarHourglass" type="hex" data="01"/>
-			<value name="FarHourglassDelay" type="ulong" data="500"/>
-			<value name="Dnd" type="hex" data="01"/>
-			<value name="DndDrop" type="hex" data="01"/>
-			<value name="DefCopy" type="hex" data="01"/>
-			<value name="DropUseMenu" type="hex" data="02"/>
-			<value name="DragOverlay" type="hex" data="01"/>
-			<value name="DragShowIcons" type="hex" data="01"/>
-			<value name="DebugSteps" type="hex" data="00"/>
-			<value name="DebugLog" type="hex" data="00"/>
-			<value name="DragPanel" type="hex" data="02"/>
-			<value name="DragPanelBothEdges" type="hex" data="00"/>
-			<value name="KeyBarRClick" type="hex" data="01"/>
-			<value name="StatusBar.Show" type="hex" data="00"/>
-			<value name="StatusBar.Flags" type="dword" data="00000002"/>
-			<value name="StatusFontFace" type="string" data="Segoe UI"/>
-			<value name="StatusFontCharSet" type="ulong" data="0"/>
-			<value name="StatusFontHeight" type="long" data="12"/>
-			<value name="StatusBar.Color.Back" type="dword" data="00423607"/>
-			<value name="StatusBar.Color.Light" type="dword" data="00e3f6fd"/>
-			<value name="StatusBar.Color.Dark" type="dword" data="00a1a193"/>
-			<value name="StatusBar.Hide.VCon" type="hex" data="00"/>
-			<value name="StatusBar.Hide.CapsL" type="hex" data="01"/>
-			<value name="StatusBar.Hide.NumL" type="hex" data="00"/>
-			<value name="StatusBar.Hide.ScrL" type="hex" data="01"/>
-			<value name="StatusBar.Hide.VisL" type="hex" data="01"/>
-			<value name="StatusBar.Hide.Lang" type="hex" data="01"/>
-			<value name="StatusBar.Hide.KeyHooks" type="hex" data="01"/>
-			<value name="StatusBar.Hide.TMode" type="hex" data="01"/>
-			<value name="StatusBar.Hide.RMode" type="hex" data="01"/>
-			<value name="StatusBar.Hide.WPos" type="hex" data="01"/>
-			<value name="StatusBar.Hide.WSize" type="hex" data="01"/>
-			<value name="StatusBar.Hide.WClient" type="hex" data="01"/>
-			<value name="StatusBar.Hide.WWork" type="hex" data="01"/>
-			<value name="StatusBar.Hide.WVBack" type="hex" data="01"/>
-			<value name="StatusBar.Hide.WVDC" type="hex" data="01"/>
-			<value name="StatusBar.Hide.Style" type="hex" data="01"/>
-			<value name="StatusBar.Hide.StyleEx" type="hex" data="01"/>
-			<value name="StatusBar.Hide.hFore" type="hex" data="01"/>
-			<value name="StatusBar.Hide.hFocus" type="hex" data="01"/>
-			<value name="StatusBar.Hide.Zoom" type="hex" data="01"/>
-			<value name="StatusBar.Hide.Dpi" type="hex" data="01"/>
-			<value name="StatusBar.Hide.ABuf" type="hex" data="00"/>
-			<value name="StatusBar.Hide.CPos" type="hex" data="01"/>
-			<value name="StatusBar.Hide.CSize" type="hex" data="00"/>
-			<value name="StatusBar.Hide.BSize" type="hex" data="01"/>
-			<value name="StatusBar.Hide.CurX" type="hex" data="01"/>
-			<value name="StatusBar.Hide.CurY" type="hex" data="01"/>
-			<value name="StatusBar.Hide.CurS" type="hex" data="01"/>
-			<value name="StatusBar.Hide.CurI" type="hex" data="00"/>
-			<value name="StatusBar.Hide.ConEmuPID" type="hex" data="01"/>
-			<value name="StatusBar.Hide.ConEmuHWND" type="hex" data="01"/>
-			<value name="StatusBar.Hide.ConEmuView" type="hex" data="01"/>
-			<value name="StatusBar.Hide.Srv" type="hex" data="00"/>
-			<value name="StatusBar.Hide.SrvHWND" type="hex" data="01"/>
-			<value name="StatusBar.Hide.Transparency" type="hex" data="00"/>
-			<value name="StatusBar.Hide.New" type="hex" data="00"/>
-			<value name="StatusBar.Hide.Sync" type="hex" data="00"/>
-			<value name="StatusBar.Hide.Proc" type="hex" data="00"/>
-			<value name="StatusBar.Hide.Title" type="hex" data="01"/>
-			<value name="StatusBar.Hide.Time" type="hex" data="01"/>
-			<value name="StatusBar.Hide.Resize" type="hex" data="00"/>
-			<value name="Tabs" type="hex" data="00"/>
-			<value name="TabsLocation" type="hex" data="00"/>
-			<value name="TabIcons" type="hex" data="01"/>
-			<value name="OneTabPerGroup" type="hex" data="00"/>
-			<value name="ActivateSplitMouseOver" type="hex" data="01"/>
-			<value name="TabSelf" type="hex" data="01"/>
-			<value name="TabLazy" type="hex" data="01"/>
-			<value name="TabFlashChanged" type="long" data="8"/>
-			<value name="TabRecent" type="hex" data="01"/>
-			<value name="TabDblClick" type="ulong" data="1"/>
-			<value name="TabBtnDblClick" type="ulong" data="0"/>
-			<value name="TabsOnTaskBar" type="hex" data="02"/>
-			<value name="TaskBarOverlay" type="hex" data="01"/>
-			<value name="TaskbarProgress" type="hex" data="01"/>
-			<value name="TabCloseMacro" type="string" data=""/>
-			<value name="TabFontFace" type="string" data="Segoe UI"/>
-			<value name="TabFontCharSet" type="ulong" data="0"/>
-			<value name="TabFontHeight" type="long" data="13"/>
-			<value name="SaveAllEditors" type="string" data=""/>
-			<value name="ToolbarAddSpace" type="long" data="0"/>
-			<value name="TabConsole" type="string" data="&lt;%c&gt; %s"/>
-			<value name="TabModifiedSuffix" type="string" data="[*]"/>
-			<value name="TabSkipWords" type="string" data="Administrator:|Администратор:"/>
-			<value name="TabPanels" type="string" data="&lt;%c&gt; %s"/>
-			<value name="TabEditor" type="string" data="&lt;%c.%i&gt;{%s}"/>
-			<value name="TabEditorModified" type="string" data="&lt;%c.%i&gt;[%s] *"/>
-			<value name="TabViewer" type="string" data="&lt;%c.%i&gt;[%s]"/>
-			<value name="TabLenMax" type="ulong" data="20"/>
-			<value name="AdminTitleSuffix" type="string" data=" (Admin)"/>
-			<value name="AdminShowShield" type="hex" data="01"/>
-			<value name="HideInactiveConsoleTabs" type="hex" data="00"/>
-			<value name="ShowFarWindows" type="hex" data="01"/>
-			<value name="TryToCenter" type="hex" data="00"/>
-			<value name="CenterConsolePad" type="ulong" data="0"/>
-			<value name="ShowScrollbar" type="hex" data="02"/>
-			<value name="ScrollBarAppearDelay" type="ulong" data="100"/>
-			<value name="ScrollBarDisappearDelay" type="ulong" data="200"/>
-			<value name="IconID" type="ulong" data="1"/>
-			<value name="MainTimerElapse" type="ulong" data="10"/>
-			<value name="MainTimerInactiveElapse" type="ulong" data="1000"/>
-			<value name="AffinityMask" type="dword" data="00000000"/>
-			<value name="SkipFocusEvents" type="hex" data="00"/>
-			<value name="MonitorConsoleLang" type="hex" data="03"/>
-			<value name="SnapToDesktopEdges" type="hex" data="00"/>
-			<value name="AlwaysOnTop" type="hex" data="00"/>
-			<value name="SleepInBackground" type="hex" data="00"/>
-			<value name="RetardInactivePanes" type="hex" data="00"/>
-			<value name="MinimizeOnLoseFocus" type="hex" data="00"/>
-			<value name="DisableFarFlashing" type="hex" data="00"/>
-			<value name="DisableAllFlashing" type="hex" data="00"/>
-			<value name="FindText" type="string" data=""/>
-			<value name="FindMatchCase" type="hex" data="00"/>
-			<value name="FindMatchWholeWords" type="hex" data="00"/>
-			<value name="FindTransparent" type="hex" data="01"/>
-			<value name="PanView.BackColor" type="dword" data="30ffffff"/>
-			<value name="PanView.PFrame" type="long" data="1"/>
-			<value name="PanView.PFrameColor" type="dword" data="28808080"/>
-			<value name="PanView.SFrame" type="long" data="1"/>
-			<value name="PanView.SFrameColor" type="dword" data="07c0c0c0"/>
-			<value name="PanView.Thumbs.ImgSize" type="long" data="96"/>
-			<value name="PanView.Thumbs.SpaceX1" type="long" data="1"/>
-			<value name="PanView.Thumbs.SpaceY1" type="long" data="1"/>
-			<value name="PanView.Thumbs.SpaceX2" type="long" data="5"/>
-			<value name="PanView.Thumbs.SpaceY2" type="long" data="20"/>
-			<value name="PanView.Thumbs.LabelSpacing" type="long" data="2"/>
-			<value name="PanView.Thumbs.LabelPadding" type="long" data="0"/>
-			<value name="PanView.Thumbs.FontName" type="string" data="Segoe UI"/>
-			<value name="PanView.Thumbs.FontHeight" type="long" data="14"/>
-			<value name="PanView.Tiles.ImgSize" type="long" data="48"/>
-			<value name="PanView.Tiles.SpaceX1" type="long" data="4"/>
-			<value name="PanView.Tiles.SpaceY1" type="long" data="4"/>
-			<value name="PanView.Tiles.SpaceX2" type="long" data="172"/>
-			<value name="PanView.Tiles.SpaceY2" type="long" data="4"/>
-			<value name="PanView.Tiles.LabelSpacing" type="long" data="4"/>
-			<value name="PanView.Tiles.LabelPadding" type="long" data="1"/>
-			<value name="PanView.Tiles.FontName" type="string" data="Segoe UI"/>
-			<value name="PanView.Tiles.FontHeight" type="long" data="14"/>
-			<value name="PanView.LoadPreviews" type="hex" data="03"/>
-			<value name="PanView.LoadFolders" type="hex" data="01"/>
-			<value name="PanView.LoadTimeout" type="ulong" data="15"/>
-			<value name="PanView.MaxZoom" type="ulong" data="600"/>
-			<value name="PanView.UsePicView2" type="hex" data="01"/>
-			<value name="PanView.RestoreOnStartup" type="hex" data="00"/>
-			<value name="Update.VerLocation" type="string" data=""/>
-			<value name="Update.CheckOnStartup" type="hex" data="00"/>
-			<value name="Update.CheckHourly" type="hex" data="00"/>
-			<value name="Update.ConfirmDownload" type="hex" data="01"/>
-			<value name="Update.UseBuilds" type="hex" data="02"/>
-			<value name="Update.InetTool" type="hex" data="00"/>
-			<value name="Update.InetToolCmd" type="string" data=""/>
-			<value name="Update.UseProxy" type="hex" data="00"/>
-			<value name="Update.Proxy" type="string" data=""/>
-			<value name="Update.ProxyUser" type="string" data=""/>
-			<value name="Update.ProxyPassword" type="string" data=""/>
-			<value name="Update.ExeCmdLine" type="string" data=""/>
-			<value name="Update.ArcCmdLine" type="string" data=""/>
-			<value name="Update.DownloadPath" type="string" data="%TEMP%\ConEmu"/>
-			<value name="Update.LeavePackages" type="hex" data="00"/>
-			<value name="Update.PostUpdateCmd" type="string" data="echo Last successful update&gt;ConEmuUpdate.info &amp;&amp; date /t&gt;&gt;ConEmuUpdate.info &amp;&amp; time /t&gt;&gt;ConEmuUpdate.info"/>
-			<key name="HotKeys" modified="2017-02-26 11:32:01" build="170118">
-				<value name="KeyMacroVersion" type="hex" data="02"/>
-				<value name="Multi.Modifier" type="dword" data="0000005b"/>
-				<value name="Multi.ArrowsModifier" type="dword" data="0000005b"/>
-				<value name="MinimizeRestore" type="dword" data="000011c0"/>
-				<value name="MinimizeRestore2" type="dword" data="00000000"/>
-				<value name="GlobalRestore" type="dword" data="00000000"/>
-				<value name="CdExplorerPath" type="dword" data="00000000"/>
-				<value name="ForcedFullScreen" type="dword" data="12115b0d"/>
-				<value name="SwitchGuiFocus" type="dword" data="00005b5a"/>
-				<value name="SetFocusGui" type="dword" data="00000000"/>
-				<value name="SetFocusChild" type="dword" data="00000000"/>
-				<value name="ChildSystemMenu" type="dword" data="00000000"/>
-				<value name="Multi.NewConsole" type="dword" data="00005b57"/>
-				<value name="Multi.NewConsoleShift" type="dword" data="00105b57"/>
-				<value name="Multi.CmdKey" type="dword" data="00005b58"/>
-				<value name="Multi.NewWindow" type="dword" data="00000000"/>
-				<value name="Multi.NewConsolePopup" type="dword" data="00005b4e"/>
-				<value name="Multi.NewConsolePopup2" type="dword" data="00000000"/>
-				<value name="Multi.NewAttach" type="dword" data="00005b47"/>
-				<value name="Multi.NewSplitV" type="dword" data="0010114f"/>
-				<value name="Multi.NewSplitH" type="dword" data="00101145"/>
-				<value name="Multi.SplitMaximize" type="dword" data="00005d0d"/>
-				<value name="Multi.SplitSizeVU" type="dword" data="00105d26"/>
-				<value name="Multi.SplitSizeVD" type="dword" data="00105d28"/>
-				<value name="Multi.SplitSizeHL" type="dword" data="00105d25"/>
-				<value name="Multi.SplitSizeHR" type="dword" data="00105d27"/>
-				<value name="Key.TabPane1" type="dword" data="00005d09"/>
-				<value name="Key.TabPane2" type="dword" data="00105d09"/>
-				<value name="Multi.SplitFocusU" type="dword" data="00005d26"/>
-				<value name="Multi.SplitFocusD" type="dword" data="00005d28"/>
-				<value name="Multi.SplitFocusL" type="dword" data="00005d25"/>
-				<value name="Multi.SplitFocusR" type="dword" data="00005d27"/>
-				<value name="Multi.Next" type="dword" data="00005b51"/>
-				<value name="Multi.NextShift" type="dword" data="00105b51"/>
-				<value name="Multi.Recreate" type="dword" data="00005bc0"/>
-				<value name="Multi.AltCon" type="dword" data="00005b41"/>
-				<value name="Multi.Pause" type="dword" data="80808013"/>
-				<value name="Multi.Scroll" type="dword" data="00000000"/>
-				<value name="Multi.GroupInput" type="dword" data="00005d47"/>
-				<value name="Multi.Detach" type="dword" data="00000000"/>
-				<value name="Multi.Unfasten" type="dword" data="00000000"/>
-				<value name="Multi.Close" type="dword" data="00005b2e"/>
-				<value name="CloseTabKey" type="dword" data="00125b2e"/>
-				<value name="CloseGroupKey" type="dword" data="00115b2e"/>
-				<value name="CloseGroupPrcKey" type="dword" data="00000000"/>
-				<value name="CloseAllConKey" type="dword" data="00000000"/>
-				<value name="CloseZombiesKey" type="dword" data="00000000"/>
-				<value name="CloseExceptConKey" type="dword" data="00000000"/>
-				<value name="KillProcessKey" type="dword" data="00121103"/>
-				<value name="KillAllButShellKey" type="dword" data="00125b13"/>
-				<value name="DuplicateRootKey" type="dword" data="00005b53"/>
-				<value name="CloseConEmuKey" type="dword" data="00005b73"/>
-				<value name="Multi.Rename" type="dword" data="00005d52"/>
-				<value name="AffinityPriorityKey" type="dword" data="00005d41"/>
-				<value name="Multi.MoveLeft" type="dword" data="00125b25"/>
-				<value name="Multi.MoveRight" type="dword" data="00125b27"/>
-				<value name="CTS.VkBlockStart" type="dword" data="00000000"/>
-				<value name="CTS.VkTextStart" type="dword" data="00000000"/>
-				<value name="CTS.VkCopyFmt0" type="dword" data="00001143"/>
-				<value name="CTS.VkCopyFmt1" type="dword" data="00101143"/>
-				<value name="CTS.VkCopyFmt2" type="dword" data="00000000"/>
-				<value name="CTS.VkCopyAll" type="dword" data="00000000"/>
-				<value name="HighlightMouseSwitch" type="dword" data="00005d4c"/>
-				<value name="HighlightMouseSwitchX" type="dword" data="00005d58"/>
-				<value name="Multi.ShowTabsList" type="dword" data="00000000"/>
-				<value name="Multi.ShowTabsList2" type="dword" data="00005d7b"/>
-				<value name="ClipboardVkAllLines" type="dword" data="0000102d"/>
-				<value name="ClipboardVkFirstLine" type="dword" data="00001156"/>
-				<value name="Key.AltNumpad" type="dword" data="00000000"/>
-				<value name="DeleteWordToLeft" type="dword" data="00001108"/>
-				<value name="FindTextKey" type="dword" data="00005d46"/>
-				<value name="ScreenshotKey" type="dword" data="00005b48"/>
-				<value name="ScreenshotFullKey" type="dword" data="00105b48"/>
-				<value name="ShowStatusBarKey" type="dword" data="00005d53"/>
-				<value name="ShowTabBarKey" type="dword" data="00005d54"/>
-				<value name="ShowCaptionKey" type="dword" data="00005d43"/>
-				<value name="AlwaysOnTopKey" type="dword" data="00000000"/>
-				<value name="TransparencyInc" type="dword" data="00000000"/>
-				<value name="TransparencyDec" type="dword" data="00000000"/>
-				<value name="Key.TabMenu" type="dword" data="00005d20"/>
-				<value name="Key.TabMenu2" type="dword" data="00001002"/>
-				<value name="Key.Maximize" type="dword" data="00001278"/>
-				<value name="Key.MaximizeWidth" type="dword" data="00105b28"/>
-				<value name="Key.MaximizeHeight" type="dword" data="00105b26"/>
-				<value name="Key.TileToLeft" type="dword" data="00005b25"/>
-				<value name="Key.TileToRight" type="dword" data="00005b27"/>
-				<value name="Key.JumpActiveMonitor" type="dword" data="00000000"/>
-				<value name="Key.JumpPrevMonitor" type="dword" data="00105b25"/>
-				<value name="Key.JumpNextMonitor" type="dword" data="00105b27"/>
-				<value name="Key.FullScreen" type="dword" data="0000120d"/>
-				<value name="Key.SysMenu" type="dword" data="00001220"/>
-				<value name="Key.SysMenu2" type="dword" data="00001102"/>
-				<value name="Key.DebugProcess" type="dword" data="00105b44"/>
-				<value name="Key.DumpProcess" type="dword" data="00000000"/>
-				<value name="Key.DumpTree" type="dword" data="00000000"/>
-				<value name="Key.BufUp" type="dword" data="00001126"/>
-				<value name="Key.BufDn" type="dword" data="00001128"/>
-				<value name="Key.BufPgUp" type="dword" data="00001121"/>
-				<value name="Key.BufPgDn" type="dword" data="00001122"/>
-				<value name="Key.BufHfPgUp" type="dword" data="00005d21"/>
-				<value name="Key.BufHfPgDn" type="dword" data="00005d22"/>
-				<value name="Key.BufTop" type="dword" data="00005d24"/>
-				<value name="Key.BufBottom" type="dword" data="00005d23"/>
-				<value name="Key.BufCursor" type="dword" data="00005d08"/>
-				<value name="Key.ResetTerm" type="dword" data="00000000"/>
-				<value name="FontLargerKey" type="dword" data="000011d0"/>
-				<value name="FontSmallerKey" type="dword" data="000011d1"/>
-				<value name="FontOriginalKey" type="dword" data="00001104"/>
-				<value name="PasteFileKey" type="dword" data="00101146"/>
-				<value name="PastePathKey" type="dword" data="00101144"/>
-				<value name="PasteCygwinKey" type="dword" data="00005d2d"/>
-				<value name="KeyMacro01" type="dword" data="00000000"/>
-				<value name="KeyMacro01.Text" type="string" data=""/>
-				<value name="KeyMacro02" type="dword" data="00000000"/>
-				<value name="KeyMacro02.Text" type="string" data=""/>
-				<value name="KeyMacro03" type="dword" data="00000000"/>
-				<value name="KeyMacro03.Text" type="string" data=""/>
-				<value name="KeyMacro04" type="dword" data="00000000"/>
-				<value name="KeyMacro04.Text" type="string" data=""/>
-				<value name="KeyMacro05" type="dword" data="00000000"/>
-				<value name="KeyMacro05.Text" type="string" data=""/>
-				<value name="KeyMacro06" type="dword" data="00000000"/>
-				<value name="KeyMacro06.Text" type="string" data=""/>
-				<value name="KeyMacro07" type="dword" data="00000000"/>
-				<value name="KeyMacro07.Text" type="string" data=""/>
-				<value name="KeyMacro08" type="dword" data="00000000"/>
-				<value name="KeyMacro08.Text" type="string" data=""/>
-				<value name="KeyMacro09" type="dword" data="00000000"/>
-				<value name="KeyMacro09.Text" type="string" data=""/>
-				<value name="KeyMacro10" type="dword" data="00000000"/>
-				<value name="KeyMacro10.Text" type="string" data=""/>
-				<value name="KeyMacro11" type="dword" data="00000000"/>
-				<value name="KeyMacro11.Text" type="string" data=""/>
-				<value name="KeyMacro12" type="dword" data="00000000"/>
-				<value name="KeyMacro12.Text" type="string" data=""/>
-				<value name="KeyMacro13" type="dword" data="00000000"/>
-				<value name="KeyMacro13.Text" type="string" data=""/>
-				<value name="KeyMacro14" type="dword" data="00000000"/>
-				<value name="KeyMacro14.Text" type="string" data=""/>
-				<value name="KeyMacro15" type="dword" data="00000000"/>
-				<value name="KeyMacro15.Text" type="string" data=""/>
-				<value name="KeyMacro16" type="dword" data="00000000"/>
-				<value name="KeyMacro16.Text" type="string" data=""/>
-				<value name="KeyMacro17" type="dword" data="00000000"/>
-				<value name="KeyMacro17.Text" type="string" data=""/>
-				<value name="KeyMacro18" type="dword" data="00000000"/>
-				<value name="KeyMacro18.Text" type="string" data=""/>
-				<value name="KeyMacro19" type="dword" data="00000000"/>
-				<value name="KeyMacro19.Text" type="string" data=""/>
-				<value name="KeyMacro20" type="dword" data="00000000"/>
-				<value name="KeyMacro20.Text" type="string" data=""/>
-				<value name="KeyMacro21" type="dword" data="00000000"/>
-				<value name="KeyMacro21.Text" type="string" data=""/>
-				<value name="KeyMacro22" type="dword" data="00000000"/>
-				<value name="KeyMacro22.Text" type="string" data=""/>
-				<value name="KeyMacro23" type="dword" data="00000000"/>
-				<value name="KeyMacro23.Text" type="string" data=""/>
-				<value name="KeyMacro24" type="dword" data="00000000"/>
-				<value name="KeyMacro24.Text" type="string" data=""/>
-				<value name="KeyMacro25" type="dword" data="00000000"/>
-				<value name="KeyMacro25.Text" type="string" data=""/>
-				<value name="KeyMacro26" type="dword" data="00000000"/>
-				<value name="KeyMacro26.Text" type="string" data=""/>
-				<value name="KeyMacro27" type="dword" data="00000000"/>
-				<value name="KeyMacro27.Text" type="string" data=""/>
-				<value name="KeyMacro28" type="dword" data="00000000"/>
-				<value name="KeyMacro28.Text" type="string" data=""/>
-				<value name="KeyMacro29" type="dword" data="00000000"/>
-				<value name="KeyMacro29.Text" type="string" data=""/>
-				<value name="KeyMacro30" type="dword" data="00000000"/>
-				<value name="KeyMacro30.Text" type="string" data=""/>
-				<value name="KeyMacro31" type="dword" data="00000000"/>
-				<value name="KeyMacro31.Text" type="string" data=""/>
-				<value name="KeyMacro32" type="dword" data="00000000"/>
-				<value name="KeyMacro32.Text" type="string" data=""/>
-				<value name="CTS.VkBlock" type="hex" data="a4"/>
-				<value name="CTS.VkText" type="hex" data="a0"/>
-				<value name="CTS.VkAct" type="hex" data="00"/>
-				<value name="CTS.VkPrompt" type="hex" data="00"/>
-				<value name="FarGotoEditorVk" type="hex" data="a2"/>
-				<value name="DndLKey" type="hex" data="00"/>
-				<value name="DndRKey" type="hex" data="a2"/>
-				<value name="WndDragKey" type="dword" data="00121101"/>
-			</key>
-			<key name="Tasks" modified="2017-02-26 11:32:01" build="170118">
-				<value name="Count" type="long" data="9"/>
-				<key name="Task1" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Shells::cmd}"/>
-					<value name="Flags" type="dword" data="00000002"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="cmd.exe /k &quot;%ConEmuBaseDir%\CmdInit.cmd&quot;"/>
-					<value name="Active" type="long" data="0"/>
-					<value name="Count" type="long" data="1"/>
-				</key>
-				<key name="Task2" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Shells::cmd (Admin)}"/>
-					<value name="Flags" type="dword" data="00000004"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="cmd.exe /k &quot;%ConEmuBaseDir%\CmdInit.cmd&quot; -new_console:a"/>
-					<value name="Active" type="long" data="0"/>
-					<value name="Count" type="long" data="1"/>
-				</key>
-				<key name="Task3" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Shells::cmd-32}"/>
-					<value name="Flags" type="dword" data="00000004"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="&quot;%windir%\syswow64\cmd.exe&quot; /k &quot;%ConEmuBaseDir%\CmdInit.cmd&quot;"/>
-					<value name="Active" type="long" data="0"/>
-					<value name="Count" type="long" data="1"/>
-				</key>
-				<key name="Task4" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Shells::cmd 64/32}"/>
-					<value name="Flags" type="dword" data="00000004"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="&gt; &quot;%windir%\system32\cmd.exe&quot; /k &quot;&quot;%ConEmuBaseDir%\CmdInit.cmd&quot; &amp; echo This is Native cmd.exe&quot;"/>
-					<value name="Cmd2" type="string" data="&quot;%windir%\syswow64\cmd.exe&quot; /k &quot;&quot;%ConEmuBaseDir%\CmdInit.cmd&quot; &amp; echo This is 32 bit cmd.exe -new_console:s50V&quot;"/>
-					<value name="Active" type="long" data="1"/>
-					<value name="Count" type="long" data="2"/>
-				</key>
-				<key name="Task5" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Shells::PowerShell}"/>
-					<value name="Flags" type="dword" data="00000004"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="powershell.exe"/>
-					<value name="Active" type="long" data="0"/>
-					<value name="Count" type="long" data="1"/>
-				</key>
-				<key name="Task6" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Shells::PowerShell (Admin)}"/>
-					<value name="Flags" type="dword" data="00000004"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="powershell.exe -new_console:a"/>
-					<value name="Active" type="long" data="0"/>
-					<value name="Count" type="long" data="1"/>
-				</key>
-				<key name="Task7" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Bash::Git bash}"/>
-					<value name="Flags" type="dword" data="00000004"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="&quot;%ConEmuDrive%\Program Files\Git\git-cmd.exe&quot; --no-cd --command=usr/bin/bash.exe -l -i"/>
-					<value name="Active" type="long" data="0"/>
-					<value name="Count" type="long" data="1"/>
-				</key>
-				<key name="Task8" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Helper::Show ANSI colors}"/>
-					<value name="Flags" type="dword" data="00000004"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="cmd.exe /k type &quot;%ConEmuBaseDir%\Addons\AnsiColors16t.ans&quot; -cur_console:n"/>
-					<value name="Active" type="long" data="0"/>
-					<value name="Count" type="long" data="1"/>
-				</key>
-				<key name="Task9" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="{Tools::Chocolatey (Admin)}"/>
-					<value name="Flags" type="dword" data="00000004"/>
-					<value name="Hotkey" type="dword" data="00000000"/>
-					<value name="GuiArgs" type="string" data=""/>
-					<value name="Cmd1" type="string" data="*cmd.exe /k Title Chocolatey &amp; &quot;%ConEmuBaseDir%\Addons\ChocolateyAbout.cmd&quot;"/>
-					<value name="Active" type="long" data="0"/>
-					<value name="Count" type="long" data="1"/>
-				</key>
-			</key>
-			<key name="Apps" modified="2017-02-26 11:32:01" build="170118">
-				<value name="Count" type="long" data="0"/>
-			</key>
-			<key name="Colors" modified="2017-02-26 11:32:01" build="170118">
-				<value name="Count" type="long" data="2"/>
-				<key name="Palette1" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="moe-dark"/>
-					<value name="ExtendColors" type="hex" data="00"/>
-					<value name="ExtendColorIdx" type="hex" data="0e"/>
-					<value name="TextColorIdx" type="hex" data="10"/>
-					<value name="BackColorIdx" type="hex" data="10"/>
-					<value name="PopTextColorIdx" type="hex" data="10"/>
-					<value name="PopBackColorIdx" type="hex" data="10"/>
-					<value name="ColorTable00" type="dword" data="00303030"/>
-					<value name="ColorTable01" type="dword" data="00ff5b1f"/>
-					<value name="ColorTable02" type="dword" data="0000ffaf"/>
-					<value name="ColorTable03" type="dword" data="00ffff87"/>
-					<value name="ColorTable04" type="dword" data="002929ef"/>
-					<value name="ColorTable05" type="dword" data="00ff8ad1"/>
-					<value name="ColorTable06" type="dword" data="000087ff"/>
-					<value name="ColorTable07" type="dword" data="00c6c6c6"/>
-					<value name="ColorTable08" type="dword" data="00b2b2b2"/>
-					<value name="ColorTable09" type="dword" data="00d7af5f"/>
-					<value name="ColorTable10" type="dword" data="0000dba1"/>
-					<value name="ColorTable11" type="dword" data="00afd700"/>
-					<value name="ColorTable12" type="dword" data="004b4bff"/>
-					<value name="ColorTable13" type="dword" data="00a34eff"/>
-					<value name="ColorTable14" type="dword" data="004fe9fc"/>
-					<value name="ColorTable15" type="dword" data="00e7fdfd"/>
-					<value name="ColorTable16" type="dword" data="00000000"/>
-					<value name="ColorTable17" type="dword" data="00000080"/>
-					<value name="ColorTable18" type="dword" data="00008000"/>
-					<value name="ColorTable19" type="dword" data="00008080"/>
-					<value name="ColorTable20" type="dword" data="00800000"/>
-					<value name="ColorTable21" type="dword" data="00800080"/>
-					<value name="ColorTable22" type="dword" data="00808000"/>
-					<value name="ColorTable23" type="dword" data="00c0c0c0"/>
-					<value name="ColorTable24" type="dword" data="00808080"/>
-					<value name="ColorTable25" type="dword" data="000000ff"/>
-					<value name="ColorTable26" type="dword" data="0000ff00"/>
-					<value name="ColorTable27" type="dword" data="0000ffff"/>
-					<value name="ColorTable28" type="dword" data="00ff0000"/>
-					<value name="ColorTable29" type="dword" data="00ff00ff"/>
-					<value name="ColorTable30" type="dword" data="00ffff00"/>
-					<value name="ColorTable31" type="dword" data="00ffffff"/>
-				</key>
-				<key name="Palette2" modified="2017-02-26 11:32:01" build="170118">
-					<value name="Name" type="string" data="moe-light"/>
-					<value name="ExtendColors" type="hex" data="01"/>
-					<value name="ExtendColorIdx" type="hex" data="0b"/>
-					<value name="TextColorIdx" type="hex" data="10"/>
-					<value name="BackColorIdx" type="hex" data="10"/>
-					<value name="PopTextColorIdx" type="hex" data="10"/>
-					<value name="PopBackColorIdx" type="hex" data="10"/>
-					<value name="ColorTable00" type="dword" data="00e7fdfd"/>
-					<value name="ColorTable01" type="dword" data="00ffe5d4"/>
-					<value name="ColorTable02" type="dword" data="0000af00"/>
-					<value name="ColorTable03" type="dword" data="0087af00"/>
-					<value name="ColorTable04" type="dword" data="000000dd"/>
-					<value name="ColorTable05" type="dword" data="00ff089a"/>
-					<value name="ColorTable06" type="dword" data="003387fe"/>
-					<value name="ColorTable07" type="dword" data="00626262"/>
-					<value name="ColorTable08" type="dword" data="00b2b2b2"/>
-					<value name="ColorTable09" type="dword" data="00ff5b1f"/>
-					<value name="ColorTable10" type="dword" data="0000af00"/>
-					<value name="ColorTable11" type="dword" data="00d7af5f"/>
-					<value name="ColorTable12" type="dword" data="002929ef"/>
-					<value name="ColorTable13" type="dword" data="008b1fff"/>
-					<value name="ColorTable14" type="dword" data="003387fe"/>
-					<value name="ColorTable15" type="dword" data="00303030"/>
-					<value name="ColorTable16" type="dword" data="00000000"/>
-					<value name="ColorTable17" type="dword" data="00000080"/>
-					<value name="ColorTable18" type="dword" data="00008000"/>
-					<value name="ColorTable19" type="dword" data="00008080"/>
-					<value name="ColorTable20" type="dword" data="00800000"/>
-					<value name="ColorTable21" type="dword" data="00800080"/>
-					<value name="ColorTable22" type="dword" data="00808000"/>
-					<value name="ColorTable23" type="dword" data="00c0c0c0"/>
-					<value name="ColorTable24" type="dword" data="00808080"/>
-					<value name="ColorTable25" type="dword" data="000000ff"/>
-					<value name="ColorTable26" type="dword" data="0000ff00"/>
-					<value name="ColorTable27" type="dword" data="0000ffff"/>
-					<value name="ColorTable28" type="dword" data="00ff0000"/>
-					<value name="ColorTable29" type="dword" data="00ff00ff"/>
-					<value name="ColorTable30" type="dword" data="00ffff00"/>
-					<value name="ColorTable31" type="dword" data="00ffffff"/>
-				</key>
-			</key>
-			<value name="StatusBar.Hide.CellI" type="hex" data="01"/>
-		</key>
-	</key>
-</key>
--- a/WinPE.jpg
+++ b/WinPE.jpg
--- a/make.cmd
+++ b/make.cmd
@ -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
Author	SHA1	Message	Date
Alan Mason	f608e9b88c	Show title before getting ticket_number	2017-12-01 12:42:46 -08:00
Alan Mason	56c3960451	Bugfix: menu_setup()	2017-12-01 12:42:23 -08:00
Alan Mason	a6f9518648	Bugfix: find_windows_image()	2017-12-01 12:41:39 -08:00
Alan Mason	5d32f3c94a	Bugfix: Abort logic	2017-12-01 12:27:53 -08:00
Alan Mason	97e93e812b	Bugfix: partition_uids import	2017-12-01 12:27:26 -08:00
Alan Mason	06affc3bd1	Bugfix: menu_tools()	2017-12-01 12:26:37 -08:00
Alan Mason	ab6fd19c02	Bugfix: menu_select()	2017-12-01 12:26:11 -08:00
Alan Mason	5aab8a98e3	Bugfix: Was trying to use 'Env' before it was set.	2017-12-01 12:24:11 -08:00
Alan Mason	cd3f3ed8d3	Always more cleanup	2017-12-01 12:02:05 -08:00
Alan Mason	90c4189942	Updated winpe_menus.py & cleanup * Removed "Windows Family" logic * Win7 will now have recovery tools setup * Added format_disk()	2017-12-01 11:05:40 -08:00
Alan Mason	deb7c76ffb	windows_setup.py done	2017-12-01 10:12:59 -08:00
Alan Mason	33924c183e	Updated find_windows_image() & setup_windows() * Merged File and Ext dict entries * Using psutil instead of mountvol	2017-12-01 09:59:19 -08:00
Alan Mason	c09d7ab603	updated functions\backup.py	2017-11-30 23:06:41 -08:00
Alan Mason	c951380482	functions\disk.py done	2017-11-30 23:06:23 -08:00
Alan Mason	a0460d6a82	updated select_disk()	2017-11-30 22:35:16 -08:00
Alan Mason	6903078ee0	updated prep_disk_for_formatting()	2017-11-30 22:19:31 -08:00
Alan Mason	fbedd79aa3	updated scan_disks() * Renamed from get_attached_disk_info()	2017-11-30 22:10:45 -08:00
Alan Mason	e9ff02375f	More letter updates	2017-11-30 21:52:51 -08:00
Alan Mason	deb1e8f4fd	Volume letter updates * Added reassign_letter() * Attempts to reassign a volume to better ensure predictable letters * i.e. Local Windows source volume letter == 'I' * Adjusted code to avoid the "hidden" assign_volume_letters() call in select_disk()	2017-11-30 21:33:55 -08:00
Alan Mason	4ed6d41d10	Updated menu / title sections * Added set_title() which sets window title and global_vars['Title'] * menu_select() will now display global_vars['Title'] above title * (If it exists) * Bugfix: fixed a few bad calls of menu_select()	2017-11-30 21:08:52 -08:00
Alan Mason	850a1fca73	updated menu_backup()	2017-11-30 20:31:46 -08:00
Alan Mason	b96e5f3be6	updated verify_wim_backup()	2017-11-30 20:31:37 -08:00
Alan Mason	7133089d31	updated select_backup_destination()	2017-11-30 20:03:19 -08:00
Alan Mason	c043c3398d	Reordered functions	2017-11-30 19:56:42 -08:00
Alan Mason	67f08c5042	updated prep_disk_for_backup() * Partition['Image Path'] is set to the full destination path * (i.e. ['Image Path'] + '\\' + ['Image File'] * Partition['Image File'] variable has been removed * Simplified ['Backup Warnings'] section * Added fix_path() * Replaces unsupported characters/strings with underscores	2017-11-30 19:45:59 -08:00
Alan Mason	45f0b4d2b1	updated backup_partition()	2017-11-30 17:17:00 -08:00
Alan Mason	80cb9b8cea	Function separation done. * Split backup.py into disk & backup * disk.py is for lower level disk management * Renamed functions\data.py's select_disk() to select_volume() * Avoid name collision with functions\disk.py's select_disk() *	2017-11-30 16:40:40 -08:00
Alan Mason	9a3234c822	Simplified Windows share sections	2017-11-30 16:07:51 -08:00
Alan Mason	520cc4bca0	Merge branch 'dev' into python-overhaul	2017-11-30 16:00:27 -08:00
Alan Mason	d54c9da56f	Set Notepad++ default font	2017-11-30 15:58:47 -08:00
Alan Mason	b5b03e4dfe	Fixed notepad replacement	2017-11-30 15:19:43 -08:00
Alan Mason	a249cdeb7e	Adjusted Notepad++ settings	2017-11-30 14:41:29 -08:00
Alan Mason	e136283a71	Added clear_screen()	2017-11-30 14:40:44 -08:00
Alan Mason	dd20cdd36e	Renamed X:\WK to X:\.bin * Allows functions\common.py to be used as-is	2017-11-30 13:40:22 -08:00
Alan Mason	446867b611	Started Python refactoring # Plan * Use current WizardKit scripts as the new base * Split functions into multiple files under Scripts\functions\ * Review menus and menu-flow * Log everything and open log at end of menu-flows * (before returning to the root/main menu)	2017-11-30 13:39:00 -08:00
Alan Mason	7c7008bdda	Merge branch 'add-update-tools' into dev	2017-11-28 17:51:12 -08:00
Alan Mason	b689c33c96	Bugfix: Updating over current tools is working	2017-11-28 17:49:32 -08:00
Alan Mason	3e63a50f92	Drivers and Killer Drivers * Add-WindowsDriver section to include extra drivers in WinPE * Added Killer Network Driver to the download list * Bugfix: $Drivers was not set properly	2017-11-28 17:48:52 -08:00
Alan Mason	cf69505c3f	Merge branch 'add-update-tools' into dev	2017-11-28 14:59:45 -08:00
Alan Mason	7a58e6e859	Simplified tool downloads	2017-11-28 14:42:42 -08:00
Alan Mason	330b24641f	Bugfix: REG_EXPAND_SZ keys now handled correctly	2017-11-28 14:40:43 -08:00
Alan Mason	675ff57f66	Simplified WinPE package installation	2017-11-28 14:39:33 -08:00
Alan Mason	c4ea4fcd24	Script can now download the tools	2017-11-28 02:10:49 -08:00
Alan Mason	bc33a7fcb3	Disable notepad replacement for now	2017-11-28 01:56:27 -08:00
Alan Mason	7ad26a6182	Fix Q-Dir extraction	2017-11-28 01:55:55 -08:00
Alan Mason	7048696367	Added the rest of the tools	2017-11-28 01:16:40 -08:00
Alan Mason	15c9839bec	Added update section * Needs testing	2017-11-27 23:42:15 -08:00
Alan Mason	8a438dce78	Added "Build PE.cmd" & "build_pe.ps1" * Removed "make.cmd" since the above replace it * Merged WK folders into a single _include folder * This is copied into place for both amd64 and x86 * Using a new method to replace notepad with Notepad++	2017-11-27 20:47:45 -08:00
Alan Mason	97319df29e	Updated .gitignore	2017-11-27 20:42:44 -08:00
Alan Mason	e1536850a6	Removed make.cmd	2017-11-27 20:41:53 -08:00
Alan Mason	3ca0ab2079	Added WinPE.jpg	2017-11-27 20:24:17 -08:00
Alan Mason	613f4eee37	build_pe.ps1 updated and working	2017-11-27 20:24:04 -08:00
Alan Mason	23b7dc89ca	Updated build_pe.ps1	2017-11-27 18:09:30 -08:00
Alan Mason	44514b2fef	Initial PowerShell rewrite done.	2017-11-27 17:04:24 -08:00
Alan Mason	7b12a8ca91	Merged tool settings Extra files for the tools are now stored in WK\_include and copied into place during the build.	2017-11-27 16:03:51 -08:00
Alan Mason	87ac27b5cc	Moving to a new style guide for PowerShell scripts Using this: https://poshcode.gitbooks.io/powershell-practice-and-style/	2017-11-26 14:42:27 -08:00
Alan Mason	1e41954f62	Added Build PE.cmd launch script * Checks for elevation and relaunches script if necessary * Checks for WADK installation and loads DandISetEnv.bat * This sets the proper variables * Runs PowerShell in the same window to preserve DandI vars	2017-11-26 14:15:09 -08:00