v1.8.3

* Moved starting apps from .update_x into .start_desktop_apps
  * This allowed .update_x to be shown on screen during startup
* Included "<Action>... Done" messages for clarity
* Removed x_ok logic (didn't really work)
  * Replaced with a generic message that _should_ be left on screen if X fails

.bin/Scripts/Copy WizardKit.cmd

@@ -15,7 +15,7 @@ rem Set variables using settings\main.py file
 set "SETTINGS=%bin%\Scripts\settings\main.py"
 for %%v in (ARCHIVE_PASSWORD KIT_NAME_FULL) do (
     set "var=%%v"
-    for /f "tokens=* usebackq" %%f in (`findstr "!var!=" %SETTINGS%`) do (
+    for /f "tokens=* usebackq" %%f in (`findstr "!var!=" "%SETTINGS%"`) do (
         set "_v=%%f"
         set "_v=!_v:*'=!"
         set "%%v=!_v:~0,-1!"
@@ -67,7 +67,7 @@ start "" /wait "%fastcopy%" %fastcopy_args% %_sources% /to="%dest%\.bin\"
 echo Copying .cbin...
 mkdir "%dest%\.cbin" >nul 2>&1
 attrib +h "%dest%\.cbin"
-start "" /wait "%fastcopy%" %fastcopy_args% %cbin%\* /to="%dest%\.cbin\"
+start "" /wait "%fastcopy%" %fastcopy_args% "%cbin%"\* /to="%dest%\.cbin\"
 
 :CopyMainData
 echo Copying Main Kit...
@@ -149,4 +149,4 @@ goto Exit
 :: Cleanup and exit ::
 :Exit
 endlocal
-exit /b %errorlevel%
+exit /b %errorlevel%

.bin/Scripts/Launch.cmd

@@ -22,7 +22,7 @@ rem Set variables using settings\main.py file
 set "SETTINGS=%bin%\Scripts\settings\main.py"
 for %%v in (ARCHIVE_PASSWORD KIT_NAME_FULL OFFICE_SERVER_IP QUICKBOOKS_SERVER_IP) do (
     set "var=%%v"
-    for /f "tokens=* usebackq" %%f in (`findstr "!var!=" %SETTINGS%`) do (
+    for /f "tokens=* usebackq" %%f in (`findstr "!var!=" "%SETTINGS%"`) do (
         set "_v=%%f"
         set "_v=!_v:*'=!"
         set "%%v=!_v:~0,-1!"
@@ -150,8 +150,8 @@ goto Exit
 :LaunchOffice
 call "%bin%\Scripts\init_client_dir.cmd" /Office
 set "_odt=False"
-if %L_PATH% equ 2013 (set "_odt=True")
 if %L_PATH% equ 2016 (set "_odt=True")
+if %L_PATH% equ 2019 (set "_odt=True")
 if "%_odt%" == "True" (
     goto LaunchOfficeODT
 ) else (
@@ -162,8 +162,8 @@ if "%_odt%" == "True" (
 rem Prep
 set "args=-aoa -bso0 -bse0 -bsp0 -p%ARCHIVE_PASSWORD%"
 set "config=%L_ITEM%"
-set "dest=%client_dir%\Office\%L_PATH%"
-set "odt_exe=%L_PATH%\setup.exe"
+set "dest=%client_dir%\Office\ODT"
+set "odt_exe=setup.exe"
 set "source=%cbin%\_Office.7z"
 
 rem Extract
@@ -263,6 +263,7 @@ call :ExtractOrFindPath || goto ErrorProgramNotFound
 set "script=%_path%\%L_ITEM%"
 
 rem Verify
+"%PYTHON%" --version >nul || goto ErrorPythonUnsupported
 if not exist "%script%" goto ErrorScriptNotFound
 
 rem Run
@@ -280,9 +281,9 @@ rem Create VB script
 mkdir "%bin%\tmp" 2>nul
 echo Set UAC = CreateObject^("Shell.Application"^) > "%bin%\tmp\Elevate.vbs"
 if defined L_NCMD (
-    echo UAC.ShellExecute "%PYTHON%", "%script%", "", "runas", 3 >> "%bin%\tmp\Elevate.vbs"
+    echo UAC.ShellExecute "%PYTHON%", """%script%"" %L_ARGS%", "", "runas", 3 >> "%bin%\tmp\Elevate.vbs"
 ) else (
-    echo UAC.ShellExecute "%CON%", "-run %PYTHON% %script% -new_console:n", "", "runas", 1 >> "%bin%\tmp\Elevate.vbs"
+    echo UAC.ShellExecute "%CON%", "-run ""%PYTHON%"" ""%script%"" %L_ARGS% -new_console:n", "", "runas", 1 >> "%bin%\tmp\Elevate.vbs"
 )
 
 rem Run
@@ -291,9 +292,9 @@ goto Exit
 
 :LaunchPyScriptUser
 if defined L_NCMD (
-    start "" "%PYTHON%" "%script%" || goto ErrorUnknown
+    start "" "%PYTHON%" "%script%" %L_ARGS% || goto ErrorUnknown
 ) else (
-    start "" "%CON%" -run "%PYTHON%" "%script%" -new_console:n || goto ErrorUnknown
+    start "" "%CON%" -run "%PYTHON%" "%script%" %L_ARGS% -new_console:n || goto ErrorUnknown
 )
 goto Exit
 
@@ -333,7 +334,7 @@ echo.   Executable  Working Dir  Program  Args   [L_7ZIP] [L_ELEV] [L__CLI]
 echo.   Folder      Folder       '.'             [L_7ZIP]
 echo.   Office      Year         Product         [L_7ZIP]
 echo.   PSScript    Scripts      Script          [L_7ZIP] [L_ELEV] [L_NCMD]
-echo.   PyScript    Scripts      Script          [L_7ZIP] [L_ELEV] [L_NCMD]
+echo.   PyScript    Scripts      Script   Args   [L_7ZIP] [L_ELEV] [L_NCMD]
 echo.   QuickBooks  Year         Product         [L_7ZIP]
 echo.
 echo.L_7ZIP:    Extra arguments for 7-Zip (in the :ExtractCBin label)
@@ -435,6 +436,16 @@ echo ERROR: Office version not supported by this script.
 start "" "explorer.exe" "%client_dir%\Office"
 goto Abort
 
+:ErrorPythonUnsupported
+rem The Windows installation lacks Windows update KB2999226 needed to run Python
+echo.
+echo ERROR: Failed to run Python, try installing Windows update KB2999226.
+echo NOTE: That update is from October 2015 so this system is SEVERELY outdated
+if exist "%bin%\..\Installers\Extras\Windows Updates" (
+  start "" "explorer.exe" "%bin%\..\Installers\Extras\Windows Updates"
+)
+goto Abort
+
 :ErrorQuickBooksSourceNotFound
 echo.
 echo ERROR: QuickBooks source "%L_ITEM%" not found.
@@ -486,11 +497,11 @@ echo Press any key to exit...
 pause>nul
 rem reset color and reset errorlevel to 0
 rem NOTE: This is done to avoid causing a ErrorLaunchCMD in the launcher.cmd
-color
+color 07
 goto Exit
 
 :: Cleanup and exit ::
 :Exit
 popd
 endlocal
-exit /b %errorlevel%
+exit /b %errorlevel%

.bin/Scripts/Launcher_Template.cmd

@@ -17,7 +17,7 @@ call :SetTitle Launcher
 rem EXTRA_CODE
 
 :DefineLaunch
-:: See %bin%\SCripts\Launch.cmd for details under :Usage label
+:: See %bin%\Scripts\Launch.cmd for details under :Usage label
 set L_TYPE=
 set L_PATH=
 set L_ITEM=
@@ -69,7 +69,7 @@ popd
 :SetTitle
 rem Sets title using KIT_NAME_FULL from settings\main.py
 set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL %SETTINGS%`) do (
+for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL "%SETTINGS%"`) do (
     set "_v=%%f"
     set "_v=!_v:*'=!"
     set "KIT_NAME_FULL=!_v:~0,-1!"
@@ -110,4 +110,4 @@ goto Exit
 :: Cleanup and exit ::
 :Exit
 endlocal
-exit /b %errorlevel%
+exit /b %errorlevel%

.bin/Scripts/activate.py

@@ -4,59 +4,60 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.activation import *
 init_global_vars()
 os.system('title {}: Windows Activation Tool'.format(KIT_NAME_FULL))
 
 if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: Windows Activation Tool\n'.format(KIT_NAME_FULL))
-        # Bail early if already activated
-        if windows_is_activated():
-            print_info('This system is already activated')
-            sleep(5)
-            exit_script()
-        other_results = {
-            'Error': {
-                'BIOSKeyNotFoundError':   'BIOS key not found.',
-            }}
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: Windows Activation Tool\n'.format(KIT_NAME_FULL))
+    # Bail early if already activated
+    if windows_is_activated():
+      print_info('This system is already activated')
+      sleep(5)
+      exit_script()
+    other_results = {
+      'Error': {
+        'BIOSKeyNotFoundError':   'BIOS key not found.',
+      }}
 
-        # Determine activation method
-        activation_methods = [
-            {'Name': 'Activate with BIOS key', 'Function': activate_with_bios},
-            ]
-        if global_vars['OS']['Version'] not in ['8', '10']:
-            activation_methods[0]['Disabled'] = True
-        actions = [
-            {'Name': 'Quit', 'Letter': 'Q'},
-            ]
+    # Determine activation method
+    activation_methods = [
+      {'Name': 'Activate with BIOS key', 'Function': activate_with_bios},
+      ]
+    if global_vars['OS']['Version'] not in ('8', '8.1', '10'):
+      activation_methods[0]['Disabled'] = True
+    actions = [
+      {'Name': 'Quit', 'Letter': 'Q'},
+      ]
 
-        while True:
-            selection = menu_select(
-                '{}: Windows Activation Menu'.format(KIT_NAME_FULL),
-                main_entries=activation_methods, action_entries=actions)
-            
-            if (selection.isnumeric()):
-                result = try_and_print(
-                    message = activation_methods[int(selection)-1]['Name'],
-                    function = activation_methods[int(selection)-1]['Function'],
-                    other_results=other_results)
-                if result['CS']:
-                    break
-                else:
-                    sleep(2)
-            elif selection == 'Q':
-                exit_script()
+    while True:
+      selection = menu_select(
+        '{}: Windows Activation Menu'.format(KIT_NAME_FULL),
+        main_entries=activation_methods, action_entries=actions)
 
-        # Done
-        print_success('\nDone.')
-        pause("Press Enter to exit...")
+      if (selection.isnumeric()):
+        result = try_and_print(
+          message = activation_methods[int(selection)-1]['Name'],
+          function = activation_methods[int(selection)-1]['Function'],
+          other_results=other_results)
+        if result['CS']:
+          break
+        else:
+          sleep(2)
+      elif selection == 'Q':
         exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+
+    # Done
+    print_success('\nDone.')
+    pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/add-known-networks

@@ -0,0 +1,81 @@
+#!/bin/env python3
+#
+## Convert saved WiFi connections for NetworkManager
+
+import os
+import re
+import sys
+import uuid
+
+KNOWN_NETWORKS = '/root/known_networks'
+TEMPLATE = '''[connection]
+id={ssid}
+uuid={uuid}
+type=wifi
+permissions=user:{user}:;
+
+[wifi]
+mac-address-blacklist=
+mode=infrastructure
+ssid={ssid}
+
+[wifi-security]
+auth-alg=open
+key-mgmt=wpa-psk
+psk={password}
+
+[ipv4]
+dns-search=
+method=auto
+
+[ipv6]
+addr-gen-mode=stable-privacy
+dns-search=
+method=auto
+'''
+
+def get_user_name():
+  """Get user name, returns str."""
+  user = None
+
+  # Get running user
+  if 'SUDO_USER' in os.environ:
+    user = os.environ.get('SUDO_USER')
+  else:
+    user = os.environ.get('USER')
+
+  # Check if user manually specified
+  for a in sys.argv:
+    a = a.strip().lower()
+    if a.startswith('--user='):
+      user = a.replace('--user=', '')
+
+  return user
+
+if __name__ == '__main__':
+  known_networks = {}
+  #try:
+  with open('/root/known_networks', 'r') as f:
+    for line in f.readlines():
+      r = re.search(r"^'(.*)':\s+'(.*)'", line.strip())
+      if r:
+        known_networks[r.group(1)] = r.group(2)
+  for ssid, password in known_networks.items():
+    out_path = '{}/{}.nmconnection'.format(
+      '/etc/NetworkManager/system-connections',
+      ssid,
+      )
+    if not os.path.exists(out_path):
+      with open(out_path, 'w') as f:
+        f.write(TEMPLATE.format(
+          user=get_user_name(),
+          ssid=ssid,
+          password=password,
+          uuid=uuid.uuid4(),
+          ))
+    os.chmod(out_path, 0o600)
+  #except:
+  #  # Meh
+  #  pass
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/borrowed/sensors-README.md

@@ -1,35 +0,0 @@
-sensors.py
-==========
-python bindings using ctypes for libsensors3 of the [lm-sensors project](https://github.com/groeck/lm-sensors). The code was written against libsensors 3.3.4.  
-
-For documentation of the low level API see [sensors.h](https://github.com/groeck/lm-sensors/blob/master/lib/sensors.h). For an example of the high level API see [example.py](example.py).
-
-For a GUI application that displays the sensor readings and is based on this library, take a look at [sensors-unity](https://launchpad.net/sensors-unity).
-
-Features
---------
-* Full access to low level libsensors3 API
-* High level iterator API
-* unicode handling
-* Python2 and Python3 compatible
-
-Licensing
----------
-LGPLv2 (same as libsensors3)
-
-Usage Notes
------------
-As Python does not support call by reference for primitive types some of the libsensors API had to be adapted:
-
-```python
-# nr is changed by refrence in the C API
-chip_name, nr = sensors.get_detected_chips(None, nr)
-
-# returns the value. throws on error
-val = sensors.get_value(chip, subfeature_nr)
-```
-
-Missing Features (pull requests are welcome):
-* `sensors_subfeature_type` enum
-* `sensors_get_subfeature`
-* Error handlers

.bin/Scripts/borrowed/sensors.py

@@ -1,236 +0,0 @@
-"""
-@package sensors.py
-Python Bindings for libsensors3
-
-use the documentation of libsensors for the low level API.
-see example.py for high level API usage.
-
-@author: Pavel Rojtberg (http://www.rojtberg.net)
-@see: https://github.com/paroj/sensors.py
-@copyright: LGPLv2 (same as libsensors) <http://opensource.org/licenses/LGPL-2.1>
-"""
-
-from ctypes import *
-import ctypes.util
-
-_libc = cdll.LoadLibrary(ctypes.util.find_library("c"))
-# see https://github.com/paroj/sensors.py/issues/1
-_libc.free.argtypes = [c_void_p]
-
-_hdl = cdll.LoadLibrary(ctypes.util.find_library("sensors"))
-
-version = c_char_p.in_dll(_hdl, "libsensors_version").value.decode("ascii")
-
-class bus_id(Structure):
-    _fields_ = [("type", c_short),
-                ("nr", c_short)]
-
-class chip_name(Structure):
-    _fields_ = [("prefix", c_char_p),
-                ("bus", bus_id),
-                ("addr", c_int),
-                ("path", c_char_p)]
-
-class feature(Structure):
-    _fields_ = [("name", c_char_p),
-                ("number", c_int),
-                ("type", c_int)]
-    
-    # sensors_feature_type
-    IN = 0x00
-    FAN = 0x01
-    TEMP = 0x02
-    POWER = 0x03
-    ENERGY = 0x04
-    CURR = 0x05
-    HUMIDITY = 0x06
-    MAX_MAIN = 0x7
-    VID = 0x10
-    INTRUSION = 0x11
-    MAX_OTHER = 0x12
-    BEEP_ENABLE = 0x18
-
-class subfeature(Structure):
-    _fields_ = [("name", c_char_p),
-                ("number", c_int),
-                ("type", c_int),
-                ("mapping", c_int),
-                ("flags", c_uint)]
-
-_hdl.sensors_get_detected_chips.restype = POINTER(chip_name)
-_hdl.sensors_get_features.restype = POINTER(feature)
-_hdl.sensors_get_all_subfeatures.restype = POINTER(subfeature)
-_hdl.sensors_get_label.restype = c_void_p # return pointer instead of str so we can free it
-_hdl.sensors_get_adapter_name.restype = c_char_p # docs do not say whether to free this or not 
-_hdl.sensors_strerror.restype = c_char_p
-
-### RAW API ###
-MODE_R = 1
-MODE_W = 2
-COMPUTE_MAPPING = 4
-
-def init(cfg_file = None):
-    file = _libc.fopen(cfg_file.encode("utf-8"), "r") if cfg_file is not None else None 
-    
-    if _hdl.sensors_init(file) != 0:
-        raise Exception("sensors_init failed")
-    
-    if file is not None:
-        _libc.fclose(file)
-
-def cleanup():
-    _hdl.sensors_cleanup()
-
-def parse_chip_name(orig_name):
-    ret = chip_name()
-    err= _hdl.sensors_parse_chip_name(orig_name.encode("utf-8"), byref(ret))
-    
-    if err < 0:
-        raise Exception(strerror(err))
-    
-    return ret
-
-def strerror(errnum):
-    return _hdl.sensors_strerror(errnum).decode("utf-8")
-
-def free_chip_name(chip):
-    _hdl.sensors_free_chip_name(byref(chip))
-
-def get_detected_chips(match, nr):
-    """
-    @return: (chip, next nr to query)
-    """
-    _nr = c_int(nr)
-    
-    if match is not None:
-        match = byref(match)
-    
-    chip = _hdl.sensors_get_detected_chips(match, byref(_nr))
-    chip = chip.contents if bool(chip) else None
-    return chip, _nr.value
-
-def chip_snprintf_name(chip, buffer_size=200):
-    """
-    @param buffer_size defaults to the size used in the sensors utility
-    """
-    ret = create_string_buffer(buffer_size)
-    err = _hdl.sensors_snprintf_chip_name(ret, buffer_size, byref(chip))
-    
-    if err < 0:
-        raise Exception(strerror(err))
-        
-    return ret.value.decode("utf-8")
-
-def do_chip_sets(chip):
-    """
-    @attention this function was not tested
-    """
-    err = _hdl.sensors_do_chip_sets(byref(chip))
-    if err < 0:
-        raise Exception(strerror(err))
-    
-def get_adapter_name(bus):
-    return _hdl.sensors_get_adapter_name(byref(bus)).decode("utf-8")
-
-def get_features(chip, nr):
-    """
-    @return: (feature, next nr to query)
-    """
-    _nr = c_int(nr)
-    feature = _hdl.sensors_get_features(byref(chip), byref(_nr))
-    feature = feature.contents if bool(feature) else None
-    return feature, _nr.value
-
-def get_label(chip, feature):
-    ptr = _hdl.sensors_get_label(byref(chip), byref(feature)) 
-    val = cast(ptr, c_char_p).value.decode("utf-8")
-    _libc.free(ptr)
-    return val
-
-def get_all_subfeatures(chip, feature, nr):
-    """
-    @return: (subfeature, next nr to query)
-    """
-    _nr = c_int(nr)
-    subfeature = _hdl.sensors_get_all_subfeatures(byref(chip), byref(feature), byref(_nr))
-    subfeature = subfeature.contents if bool(subfeature) else None
-    return subfeature, _nr.value
-
-def get_value(chip, subfeature_nr):
-    val = c_double()
-    err = _hdl.sensors_get_value(byref(chip), subfeature_nr, byref(val))
-    if err < 0:
-        raise Exception(strerror(err))
-    return val.value
-
-def set_value(chip, subfeature_nr, value):
-    """
-    @attention this function was not tested
-    """
-    val = c_double(value)
-    err = _hdl.sensors_set_value(byref(chip), subfeature_nr, byref(val))
-    if err < 0:
-        raise Exception(strerror(err))
-
-### Convenience API ###
-class ChipIterator:
-    def __init__(self, match = None):
-        self.match = parse_chip_name(match) if match is not None else None
-        self.nr = 0
-            
-    def __iter__(self):
-        return self
-     
-    def __next__(self):
-        chip, self.nr = get_detected_chips(self.match, self.nr)
-        
-        if chip is None:
-            raise StopIteration
-        
-        return chip
-    
-    def __del__(self):
-        if self.match is not None:
-            free_chip_name(self.match)
-    
-    def next(self): # python2 compability
-        return self.__next__()
-    
-class FeatureIterator:
-    def __init__(self, chip):
-        self.chip = chip
-        self.nr = 0
-        
-    def __iter__(self):
-        return self
-        
-    def __next__(self):
-        feature, self.nr = get_features(self.chip, self.nr)
-        
-        if feature is None:
-            raise StopIteration
-        
-        return feature
-
-    def next(self): # python2 compability
-        return self.__next__()
-    
-class SubFeatureIterator:
-    def __init__(self, chip, feature):
-        self.chip = chip
-        self.feature = feature
-        self.nr = 0
-    
-    def __iter__(self):
-        return self
-        
-    def __next__(self):
-        subfeature, self.nr = get_all_subfeatures(self.chip, self.feature, self.nr)
-        
-        if subfeature is None:
-            raise StopIteration
-        
-        return subfeature
-    
-    def next(self): # python2 compability
-        return self.__next__()

.bin/Scripts/build-ufd

@@ -1,592 +1,149 @@
-#!/usr/bin/env bash
+#!/bin/env python3
 #
-## Wizard Kit: UFD Build Tool
-#
-# Based on a template by BASH3 Boilerplate v2.3.0
-# http://bash3boilerplate.sh/#authors
-#
-# The MIT License (MIT)
-# Copyright (c) 2013 Kevin van Zonneveld and contributors
-# You are not obligated to bundle the LICENSE file with your b3bp projects as long
-# as you leave these references intact in the header comments of your source files.
-
-# Exit on error. Append "|| true" if you expect an error.
-set -o errexit
-# Exit on error inside any functions or subshells.
-set -o errtrace
-# Do not allow use of undefined vars. Use ${VAR:-} to use an undefined VAR
-set -o nounset
-# Catch the error in case mysqldump fails (but gzip succeeds) in `mysqldump |gzip`
-set -o pipefail
-# Turn on traces, useful while debugging but commented out by default
-# set -o xtrace
-
-if [[ "${BASH_SOURCE[0]}" != "${0}" ]]; then
-  __i_am_main_script="0" # false
-
-  if [[ "${__usage+x}" ]]; then
-    if [[ "${BASH_SOURCE[1]}" = "${0}" ]]; then
-      __i_am_main_script="1" # true
-    fi
-
-    __b3bp_external_usage="true"
-    __b3bp_tmp_source_idx=1
-  fi
-else
-  __i_am_main_script="1" # true
-  [[ "${__usage+x}" ]] && unset -v __usage
-  [[ "${__helptext+x}" ]] && unset -v __helptext
-fi
-
-# Set magic variables for current file, directory, os, etc.
-__dir="$(cd "$(dirname "${BASH_SOURCE[${__b3bp_tmp_source_idx:-0}]}")" && pwd)"
-__file="${__dir}/$(basename "${BASH_SOURCE[${__b3bp_tmp_source_idx:-0}]}")"
-__base="$(basename "${__file}" .sh)"
-__wd="$(pwd)"
-__usage_example="Usage: sudo $(basename "${0}") --ufd-device [device] --linux-iso [path] --main-kit [path] --winpe-iso [path]"
-__all_args=""
-for a in "${@}"; do
-    if [[ "${a:0:1}" == "-" ]]; then
-        __all_args="${__all_args} ${a}"
-    else
-        __all_args="${__all_args} \"${a}\""
-    fi
-done
-
-
-# Define the environment variables (and their defaults) that this script depends on
-LOG_LEVEL="${LOG_LEVEL:-6}" # 7 = debug -> 0 = emergency
-NO_COLOR="${NO_COLOR:-}"    # true = disable color. otherwise autodetected
-
-
-### Functions
-##############################################################################
-
-function __b3bp_log () {
-  local log_level="${1}"
-  shift
-
-  # shellcheck disable=SC2034
-  local color_debug="\x1b[35m"
-  # shellcheck disable=SC2034
-  local color_info="\x1b[32m"
-  # shellcheck disable=SC2034
-  local color_notice="\x1b[34m"
-  # shellcheck disable=SC2034
-  local color_warning="\x1b[33m"
-  # shellcheck disable=SC2034
-  local color_error="\x1b[31m"
-  # shellcheck disable=SC2034
-  local color_critical="\x1b[1;31m"
-  # shellcheck disable=SC2034
-  local color_alert="\x1b[1;33;41m"
-  # shellcheck disable=SC2034
-  local color_emergency="\x1b[1;4;5;33;41m"
-
-  local colorvar="color_${log_level}"
-
-  local color="${!colorvar:-${color_error}}"
-  local color_reset="\x1b[0m"
-
-  if [[ "${NO_COLOR:-}" = "true" ]] || ( [[ "${TERM:-}" != *"256color"* ]] && [[ "${TERM:-}" != "xterm"* ]] && [[ "${TERM:-}" != "screen"* ]] ) || [[ ! -t 2 ]]; then
-    if [[ "${NO_COLOR:-}" != "false" ]]; then
-      # Don't use colors on pipes or non-recognized terminals
-      color=""; color_reset=""
-    fi
-  fi
-
-  # all remaining arguments are to be printed
-  local log_line=""
-
-  while IFS=$'\n' read -r log_line; do
-    echo -e "$(date -u +"%Y-%m-%d %H:%M:%S UTC") ${color}$(printf "[%9s]" "${log_level}")${color_reset} ${log_line}" 1>&2
-  done <<< "${@:-}"
-}
-
-function emergency () {                                __b3bp_log emergency "${@}"; exit 1; }
-function alert ()     { [[ "${LOG_LEVEL:-0}" -ge 1 ]] && __b3bp_log alert "${@}"; true; }
-function critical ()  { [[ "${LOG_LEVEL:-0}" -ge 2 ]] && __b3bp_log critical "${@}"; true; }
-function error ()     { [[ "${LOG_LEVEL:-0}" -ge 3 ]] && __b3bp_log error "${@}"; true; }
-function warning ()   { [[ "${LOG_LEVEL:-0}" -ge 4 ]] && __b3bp_log warning "${@}"; true; }
-function notice ()    { [[ "${LOG_LEVEL:-0}" -ge 5 ]] && __b3bp_log notice "${@}"; true; }
-function info ()      { [[ "${LOG_LEVEL:-0}" -ge 6 ]] && __b3bp_log info "${@}"; true; }
-function debug ()     { [[ "${LOG_LEVEL:-0}" -ge 7 ]] && __b3bp_log debug "${@}"; true; }
-
-function help () {
-  echo "" 1>&2
-  echo " ${*}" 1>&2
-  echo "" 1>&2
-  echo "  ${__usage:-No usage available}" 1>&2
-  echo "" 1>&2
-
-  if [[ "${__helptext:-}" ]]; then
-    echo " ${__helptext}" 1>&2
-    echo "" 1>&2
-  fi
-
-  exit 1
-}
-
-
-### Parse commandline options
-##############################################################################
-
-# Commandline options. This defines the usage page, and is used to parse cli
-# opts & defaults from. The parsing is unforgiving so be precise in your syntax
-# - A short option must be preset for every long option; but every short option
-#   need not have a long option
-# - `--` is respected as the separator between options and arguments
-# - We do not bash-expand defaults, so setting '~/app' as a default will not resolve to ${HOME}.
-#   you can use bash variables to work around this (so use ${HOME} instead)
-
-# shellcheck disable=SC2015
-[[ "${__usage+x}" ]] || read -r -d '' __usage <<-'EOF' || true # exits non-zero when EOF encountered
-  OPTIONS:
-  -u --ufd-device [arg] Device to which the kit will be applied
-  -m --main-kit   [arg] Path to the Main Kit
-  -l --linux-iso  [arg] Path to the Linux ISO
-  -w --winpe-iso  [arg] Path to the WinPE ISO
-
-  -e --extra-dir  [arg] Path to the Extra folder (optional)
-  -h --help             This page
-
-  ADVANCED:
-  -d --debug            Enable debug mode
-  -v --verbose          Enable verbose mode
-  -F --force            Bypass all confirmation messages. USE WITH EXTREME CAUTION!
-EOF
-
-# shellcheck disable=SC2015
-[[ "${__helptext+x}" ]] || read -r -d '' __helptext <<-'EOF' || true # exits non-zero when EOF encountered
- Paths can be relative to the current working directory or absolute
-EOF
-
-# Translate usage string -> getopts arguments, and set $arg_<flag> defaults
-while read -r __b3bp_tmp_line; do
-  if [[ "${__b3bp_tmp_line}" =~ ^- ]]; then
-    # fetch single character version of option string
-    __b3bp_tmp_opt="${__b3bp_tmp_line%% *}"
-    __b3bp_tmp_opt="${__b3bp_tmp_opt:1}"
-
-    # fetch long version if present
-    __b3bp_tmp_long_opt=""
-
-    if [[ "${__b3bp_tmp_line}" = *"--"* ]]; then
-      __b3bp_tmp_long_opt="${__b3bp_tmp_line#*--}"
-      __b3bp_tmp_long_opt="${__b3bp_tmp_long_opt%% *}"
-    fi
-
-    # map opt long name to+from opt short name
-    printf -v "__b3bp_tmp_opt_long2short_${__b3bp_tmp_long_opt//-/_}" '%s' "${__b3bp_tmp_opt}"
-    printf -v "__b3bp_tmp_opt_short2long_${__b3bp_tmp_opt}" '%s' "${__b3bp_tmp_long_opt//-/_}"
-
-    # check if option takes an argument
-    if [[ "${__b3bp_tmp_line}" =~ \[.*\] ]]; then
-      __b3bp_tmp_opt="${__b3bp_tmp_opt}:" # add : if opt has arg
-      __b3bp_tmp_init=""  # it has an arg. init with ""
-      printf -v "__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}" '%s' "1"
-    elif [[ "${__b3bp_tmp_line}" =~ \{.*\} ]]; then
-      __b3bp_tmp_opt="${__b3bp_tmp_opt}:" # add : if opt has arg
-      __b3bp_tmp_init=""  # it has an arg. init with ""
-      # remember that this option requires an argument
-      printf -v "__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}" '%s' "2"
-    else
-      __b3bp_tmp_init="0" # it's a flag. init with 0
-      printf -v "__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}" '%s' "0"
-    fi
-    __b3bp_tmp_opts="${__b3bp_tmp_opts:-}${__b3bp_tmp_opt}"
-  fi
-
-  [[ "${__b3bp_tmp_opt:-}" ]] || continue
-
-  if [[ "${__b3bp_tmp_line}" =~ (^|\.\ *)Default= ]]; then
-    # ignore default value if option does not have an argument
-    __b3bp_tmp_varname="__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}"
-
-    if [[ "${!__b3bp_tmp_varname}" != "0" ]]; then
-      __b3bp_tmp_init="${__b3bp_tmp_line##*Default=}"
-      __b3bp_tmp_re='^"(.*)"$'
-      if [[ "${__b3bp_tmp_init}" =~ ${__b3bp_tmp_re} ]]; then
-        __b3bp_tmp_init="${BASH_REMATCH[1]}"
-      else
-        __b3bp_tmp_re="^'(.*)'$"
-        if [[ "${__b3bp_tmp_init}" =~ ${__b3bp_tmp_re} ]]; then
-          __b3bp_tmp_init="${BASH_REMATCH[1]}"
-        fi
-      fi
-    fi
-  fi
-
-  if [[ "${__b3bp_tmp_line}" =~ (^|\.\ *)Required\. ]]; then
-    # remember that this option requires an argument
-    printf -v "__b3bp_tmp_has_arg_${__b3bp_tmp_opt:0:1}" '%s' "2"
-  fi
-
-  printf -v "arg_${__b3bp_tmp_opt:0:1}" '%s' "${__b3bp_tmp_init}"
-done <<< "${__usage:-}"
-
-# run getopts only if options were specified in __usage
-if [[ "${__b3bp_tmp_opts:-}" ]]; then
-  # Allow long options like --this
-  __b3bp_tmp_opts="${__b3bp_tmp_opts}-:"
-
-  # Reset in case getopts has been used previously in the shell.
-  OPTIND=1
-
-  # start parsing command line
-  set +o nounset # unexpected arguments will cause unbound variables
-                 # to be dereferenced
-  # Overwrite $arg_<flag> defaults with the actual CLI options
-  while getopts "${__b3bp_tmp_opts}" __b3bp_tmp_opt; do
-    [[ "${__b3bp_tmp_opt}" = "?" ]] && help "Invalid use of script: ${*} "
-
-    if [[ "${__b3bp_tmp_opt}" = "-" ]]; then
-      # OPTARG is long-option-name or long-option=value
-      if [[ "${OPTARG}" =~ .*=.* ]]; then
-        # --key=value format
-        __b3bp_tmp_long_opt=${OPTARG/=*/}
-        # Set opt to the short option corresponding to the long option
-        __b3bp_tmp_varname="__b3bp_tmp_opt_long2short_${__b3bp_tmp_long_opt//-/_}"
-        printf -v "__b3bp_tmp_opt" '%s' "${!__b3bp_tmp_varname}"
-        OPTARG=${OPTARG#*=}
-      else
-        # --key value format
-        # Map long name to short version of option
-        __b3bp_tmp_varname="__b3bp_tmp_opt_long2short_${OPTARG//-/_}"
-        printf -v "__b3bp_tmp_opt" '%s' "${!__b3bp_tmp_varname}"
-        # Only assign OPTARG if option takes an argument
-        __b3bp_tmp_varname="__b3bp_tmp_has_arg_${__b3bp_tmp_opt}"
-        printf -v "OPTARG" '%s' "${@:OPTIND:${!__b3bp_tmp_varname}}"
-        # shift over the argument if argument is expected
-        ((OPTIND+=__b3bp_tmp_has_arg_${__b3bp_tmp_opt}))
-      fi
-      # we have set opt/OPTARG to the short value and the argument as OPTARG if it exists
-    fi
-    __b3bp_tmp_varname="arg_${__b3bp_tmp_opt:0:1}"
-    __b3bp_tmp_default="${!__b3bp_tmp_varname}"
-
-    __b3bp_tmp_value="${OPTARG}"
-    if [[ -z "${OPTARG}" ]] && [[ "${__b3bp_tmp_default}" = "0" ]]; then
-      __b3bp_tmp_value="1"
-    fi
-
-    printf -v "${__b3bp_tmp_varname}" '%s' "${__b3bp_tmp_value}"
-    debug "cli arg ${__b3bp_tmp_varname} = (${__b3bp_tmp_default}) -> ${!__b3bp_tmp_varname}"
-  done
-  set -o nounset # no more unbound variable references expected
-
-  shift $((OPTIND-1))
-
-  if [[ "${1:-}" = "--" ]] ; then
-    shift
-  fi
-fi
-
-
-### Automatic validation of required option arguments
-##############################################################################
-
-for __b3bp_tmp_varname in ${!__b3bp_tmp_has_arg_*}; do
-  # validate only options which required an argument
-  [[ "${!__b3bp_tmp_varname}" = "2" ]] || continue
-
-  __b3bp_tmp_opt_short="${__b3bp_tmp_varname##*_}"
-  __b3bp_tmp_varname="arg_${__b3bp_tmp_opt_short}"
-  [[ "${!__b3bp_tmp_varname}" ]] && continue
-
-  __b3bp_tmp_varname="__b3bp_tmp_opt_short2long_${__b3bp_tmp_opt_short}"
-  printf -v "__b3bp_tmp_opt_long" '%s' "${!__b3bp_tmp_varname}"
-  [[ "${__b3bp_tmp_opt_long:-}" ]] && __b3bp_tmp_opt_long=" (--${__b3bp_tmp_opt_long//_/-})"
-
-  help "Option -${__b3bp_tmp_opt_short}${__b3bp_tmp_opt_long:-} requires an argument"
-done
-
-
-### Cleanup Environment variables
-##############################################################################
-
-for __tmp_varname in ${!__b3bp_tmp_*}; do
-  unset -v "${__tmp_varname}"
-done
-
-unset -v __tmp_varname
-
-
-### Externally supplied __usage. Nothing else to do here
-##############################################################################
-
-if [[ "${__b3bp_external_usage:-}" = "true" ]]; then
-  unset -v __b3bp_external_usage
-  return
-fi
-
-
-### Signal trapping and backtracing
-##############################################################################
-
-function __b3bp_cleanup_before_exit () {
-  if [[ "$EUID" -eq 0 ]]; then
-    for d in Dest Linux WinPE; do
-      if [[ -d "/mnt/${d}" ]]; then
-        umount "/mnt/${d}" || true
-        rmdir "/mnt/${d}" || true
-      fi
-    done
-  fi
-  if [[ "${?}" != "0" ]]; then
-    info "Sources unmounted"
-  fi
-  if [[ ${arg_F:-} == 0 && "${SILENT:-False}" == "False" ]]; then
-    read -r -p "Press Enter to exit... " ignored_var 2>&1
-  fi
-}
-trap __b3bp_cleanup_before_exit EXIT
-
-# requires `set -o errtrace`
-__b3bp_err_report() {
-    local error_code
-    error_code=${?}
-    error "Error in ${__file} in function ${1} on line ${2}"
-    exit ${error_code}
-}
-# Uncomment the following line for always providing an error backtrace
-trap '__b3bp_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
-
-
-### Command-line argument switches (like -d for debugmode, -h for showing helppage)
-##############################################################################
-
-# debug mode
-if [[ "${arg_d:?}" = "1" ]]; then
-  set -o xtrace
-  LOG_LEVEL="7"
-  # Enable error backtracing
-  trap '__b3bp_err_report "${FUNCNAME:-.}" ${LINENO}' ERR
-fi
-
-# verbose mode
-if [[ "${arg_v:?}" = "1" ]]; then
-  set -o verbose
-fi
-
-
-### Validation. Error out if the things required for your script are not present
-##############################################################################
-
-if [[ "${arg_F:?}" == 1 ]]; then
-    SILENT="True"
-else
-    SILENT="False"
-fi
-
-if [[ "${arg_h:?}" == 1 ]]; then
-    help "${__usage_example}"
-else
-    # Print warning line
-    [[ "${arg_u:-}" ]] || echo " -u or --ufd-device is required"
-    [[ "${arg_m:-}" ]] || echo " -m or --main-kit is required"
-    [[ "${arg_l:-}" ]] || echo " -l or --linux-iso is required"
-    [[ "${arg_w:-}" ]] || echo " -w or --winpe-iso is required"
-
-    # Bail if necessary
-    [[ "${arg_u:-}" ]] || help "${__usage_example}"
-    [[ "${arg_l:-}" ]] || help "${__usage_example}"
-    [[ "${arg_m:-}" ]] || help "${__usage_example}"
-    [[ "${arg_w:-}" ]] || help "${__usage_example}"
-fi
-[[ "${LOG_LEVEL:-}" ]] || emergency "Cannot continue without LOG_LEVEL. "
-
-
-### More functions
-##############################################################################
-
-function abort () {
-    local abort_message="Aborted"
-    [[ "${1:-}" ]] && abort_message="${1}" || true
-    error "${abort_message}"
-    #echo -e "${YELLOW}${abort_message}${CLEAR}"
-    exit 1
-}
-
-function ask() {
-    if [[ "${SILENT}" == "True" ]]; then
-        echo -e "${1:-} Yes ${BLUE}(Silent)${CLEAR}"
-        return 0
-    fi
-    while :; do
-        read -p "${1:-} [Y/N] " -r answer
-        if echo "$answer" | egrep -iq '^(y|yes|sure)$'; then
-            return 0
-        elif echo "$answer" | egrep -iq '^(n|no|nope)$'; then
-            return 1
-        fi
-    done
-}
-
-
-### Runtime
-##############################################################################
-
-# VARIABLES
-DEST_DEV="${arg_u}"
-DEST_PAR="${DEST_DEV}1"
-LOG_FILE="${HOME}/build-ufd_${DEST_DEV##*/}_$(date +%Y-%m-%d_%H%M_%z).log"
-MAIN_PY="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/settings/main.py"
-RSYNC_ARGS="-hrtuvS --modify-window=1 --progress"
-MAIN_KIT="$(realpath "${arg_m:-}" 2>/dev/null || true)"
-LINUX_ISO="$(realpath "${arg_l:-}" 2>/dev/null || true)"
-WINPE_ISO="$(realpath "${arg_w:-}" 2>/dev/null || true)"
-EXTRA_DIR="$(realpath "${arg_e:-}" 2>/dev/null || true)"
-
-# COLORS
-CLEAR="\e[0m"
-RED="\e[31m"
-GREEN="\e[32m"
-YELLOW="\e[33m"
-BLUE="\e[34m"
-
-# Load main.py settings
-if [ ! -f "${MAIN_PY}" ]; then
-    echo -e "${RED}ERROR${CLEAR}: ${MAIN_PY} not found."
-    abort
-fi
-while read line; do
-    if echo "${line}" | egrep -q "^\w+='"; then
-        line="$(echo "${line}" | sed -r 's/[\r\n]+//')"
-        eval "${line}"
-    fi
-done < "${MAIN_PY}"
-if [ -z ${KIT_NAME_FULL+x} ]; then
-    # KIT_NAME_FULL is not set, assume main.py missing or malformatted
-    echo -e "${RED}ERROR${CLEAR}: failed to load settings from ${MAIN_PY}"
-    abort
-fi
-UFD_LABEL="${KIT_NAME_SHORT}_LINUX"
-
-# Check if root
-if [[ "$EUID" -ne 0 ]]; then
-    echo -e "${RED}ERROR${CLEAR}: This script must be run as root."
-    abort
-fi
-
-# Check if in tmux
-if ! tmux list-session 2>/dev/null | grep -q "build-ufd"; then
-    # Reload in tmux
-    eval tmux new-session -s "build-ufd" "${0:-}" ${__all_args}
-    SILENT="True" # avoid two "Press Enter to exit..." prompts
-    exit 0
-fi
-
-# Header
-echo -e "${GREEN}${KIT_NAME_FULL}${CLEAR}: UFD Build Tool"
-echo ""
-
-# Verify sources
-[[ -b "${DEST_DEV}" ]] || abort "${DEST_DEV} is not a valid device."
-[[ -d "${MAIN_KIT}/.bin" ]] || abort "Invalid Main Kit, ${MAIN_KIT}/.bin not found."
-[[ -e "${LINUX_ISO}" ]] || abort "Linux ISO not found."
-[[ -e "${WINPE_ISO}" ]] || abort "WinPE ISO not found."
-if [[ ! -z "${arg_e:-}" ]]; then
-    [[ -d "${EXTRA_DIR}" ]] || abort "Extra Dir not found."
-fi
-
-# Print Info
-echo -e "${BLUE}Sources${CLEAR}"
-echo "Main Kit:  ${MAIN_KIT}"
-echo "Linux ISO: ${LINUX_ISO}"
-echo "WinPE ISO: ${WINPE_ISO}"
-echo "Extra Dir: ${EXTRA_DIR:-(Not Specified)}"
-echo ""
-echo -e "${BLUE}Destination${CLEAR}"
-lsblk -n -o NAME,LABEL,SIZE,MODEL,SERIAL "${DEST_DEV}"
-echo ""
-
-# Ask before starting job
-echo ""
-if ask "Is the above information correct?"; then
-    echo ""
-    echo -e "${YELLOW}SAFETY CHECK${CLEAR}"
-    echo "All data will be DELETED from the disk and partition(s) listed above."
-    echo -e "This is irreversible and will lead to ${RED}DATA LOSS.${CLEAR}"
-    if ! ask "Asking again to confirm, is this correct?"; then
-        abort
-    fi
-else
-    abort
-fi
-
-# Start Build
-echo ""
-echo -e "${GREEN}Building Kit${CLEAR}"
-touch "${LOG_FILE}"
-tmux split-window -dl 10 tail -f "${LOG_FILE}"
-
-# Format
-echo "Formatting drive..."
-parted "${DEST_DEV}" -s -- mklabel msdos mkpart primary fat32 1MiB -1s >> "${LOG_FILE}" 2>&1
-parted "${DEST_DEV}" set 1 boot on >> "${LOG_FILE}" 2>&1
-mkfs.vfat -F 32 -n "${UFD_LABEL}" "${DEST_PAR}" >> "${LOG_FILE}" 2>&1
-
-# Mount sources and dest
-echo "Mounting sources and destination..."
-mkdir /mnt/{Dest,Linux,WinPE} -p >> "${LOG_FILE}" 2>&1
-mount ${DEST_PAR} /mnt/Dest >> "${LOG_FILE}" 2>&1
-mount "${LINUX_ISO}" /mnt/Linux -r >> "${LOG_FILE}" 2>&1
-mount "${WINPE_ISO}" /mnt/WinPE -r >> "${LOG_FILE}" 2>&1
-
-# Copy files
-echo "Copying Linux files..."
-rsync ${RSYNC_ARGS} /mnt/Linux/* /mnt/Dest/ >> "${LOG_FILE}" 2>&1
-
-echo "Copying WinPE files..."
-rsync ${RSYNC_ARGS} /mnt/WinPE/{Boot,bootmgr{,.efi},en-us,sources} /mnt/Dest/ >> "${LOG_FILE}" 2>&1
-rsync ${RSYNC_ARGS} /mnt/WinPE/EFI/Microsoft /mnt/Dest/EFI/ >> "${LOG_FILE}" 2>&1
-rsync ${RSYNC_ARGS} /mnt/WinPE/EFI/Boot/* /mnt/Dest/EFI/Microsoft/ >> "${LOG_FILE}" 2>&1
-rsync ${RSYNC_ARGS} /mnt/WinPE/{Boot/{BCD,boot.sdi},bootmgr} /mnt/Dest/sources/ >> "${LOG_FILE}" 2>&1
-
-echo "Copying Main Kit..."
-rsync ${RSYNC_ARGS} "${MAIN_KIT}/" "/mnt/Dest/${KIT_NAME_FULL}/" >> "${LOG_FILE}" 2>&1
-
-if [[ ! -z "${EXTRA_DIR:-}" ]]; then
-    echo "Copying Extra files..."
-    rsync ${RSYNC_ARGS} "${EXTRA_DIR}"/* /mnt/Dest/ >> "${LOG_FILE}" 2>&1
-fi
-
-# Install syslinux
-echo "Copying Syslinux files..."
-rsync ${RSYNC_ARGS} /usr/lib/syslinux/bios/*.c32 /mnt/Dest/arch/boot/syslinux/ >> "${LOG_FILE}" 2>&1
-syslinux --install -d /arch/boot/syslinux/ ${DEST_PAR} >> "${LOG_FILE}" 2>&1
-
-echo "Unmounting destination..."
-umount /mnt/Dest >> "${LOG_FILE}" 2>&1
-rmdir /mnt/Dest >> "${LOG_FILE}" 2>&1
-sync
-
-echo "Installing Syslinux MBR..."
-dd bs=440 count=1 if=/usr/lib/syslinux/bios/mbr.bin of=${DEST_DEV} >> "${LOG_FILE}" 2>&1
-sync
-
-# Cleanup
-echo "Hiding boot files..."
-echo "drive s: file=\"${DEST_PAR}\"" > /root/.mtoolsrc
-echo 'mtools_skip_check=1' >> /root/.mtoolsrc
-for item in boot{,mgr,mgr.efi} efi en-us images isolinux sources "${KIT_NAME_FULL}"/{.bin,.cbin}; do
-    yes | mattrib +h "S:/${item}" >> "${LOG_FILE}" 2>&1 || true
-done
-sync
-
-# Unmount Sources
-echo "Unmounting sources..."
-for d in Linux WinPE; do
-    umount "/mnt/${d}" >> "${LOG_FILE}" 2>&1 || true
-    rmdir "/mnt/${d}" >> "${LOG_FILE}" 2>&1 || true
-done
-
-# Close progress pane
-pkill -f "tail.*${LOG_FILE}"
-
-# Done
-echo ""
-echo "Done."
-echo ""
-exit 0
+# pylint: disable=no-name-in-module,wildcard-import,wrong-import-position
+# vim: sts=2 sw=2 ts=2
+"""Wizard Kit: UFD build tool"""
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from docopt import docopt
+from functions.common import *
+from functions.ufd import *
+from settings.ufd import *
+init_global_vars(silent=True)
+
+# Main section
+if __name__ == '__main__':
+  # pylint: disable=invalid-name
+  # Set log
+  try:
+    global_vars['LogDir'] = '{}/Logs'.format(
+      get_user_home(get_user_name()))
+    set_log_file('Build UFD ({Date-Time}).log'.format(**global_vars))
+  except: # pylint: disable=bare-except
+    major_exception()
+
+  # Header
+  print_success(KIT_NAME_FULL)
+  print_standard('UFD Build Tool')
+  print_standard(' ')
+
+  # Check if running as root
+  if not running_as_root():
+    print_error('ERROR: This script is meant to be run as root.')
+    abort(False)
+
+  # Docopt
+  try:
+    args = docopt(DOCSTRING)
+  except SystemExit as sys_exit:
+    # Catch docopt exits
+    exit_script(sys_exit.code)
+  except: # pylint: disable=bare-except
+    major_exception()
+
+  try:
+    # Verify selections
+    ufd_dev = verify_ufd(args['--ufd-device'])
+    sources = verify_sources(args, UFD_SOURCES)
+    show_selections(args, sources, ufd_dev, UFD_SOURCES)
+    if not args['--force']:
+      confirm_selections(args)
+
+    # Prep UFD
+    if not args['--update']:
+      print_info('Prep UFD')
+      prep_device(ufd_dev, UFD_LABEL, use_mbr=args['--use-mbr'])
+
+    # Mount UFD
+    try_and_print(
+      indent=2,
+      message='Mounting UFD...',
+      function=mount,
+      mount_source=find_first_partition(ufd_dev),
+      mount_point='/mnt/UFD',
+      read_write=True,
+      )
+
+    # Remove Arch folder
+    if args['--update']:
+      try_and_print(
+        indent=2,
+        message='Removing Linux...',
+        function=remove_arch,
+        )
+
+    # Copy sources
+    print_standard(' ')
+    print_info('Copy Sources')
+    for s_label, s_path in sources.items():
+      try_and_print(
+        indent=2,
+        message='Copying {}...'.format(s_label),
+        function=copy_source,
+        source=s_path,
+        items=ITEMS[s_label],
+        overwrite=True,
+        )
+
+    # Update boot entries
+    print_standard(' ')
+    print_info('Boot Setup')
+    try_and_print(
+      indent=2,
+      message='Updating boot entries...',
+      function=update_boot_entries,
+      boot_entries=BOOT_ENTRIES,
+      boot_files=BOOT_FILES,
+      iso_label=ISO_LABEL,
+      ufd_label=UFD_LABEL,
+      )
+
+    # Install syslinux (to partition)
+    try_and_print(
+      indent=2,
+      message='Syslinux (partition)...',
+      function=install_syslinux_to_partition,
+      partition=find_first_partition(ufd_dev),
+      )
+
+    # Unmount UFD
+    try_and_print(
+      indent=2,
+      message='Unmounting UFD...',
+      function=unmount,
+      mount_point='/mnt/UFD',
+      )
+
+    # Install syslinux (to device)
+    try_and_print(
+      indent=2,
+      message='Syslinux (device)...',
+      function=install_syslinux_to_dev,
+      ufd_dev=ufd_dev,
+      use_mbr=args['--use-mbr'],
+      )
+
+    # Hide items
+    print_standard(' ')
+    print_info('Final Touches')
+    try_and_print(
+      indent=2,
+      message='Hiding items...',
+      function=hide_items,
+      ufd_dev=ufd_dev,
+      items=ITEMS_HIDDEN,
+      )
+
+    # Done
+    if not args['--force']:
+      print_standard('\nDone.')
+      pause('Press Enter to exit...')
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except: # pylint: disable=bare-except
+    major_exception()

.bin/Scripts/build_kit.ps1

@@ -11,6 +11,7 @@ $Bin = (Get-Item $WD).Parent.FullName
 $Root = (Get-Item $Bin -Force).Parent.FullName
 $Temp = "$Bin\tmp"
 $System32 = "{0}\System32" -f $Env:SystemRoot
+$SysWOW64 = "{0}\SysWOW64" -f $Env:SystemRoot
 Push-Location "$WD"
 $Host.UI.RawUI.BackgroundColor = "black"
 $Host.UI.RawUI.ForegroundColor = "white"
@@ -34,7 +35,7 @@ function DownloadFile ($Path, $Name, $Url) {
     }
     catch {
         Write-Host ("  ERROR: Failed to download file." ) -ForegroundColor "Red"
-        $DownloadErrors += 1
+        $global:DownloadErrors += 1
     }
 }
 function FindDynamicUrl ($SourcePage, $RegEx) {
@@ -78,46 +79,59 @@ if ($MyInvocation.InvocationName -ne ".") {
     $Path = $Temp
 
     # 7-Zip
-    DownloadFile -Path $Path -Name "7z-installer.msi" -Url "http://www.7-zip.org/a/7z1801.msi"
-    DownloadFile -Path $Path -Name "7z-extra.7z" -Url "http://www.7-zip.org/a/7z1801-extra.7z"
+    DownloadFile -Path $Path -Name "7z-installer.msi" -Url "https://www.7-zip.org/a/7z1900.msi"
+    DownloadFile -Path $Path -Name "7z-extra.7z" -Url "https://www.7-zip.org/a/7z1900-extra.7z"
 
     # ConEmu
-    $Url = "https://github.com/Maximus5/ConEmu/releases/download/v18.02.06/ConEmuPack.180206.7z"
+    $Url = "https://github.com/Maximus5/ConEmu/releases/download/v19.03.10/ConEmuPack.190310.7z"
     DownloadFile -Path $Path -Name "ConEmuPack.7z" -Url $Url
 
     # Notepad++
-    $Url = "https://notepad-plus-plus.org/repository/7.x/7.5.5/npp.7.5.5.bin.minimalist.7z"
+    $Url = "https://notepad-plus-plus.org/repository/7.x/7.6.4/npp.7.6.4.bin.minimalist.7z"
     DownloadFile -Path $Path -Name "npp.7z" -Url $Url
 
     # Python
-    $Url = "https://www.python.org/ftp/python/3.6.4/python-3.6.4-embed-win32.zip"
+    $Url = "https://www.python.org/ftp/python/3.7.2/python-3.7.2.post1-embed-win32.zip"
     DownloadFile -Path $Path -Name "python32.zip" -Url $Url
-    $Url = "https://www.python.org/ftp/python/3.6.4/python-3.6.4-embed-amd64.zip"
+    $Url = "https://www.python.org/ftp/python/3.7.2/python-3.7.2.post1-embed-amd64.zip"
     DownloadFile -Path $Path -Name "python64.zip" -Url $Url
 
     # Python: psutil
-    $DownloadPage = "https://pypi.python.org/pypi/psutil"
-    $RegEx = "href=.*-cp36-cp36m-win32.whl"
+    $DownloadPage = "https://pypi.org/project/psutil/"
+    $RegEx = "href=.*-cp37-cp37m-win32.whl"
     $Url = FindDynamicUrl $DownloadPage $RegEx
     DownloadFile -Path $Path -Name "psutil32.whl" -Url $Url
-    $RegEx = "href=.*-cp36-cp36m-win_amd64.whl"
+    $RegEx = "href=.*-cp37-cp37m-win_amd64.whl"
     $Url = FindDynamicUrl $DownloadPage $RegEx
     DownloadFile -Path $Path -Name "psutil64.whl" -Url $Url
 
     # Python: requests & dependancies
     $RegEx = "href=.*.py3-none-any.whl"
     foreach ($Module in @("chardet", "certifi", "idna", "urllib3", "requests")) {
-        $DownloadPage = "https://pypi.python.org/pypi/$Module"
+        $DownloadPage = "https://pypi.org/project/$Module/"
         $Name = "$Module.whl"
         $Url = FindDynamicUrl -SourcePage $DownloadPage -RegEx $RegEx
         DownloadFile -Path $Path -Name $Name -Url $Url
     }
+
+    # Visual C++ Runtimes
+    $Url = "https://aka.ms/vs/15/release/vc_redist.x86.exe"
+    DownloadFile -Path $Path -Name "vcredist_x86.exe" -Url $Url
+    $Url = "https://aka.ms/vs/15/release/vc_redist.x64.exe"
+    DownloadFile -Path $Path -Name "vcredist_x64.exe" -Url $Url
     
     ## Bail ##
     # If errors were encountered during downloads
     if ($DownloadErrors -gt 0) {
         Abort
     }
+
+    ## Install ##
+    # Visual C++ Runtimes
+    $ArgumentList = @("/install", "/passive", "/norestart")
+    Start-Process -FilePath "$Temp\vcredist_x86.exe" -ArgumentList $ArgumentList -Wait
+    Start-Process -FilePath "$Temp\vcredist_x64.exe" -ArgumentList $ArgumentList -Wait
+    Remove-Item "$Temp\vcredist*.exe"
     
     ## Extract ##
     # 7-Zip
@@ -192,6 +206,13 @@ if ($MyInvocation.InvocationName -ne ".") {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
     }
+    try {
+        Copy-Item -Path "$System32\vcruntime140.dll" -Destination "$Bin\Python\x64\vcruntime140.dll" -Force
+        Copy-Item -Path "$SysWOW64\vcruntime140.dll" -Destination "$Bin\Python\x32\vcruntime140.dll" -Force
+    }
+    catch {
+        Write-Host ("  ERROR: Failed to copy Visual C++ Runtime DLLs." ) -ForegroundColor "Red"
+    }
     Remove-Item "$Temp\python*.zip"
     Remove-Item "$Temp\*.whl"
 

.bin/Scripts/build_pe.ps1

@@ -17,6 +17,7 @@ $Date = Get-Date -UFormat "%Y-%m-%d"
 $Host.UI.RawUI.BackgroundColor = "Black"
 $Host.UI.RawUI.ForegroundColor = "White"
 $HostSystem32 = "{0}\System32" -f $Env:SystemRoot
+$HostSysWOW64 = "{0}\SysWOW64" -f $Env:SystemRoot
 $DISM = "{0}\DISM.exe" -f $Env:DISMRoot
 #Enable TLS 1.2
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
@@ -70,7 +71,7 @@ function DownloadFile ($Path, $Name, $Url) {
     }
     catch {
         Write-Host ("  ERROR: Failed to download file." ) -ForegroundColor "Red"
-        $DownloadErrors += 1
+        $global:DownloadErrors += 1
     }
 }
 function FindDynamicUrl ($SourcePage, $RegEx) {
@@ -130,55 +131,59 @@ if ($MyInvocation.InvocationName -ne ".") {
         ## Download Tools ##
         $ToolSources = @(
             # 7-Zip
-            @("7z-installer.msi", "http://www.7-zip.org/a/7z1801.msi"),
-            @("7z-extra.7z", "http://www.7-zip.org/a/7z1801-extra.7z"),
+            @("7z-installer.msi", "https://www.7-zip.org/a/7z1900.msi"),
+            @("7z-extra.7z", "https://www.7-zip.org/a/7z1900-extra.7z"),
             # Blue Screen View
-            @("bluescreenview64.zip", "http://www.nirsoft.net/utils/bluescreenview-x64.zip"),
             @("bluescreenview32.zip", "http://www.nirsoft.net/utils/bluescreenview.zip"),
+            @("bluescreenview64.zip", "http://www.nirsoft.net/utils/bluescreenview-x64.zip"),
             # ConEmu
-            @("ConEmuPack.7z", "https://github.com/Maximus5/ConEmu/releases/download/v18.02.06/ConEmuPack.180206.7z"),
+            @("ConEmuPack.7z", "https://github.com/Maximus5/ConEmu/releases/download/v19.03.10/ConEmuPack.190310.7z"),
             # Fast Copy
-            @("fastcopy64.zip", "http://ftp.vector.co.jp/69/93/2323/FastCopy341_x64.zip"),
-            @("fastcopy32.zip", "http://ftp.vector.co.jp/69/93/2323/FastCopy341.zip"),
+            @("fastcopy.zip", "http://ftp.vector.co.jp/71/31/2323/FastCopy363_installer.exe"),
             # HWiNFO
-            @("hwinfo.zip", "http://app.oldfoss.com:81/download/HWiNFO/hwi_574.zip"),
+            @("hwinfo.zip", "http://files2.majorgeeks.com/377527622c5325acc1cb937fb149d0de922320c0/systeminfo/hwi_602.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('&', '&'))
+                ("https://www.killernetworking.com"+(FindDynamicUrl "https://www.killernetworking.com/killersupport/category/other-downloads" "Download Killer-Ethernet").replace('&', '&'))
             ),
             # Notepad++
-            @("npp_amd64.7z", "https://notepad-plus-plus.org/repository/7.x/7.5.5/npp.7.5.5.bin.minimalist.x64.7z"),
-            @("npp_x86.7z", "https://notepad-plus-plus.org/repository/7.x/7.5.5/npp.7.5.5.bin.minimalist.7z"),
+            @("npp_x86.7z", "https://notepad-plus-plus.org/repository/7.x/7.6.4/npp.7.6.4.bin.minimalist.7z"),
+            @("npp_amd64.7z", "https://notepad-plus-plus.org/repository/7.x/7.6.4/npp.7.6.4.bin.minimalist.x64.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/p95v294b8.win64.zip"),
             @("prime95_32.zip", "http://www.mersenne.org/ftp_root/gimps/p95v294b7.win32.zip"),
+            @("prime95_64.zip", "http://www.mersenne.org/ftp_root/gimps/p95v294b8.win64.zip"),
             # ProduKey
-            @("produkey64.zip", "http://www.nirsoft.net/utils/produkey-x64.zip"),
             @("produkey32.zip", "http://www.nirsoft.net/utils/produkey.zip"),
+            @("produkey64.zip", "http://www.nirsoft.net/utils/produkey-x64.zip"),
             # Python
-            @("python64.zip", "https://www.python.org/ftp/python/3.6.4/python-3.6.4-embed-amd64.zip"),
-            @("python32.zip", "https://www.python.org/ftp/python/3.6.4/python-3.6.4-embed-win32.zip"),
+            @("python32.zip", "https://www.python.org/ftp/python/3.7.2/python-3.7.2.post1-embed-win32.zip"),
+            @("python64.zip", "https://www.python.org/ftp/python/3.7.2/python-3.7.2.post1-embed-amd64.zip"),
             # Python: psutil
             @(
                 "psutil64.whl",
-                (FindDynamicUrl "https://pypi.python.org/pypi/psutil" "href=.*-cp36-cp36m-win_amd64.whl")
+                (FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp37-cp37m-win_amd64.whl")
             ),
             @(
                 "psutil32.whl",
-                (FindDynamicUrl "https://pypi.python.org/pypi/psutil" "href=.*-cp36-cp36m-win32.whl")
+                (FindDynamicUrl "https://pypi.org/project/psutil/" "href=.*-cp37-cp37m-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"),
+            @("qdir64.zip", "https://www.softwareok.com/Download/Q-Dir_Portable_x64.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"),
+            @("testdisk64.zip", "https://www.cgsecurity.org/testdisk-7.1-WIP.win64.zip"),
+            # VirtIO drivers
+            @("virtio-win.iso", "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/latest-virtio/virtio-win.iso"),
+            # Visual C++ Runtimes
+            @("vcredist_x86.exe", "https://aka.ms/vs/15/release/vc_redist.x86.exe"),
+            @("vcredist_x64.exe", "https://aka.ms/vs/15/release/vc_redist.x64.exe"),
             # wimlib-imagex
-            @("wimlib64.zip", "https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip"),
-            @("wimlib32.zip", "https://wimlib.net/downloads/wimlib-1.12.0-windows-i686-bin.zip")
+            @("wimlib32.zip", "https://wimlib.net/downloads/wimlib-1.13.0-windows-i686-bin.zip"),
+            @("wimlib64.zip", "https://wimlib.net/downloads/wimlib-1.13.0-windows-x86_64-bin.zip")
         )
         foreach ($Tool in $ToolSources) {
             DownloadFile -Path $Temp -Name $Tool[0] -Url $Tool[1]
@@ -189,6 +194,13 @@ if ($MyInvocation.InvocationName -ne ".") {
         if ($DownloadErrors -gt 0) {
             Abort
         }
+
+        ## Install ##
+        # Visual C++ Runtimes
+        Write-Host "Installing: Visual C++ Runtimes"
+        $ArgumentList = @("/install", "/passive", "/norestart")
+        Start-Process -FilePath "$Temp\vcredist_x86.exe" -ArgumentList $ArgumentList -Wait
+        Start-Process -FilePath "$Temp\vcredist_x64.exe" -ArgumentList $ArgumentList -Wait
         
         ## Extract ##
         # 7-Zip
@@ -207,8 +219,6 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "-aoa", "-bso0", "-bse0", "-bsp0",
                 "7za.exe", "*.txt")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
-            Remove-Item "$Temp\7z*" -Recurse
-            $SevenZip = "$Build\bin\x86\7-Zip\7za.exe"
         }
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
@@ -225,7 +235,6 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "x", "$Temp\bluescreenview32.zip", "-o$Build\bin\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"
@@ -248,7 +257,6 @@ if ($MyInvocation.InvocationName -ne ".") {
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
             Remove-Item "$Build\bin\x86\ConEmu\ConEmu64.exe"
             Remove-Item "$Build\bin\x86\ConEmu\ConEmu64.map"
-            Remove-Item "$Temp\ConEmuPack*"
         }
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
@@ -257,21 +265,30 @@ if ($MyInvocation.InvocationName -ne ".") {
         # Fast Copy
         Write-Host "Extracting: FastCopy"
         try {
+            # Extract Installer
             $ArgumentList = @(
-                "x", "$Temp\fastcopy64.zip", "-o$Build\bin\amd64\FastCopy",
-                "-aoa", "-bso0", "-bse0", "-bsp0",
-                "-x!setup.exe", "-x!*.dll")
+                "e", "$Temp\fastcopy.zip", "-o$Temp",
+                "-aoa", "-bso0", "-bse0", "-bsp0")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+
+            # Extract 64-bit
             $ArgumentList = @(
-                "e", "$Temp\fastcopy32.zip", "-o$Build\bin\x86\FastCopy",
-                "-aoa", "-bso0", "-bse0", "-bsp0",
-                "-x!setup.exe", "-x!*.dll")
-            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
-            Remove-Item "$Temp\fastcopy*"
+                "/NOSUBDIR", "/DIR=$Build\bin\amd64\FastCopy",
+                "/EXTRACT64")
+            Start-Process -FilePath "$TEMP\FastCopy354_installer.exe" -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Build\bin\amd64\FastCopy\setup.exe" -Force
+
+            # Extract 32-bit
+            $ArgumentList = @(
+                "/NOSUBDIR", "/DIR=$Build\bin\x86\FastCopy",
+                "/EXTRACT32")
+            Start-Process -FilePath "$TEMP\FastCopy354_installer.exe" -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Remove-Item "$Build\bin\x86\FastCopy\setup.exe" -Force
         }
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
+
         
         # Killer Network Driver
         Write-Host "Extracting: Killer Network Driver"
@@ -286,7 +303,6 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "-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"
@@ -303,7 +319,6 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "e", "$Temp\hwinfo.zip", "-o$Build\bin\x86\HWiNFO",
                 "-aoa", "-bso0", "-bse0", "-bsp0", "HWiNFO32.exe")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
-            # Remove-Item "$Temp\hwinfo.zip"
             Move-Item "$Build\bin\amd64\HWiNFO\HWiNFO64.exe" "$Build\bin\amd64\HWiNFO\HWiNFO.exe" -Force
             Move-Item "$Build\bin\x86\HWiNFO\HWiNFO32.exe" "$Build\bin\x86\HWiNFO\HWiNFO.exe" -Force
         }
@@ -322,7 +337,6 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "x", "$Temp\npp_x86.7z", "-o$Build\bin\x86\NotepadPlusPlus",
                 "-aoa", "-bso0", "-bse0", "-bsp0")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
-            Remove-Item "$Temp\npp*"
             Move-Item "$Build\bin\amd64\NotepadPlusPlus\notepad++.exe" "$Build\bin\amd64\NotepadPlusPlus\notepadplusplus.exe" -Force
             Move-Item "$Build\bin\x86\NotepadPlusPlus\notepad++.exe" "$Build\bin\x86\NotepadPlusPlus\notepadplusplus.exe" -Force
         }
@@ -344,7 +358,6 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "-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"
@@ -369,7 +382,6 @@ if ($MyInvocation.InvocationName -ne ".") {
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
             Move-Item "$Build\bin\x86\TestDisk\testdisk-7.1-WIP\*" "$Build\bin\x86\TestDisk" -Force
             Remove-Item "$Build\bin\x86\TestDisk\testdisk-7.1-WIP" -Recurse -Force
-            Remove-Item "$Temp\testdisk*"
         }
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
@@ -386,7 +398,6 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "x", "$Temp\prime95_32.zip", "-o$Build\bin\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"
@@ -402,7 +413,6 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "x", "$Temp\produkey32.zip", "-o$Build\bin\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"
@@ -424,6 +434,12 @@ if ($MyInvocation.InvocationName -ne ".") {
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
+        try {
+            Copy-Item -Path "$HostSystem32\vcruntime140.dll" -Destination "$Build\bin\amd64\python\vcruntime140.dll" -Force
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to copy Visual C++ Runtime DLL." ) -ForegroundColor "Red"
+        }
 
         # Python (x32)
         Write-Host "Extracting: Python (x32)"
@@ -441,8 +457,12 @@ if ($MyInvocation.InvocationName -ne ".") {
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
-        Remove-Item "$Temp\python*"
-        Remove-Item "$Temp\*.whl"
+        try {
+            Copy-Item -Path "$HostSysWOW64\vcruntime140.dll" -Destination "$Build\bin\x86\python\vcruntime140.dll" -Force
+        }
+        catch {
+            Write-Host ("  ERROR: Failed to copy Visual C++ Runtime DLL." ) -ForegroundColor "Red"
+        }
     
         # Q-Dir
         Write-Host "Extracting: Q-Dir"
@@ -451,11 +471,29 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "x", "$Temp\qdir64.zip", "-o$Build\bin\amd64",
                 "-aoa", "-bso0", "-bse0", "-bsp0")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            Move-Item "$Build\bin\amd64\Q-Dir\Q-Dir_x64.exe" "$Build\bin\amd64\Q-Dir\Q-Dir.exe" -Force
             $ArgumentList = @(
                 "x", "$Temp\qdir32.zip", "-o$Build\bin\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"
+        }
+        
+        # VirtIO Drivers
+        Write-Host "Extracting: VirtIO Drivers"
+        try {
+            $ArgumentList = @(
+                "e", "$Temp\virtio-win.iso", "-o$Build\Drivers\amd64\VirtIO",
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "*\w10\amd64\*")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
+            $ArgumentList = @(
+                "e", "$Temp\virtio-win.iso", "-o$Build\Drivers\x86\VirtIO",
+                "-aoa", "-bso0", "-bse0", "-bsp0",
+                "*\w10\x86\*")
+            Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
         }
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
@@ -471,11 +509,15 @@ if ($MyInvocation.InvocationName -ne ".") {
                 "x", "$Temp\wimlib32.zip", "-o$Build\bin\x86\wimlib",
                 "-aoa", "-bso0", "-bse0", "-bsp0")
             Start-Process -FilePath $SevenZip -ArgumentList $ArgumentList -NoNewWindow -Wait
-            Remove-Item "$Temp\wimlib*"
         }
         catch {
             Write-Host ("  ERROR: Failed to extract files." ) -ForegroundColor "Red"
         }
+        
+        ## Cleanup ##
+        if (Ask-User "Delete temp files?") {
+            Remove-Item "$Temp" -Recurse
+        }
     }
     
     ## Build ##

.bin/Scripts/cbs_fix.py

@@ -4,39 +4,40 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.cleanup import *
 from functions.data import *
 init_global_vars()
 os.system('title {}: CBS Cleanup'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\CBS Cleanup.log'.format(**global_vars)
+set_log_file('CBS Cleanup.log')
 
 if __name__ == '__main__':
-    try:
-        # Prep
-        stay_awake()
-        clear_screen()
-        folder_path = r'{}\Backups'.format(KIT_NAME_SHORT)
-        dest = select_destination(folder_path=folder_path,
-            prompt='Which disk are we using for temp data and backup?')
-        
-        # Show details
-        print_info('{}: CBS Cleanup Tool\n'.format(KIT_NAME_FULL))
-        show_data('Backup / Temp path:', dest)
-        print_standard('\n')
-        if (not ask('Proceed with CBS cleanup?')):
-            abort()
-        
-        # Run Cleanup
-        try_and_print(message='Running cleanup...', function=cleanup_cbs,
-            cs='Done', dest_folder=dest)
-        
-        # Done
-        print_standard('\nDone.')
-        pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    # Prep
+    stay_awake()
+    clear_screen()
+    folder_path = r'{}\Backups'.format(KIT_NAME_SHORT)
+    dest = select_destination(folder_path=folder_path,
+      prompt='Which disk are we using for temp data and backup?')
+
+    # Show details
+    print_info('{}: CBS Cleanup Tool\n'.format(KIT_NAME_FULL))
+    show_data('Backup / Temp path:', dest)
+    print_standard('\n')
+    if (not ask('Proceed with CBS cleanup?')):
+      abort()
+
+    # Run Cleanup
+    try_and_print(message='Running cleanup...', function=cleanup_cbs,
+      cs='Done', dest_folder=dest)
+
+    # Done
+    print_standard('\nDone.')
+    pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/check_disk.py

@@ -4,53 +4,54 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: Check Disk Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\Check Disk.log'.format(**global_vars)
+set_log_file('Check Disk.log')
 
 if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        other_results = {
-            'Error': {
-                'CalledProcessError':   'Unknown Error',
-            },
-            'Warning': {
-                'GenericRepair':        'Repaired',
-                'UnsupportedOSError':   'Unsupported OS',
-            }}
-        options = [
-            {'Name': 'Run CHKDSK scan (read-only)', 'Repair': False},
-            {'Name': 'Schedule CHKDSK scan (offline repair)', 'Repair': True}]
-        actions = [{'Name': 'Quit', 'Letter': 'Q'}]
-        selection = menu_select(
-            '{}: Check Disk Menu\n'.format(KIT_NAME_FULL),
-            main_entries=options,
-            action_entries=actions)
-        print_info('{}: Check Disk Menu\n'.format(KIT_NAME_FULL))
-        if selection == 'Q':
-            abort()
-        elif selection.isnumeric():
-            repair = options[int(selection)-1]['Repair']
-            if repair:
-                cs = 'Scheduled'
-            else:
-                cs = 'CS'
-            message = 'CHKDSK ({SYSTEMDRIVE})...'.format(**global_vars['Env'])
-            try_and_print(message=message, function=run_chkdsk,
-                cs=cs, other_results=other_results, repair=repair)
-        else:
-            abort()
-        
-        # Done
-        print_success('Done.')
-        pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    stay_awake()
+    clear_screen()
+    other_results = {
+      'Error': {
+        'CalledProcessError':   'Unknown Error',
+      },
+      'Warning': {
+        'GenericRepair':    'Repaired',
+        'UnsupportedOSError':   'Unsupported OS',
+      }}
+    options = [
+      {'Name': 'Run CHKDSK scan (read-only)', 'Repair': False},
+      {'Name': 'Schedule CHKDSK scan (offline repair)', 'Repair': True}]
+    actions = [{'Name': 'Quit', 'Letter': 'Q'}]
+    selection = menu_select(
+      '{}: Check Disk Menu\n'.format(KIT_NAME_FULL),
+      main_entries=options,
+      action_entries=actions)
+    print_info('{}: Check Disk Menu\n'.format(KIT_NAME_FULL))
+    if selection == 'Q':
+      abort()
+    elif selection.isnumeric():
+      repair = options[int(selection)-1]['Repair']
+      if repair:
+        cs = 'Scheduled'
+      else:
+        cs = 'No issues'
+      message = 'CHKDSK ({SYSTEMDRIVE})...'.format(**global_vars['Env'])
+      try_and_print(message=message, function=run_chkdsk,
+        cs=cs, other_results=other_results, repair=repair)
+    else:
+      abort()
+
+    # Done
+    print_success('Done.')
+    pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/connect-to-network

@@ -1,30 +0,0 @@
-#!/bin/python3
-#
-## Wizard Kit: Network connection tool
-
-import os
-import sys
-
-# Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
-from functions.network import *
-init_global_vars()
-
-if __name__ == '__main__':
-    try:
-        # Prep
-        clear_screen()
-
-        # Connect
-        connect_to_network()
-        
-        # Done
-        print_standard('\nDone.')
-        #pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
-

.bin/Scripts/ddrescue-tui

@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+## Wizard Kit: ddrescue TUI Launcher
+
+source launch-in-tmux
+
+SESSION_NAME="ddrescue-tui"
+WINDOW_NAME="ddrescue TUI"
+TMUX_CMD="ddrescue-tui-menu"
+
+launch_in_tmux "$@"

.bin/Scripts/ddrescue-tui-menu

@@ -0,0 +1,64 @@
+#!/bin/python3
+#
+## Wizard Kit: TUI for ddrescue cloning and imaging
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from functions.ddrescue import *
+from functions.hw_diags import *
+init_global_vars()
+
+if __name__ == '__main__':
+  try:
+    # Prep
+    clear_screen()
+    args = list(sys.argv)
+    run_mode = ''
+    source_path = None
+    dest_path = None
+
+    # Parse args
+    try:
+      script_name = os.path.basename(args.pop(0))
+      run_mode = str(args.pop(0)).lower()
+      source_path = args.pop(0)
+      dest_path = args.pop(0)
+    except IndexError:
+      # We'll set the missing paths later
+      pass
+
+    # Show usage
+    if re.search(r'-+(h|help)', str(sys.argv), re.IGNORECASE):
+      show_usage(script_name)
+      exit_script()
+
+    # Start cloning/imaging
+    if run_mode in ('clone', 'image'):
+      menu_ddrescue(source_path, dest_path, run_mode)
+    else:
+      if not re.search(r'^-*(h|help\?)', run_mode, re.IGNORECASE):
+        print_error('Invalid mode.')
+
+    # Done
+    print_standard('\nDone.')
+    pause("Press Enter to exit...")
+    tmux_switch_client()
+    exit_script()
+  except GenericAbort:
+    abort()
+  except GenericError as ge:
+    msg = 'Generic Error'
+    if str(ge):
+      msg = str(ge)
+    print_error(msg)
+    abort()
+  except SystemExit as sys_exit:
+    tmux_switch_client()
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/debug/hw_diags.py

@@ -0,0 +1,186 @@
+# Wizard Kit: Debug - HW Diagnostics
+
+import base64
+import requests
+
+from functions.common import *
+
+def debug_report_cpu(cpu_obj):
+  """Generate report for CpuObj, returns list."""
+  report = []
+
+  # CPU Info
+  report.append('CPU: {}'.format(cpu_obj.name))
+  report.append('lscpu:')
+  for k, v in sorted(cpu_obj.lscpu.items()):
+    report.append('  {}: {}'.format(k, v))
+
+  # Tests
+  report.append('Tests:')
+  for k, v in cpu_obj.tests.items():
+    report.extend(debug_report_test(v, k))
+
+  # Done
+  return report
+
+
+def debug_report_disk(disk_obj):
+  """Generate report for DiskObj, returns list."""
+  report = []
+  expand = [
+    'lsblk',
+    'nvme_attributes',
+    'nvme_smart_notes',
+    'smart_attributes',
+    'smart_self_test',
+    'smartctl',
+    ]
+  skip = [
+    'add_nvme_smart_note',
+    'calc_io_dd_values',
+    'check_attributes',
+    'check_smart_self_test',
+    'description',
+    'disable_test',
+    'generate_attribute_report',
+    'generate_disk_report',
+    'get_details',
+    'get_size',
+    'get_smart_details',
+    'name',
+    'safety_check',
+    'tests',
+    ]
+
+  # Disk Info
+  report.append('Disk: {} {}'.format(
+    disk_obj.name, disk_obj.description))
+  for a in dir(disk_obj):
+    if a.startswith('_') or a in skip:
+      continue
+    if a in expand:
+      report.append('{}:'.format(a))
+      attr = getattr(disk_obj, a)
+      try:
+        for k, v in sorted(attr.items()):
+          report.append('  {}: {}'.format(k, v))
+      except Exception:
+        # Ignore
+        pass
+    else:
+      report.append('{}: {}'.format(a, getattr(disk_obj, a)))
+
+  # Tests
+  report.append('Tests:')
+  for k, v in disk_obj.tests.items():
+    report.extend(debug_report_test(v, k))
+
+  # Done
+  return report
+
+
+def debug_report_state(state):
+  """Generate report for State, returns list."""
+  report = []
+
+  # Devs
+  report.append('CPU: {}'.format(state.cpu))
+  report.append('Disks: {}'.format(state.disks))
+
+  # Settings
+  report.append('Progress Out: {}'.format(state.progress_out))
+  report.append('Quick Mode: {}'.format(state.quick_mode))
+
+  # Tests
+  report.append('Tests:')
+  for k, v in state.tests.items():
+    report.append('  {}:'.format(k))
+    for k2, v2 in sorted(v.items()):
+      report.append('    {}: {}'.format(k2, v2))
+
+  # tmux
+  if hasattr(state, 'tmux_layout'):
+    report.append('tmux Layout:')
+    for k, v in state.tmux_layout.items():
+      report.append('  {}: {}'.format(k, str(v)))
+  if hasattr(state, 'panes'):
+    report.append('tmux Panes:')
+    for k, v in state.panes.items():
+      report.append('  {}: {}'.format(k, str(v)))
+
+  # Done
+  return report
+
+
+def debug_report_test(test_obj, test_name):
+  """Generate report for TestObj, returns list."""
+  report = ['  {}:'.format(test_name)]
+  skip = ['update_status']
+
+  # Attributes
+  for a in [a for a in dir(test_obj) if not a.startswith('_')]:
+    if a in skip:
+      continue
+    report.append('    {}: {}'.format(a, getattr(test_obj, a)))
+
+  # Done
+  return report
+
+
+def save_debug_reports(state, global_vars):
+  """Save debug reports if possible."""
+  debug_dest = '{}/debug'.format(global_vars['LogDir'])
+  os.makedirs(debug_dest, exist_ok=True)
+
+  # State
+  with open('{}/state.report'.format(debug_dest), 'a') as f:
+    for line in debug_report_state(state):
+      f.write('{}\n'.format(line))
+
+  # CPU
+  with open('{}/cpu.report'.format(debug_dest), 'a') as f:
+    for line in debug_report_cpu(state.cpu):
+      f.write('{}\n'.format(line))
+
+  # Disk(s)
+  for disk in state.disks:
+    with open('{}/disk_{}.report'.format(debug_dest, disk.name), 'a') as f:
+      for line in debug_report_disk(disk):
+        f.write('{}\n'.format(line))
+
+
+def upload_logdir(global_vars, reason='Crash'):
+  """Upload compressed LogDir to CRASH_SERVER."""
+  source = global_vars['LogDir']
+  source = source[source.rfind('/')+1:]
+  dest = 'HW-Diags_{reason}_{Date-Time}.txz'.format(
+    reason=reason,
+    **global_vars,
+    )
+  data = None
+
+  # Compress LogDir
+  os.chdir('{}/..'.format(global_vars['LogDir']))
+  cmd = ['tar', 'caf', dest, source]
+  run_program(cmd)
+
+  # Read file
+  with open(dest, 'rb') as f:
+    data = f.read()
+
+  # Upload data
+  url = '{}/{}'.format(CRASH_SERVER['Url'], dest)
+  r = requests.put(
+    url,
+    data=data,
+    headers={'X-Requested-With': 'XMLHttpRequest'},
+    auth=(CRASH_SERVER['User'], CRASH_SERVER['Pass']))
+  # Raise exception if upload NS
+  if not r.ok:
+    raise GenericError
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/dism.py

@@ -4,54 +4,55 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: DISM helper Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\DISM helper tool.log'.format(**global_vars)
+set_log_file('DISM Helper.log')
 
 if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        other_results = {
-            'Error': {
-                'CalledProcessError':   'Unknown Error',
-            },
-            'Warning': {
-                'GenericRepair':        'Repaired',
-                'UnsupportedOSError':   'Unsupported OS',
-            }}
-        disabled = bool(global_vars['OS']['Version'] not in ['8', '10'])
-        options = [
-            {'Name': 'Check Health', 'Repair': False, 'Disabled': disabled},
-            {'Name': 'Restore Health', 'Repair': True, 'Disabled': disabled}]
-        actions = [{'Name': 'Quit', 'Letter': 'Q'}]
-        selection = menu_select(
-            '{}: DISM Menu\n'.format(KIT_NAME_FULL),
-            main_entries=options,
-            action_entries=actions)
-        print_info('{}: DISM Menu\n'.format(KIT_NAME_FULL))
-        if selection == 'Q':
-            abort()
-        elif selection.isnumeric():
-            repair = options[int(selection)-1]['Repair']
-            if repair:
-                message='DISM RestoreHealth...'
-            else:
-                message='DISM ScanHealth...'
-            try_and_print(message=message, function=run_dism,
-                cs='No corruption', ns='Corruption detected',
-                other_results=other_results, repair=repair)
-        else:
-            abort()
-        
-        # Done
-        print_success('Done.')
-        pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    stay_awake()
+    clear_screen()
+    other_results = {
+      'Error': {
+        'CalledProcessError':   'Unknown Error',
+      },
+      'Warning': {
+        'GenericRepair':    'Repaired',
+        'UnsupportedOSError':   'Unsupported OS',
+      }}
+    disabled = bool(global_vars['OS']['Version'] not in ('8', '8.1', '10'))
+    options = [
+      {'Name': 'Check Health', 'Repair': False, 'Disabled': disabled},
+      {'Name': 'Restore Health', 'Repair': True, 'Disabled': disabled}]
+    actions = [{'Name': 'Quit', 'Letter': 'Q'}]
+    selection = menu_select(
+      '{}: DISM Menu\n'.format(KIT_NAME_FULL),
+      main_entries=options,
+      action_entries=actions)
+    print_info('{}: DISM Menu\n'.format(KIT_NAME_FULL))
+    if selection == 'Q':
+      abort()
+    elif selection.isnumeric():
+      repair = options[int(selection)-1]['Repair']
+      if repair:
+        message='DISM RestoreHealth...'
+      else:
+        message='DISM ScanHealth...'
+      try_and_print(message=message, function=run_dism,
+        cs='No corruption', ns='Corruption detected',
+        other_results=other_results, repair=repair)
+    else:
+      abort()
+
+    # Done
+    print_success('Done.')
+    pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/echo-and-hold

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+## Wizard Kit: "echo" text to screen and "hold" by waiting for user input
+
+function usage {
+    echo "Usage: $(basename "$0") \"text\""
+    echo "  e.g. $(basename "$0") \"Some text to show\""
+}
+
+echo -en "$@" && read -r __dont_care
+exit 0
+

.bin/Scripts/functions/activation.py

@@ -6,61 +6,68 @@ from borrowed import acpi
 from functions.common import *
 from os import environ
 
-# Variables
+
+# STATIC VARIABLES
 SLMGR = r'{}\System32\slmgr.vbs'.format(environ.get('SYSTEMROOT'))
 
+
 def activate_with_bios():
-    """Attempt to activate Windows with a key stored in the BIOS."""
-    # Code borrowed from https://github.com/aeruder/get_win8key
-    #####################################################
-    #script to query windows 8.x OEM key from PC firmware
-    #ACPI -> table MSDM -> raw content -> byte offset 56 to end
-    #ck, 03-Jan-2014 (christian@korneck.de)
-    #####################################################
-    bios_key = None
-    table = b"MSDM"
-    if acpi.FindAcpiTable(table) is True:
-        rawtable = acpi.GetAcpiTable(table)
-        #http://msdn.microsoft.com/library/windows/hardware/hh673514
-        #byte offset 36 from beginning \
-        #   = Microsoft 'software licensing data structure' \
-        #   / 36 + 20 bytes offset from beginning = Win Key
-        bios_key = rawtable[56:len(rawtable)].decode("utf-8")
-    if bios_key is None:
-        raise BIOSKeyNotFoundError
+  """Attempt to activate Windows with a key stored in the BIOS."""
+  # Code borrowed from https://github.com/aeruder/get_win8key
+  #####################################################
+  #script to query windows 8.x OEM key from PC firmware
+  #ACPI -> table MSDM -> raw content -> byte offset 56 to end
+  #ck, 03-Jan-2014 (christian@korneck.de)
+  #####################################################
+  bios_key = None
+  table = b"MSDM"
+  if acpi.FindAcpiTable(table) is True:
+    rawtable = acpi.GetAcpiTable(table)
+    #http://msdn.microsoft.com/library/windows/hardware/hh673514
+    #byte offset 36 from beginning \
+    #   = Microsoft 'software licensing data structure' \
+    #   / 36 + 20 bytes offset from beginning = Win Key
+    bios_key = rawtable[56:len(rawtable)].decode("utf-8")
+  if bios_key is None:
+    raise BIOSKeyNotFoundError
 
-    # Install Key
-    cmd = ['cscript', '//nologo', SLMGR, '/ipk', bios_key]
-    subprocess.run(cmd, check=False)
-    sleep(5)
+  # Install Key
+  cmd = ['cscript', '//nologo', SLMGR, '/ipk', bios_key]
+  subprocess.run(cmd, check=False)
+  sleep(5)
 
-    # Attempt activation
-    cmd = ['cscript', '//nologo', SLMGR, '/ato']
-    subprocess.run(cmd, check=False)
-    sleep(5)
+  # Attempt activation
+  cmd = ['cscript', '//nologo', SLMGR, '/ato']
+  subprocess.run(cmd, check=False)
+  sleep(5)
+
+  # Check status
+  if not windows_is_activated():
+    raise Exception('Activation Failed')
 
-    # Check status
-    if not windows_is_activated():
-        raise Exception('Activation Failed')
 
 def get_activation_string():
-    """Get activation status, returns str."""
-    act_str = subprocess.run(
-        ['cscript', '//nologo', SLMGR, '/xpr'], check=False,
-        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    act_str = act_str.stdout.decode()
-    act_str = act_str.splitlines()
-    act_str = act_str[1].strip()
-    return act_str
+  """Get activation status, returns str."""
+  act_str = subprocess.run(
+    ['cscript', '//nologo', SLMGR, '/xpr'], check=False,
+    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  act_str = act_str.stdout.decode()
+  act_str = act_str.splitlines()
+  act_str = act_str[1].strip()
+  return act_str
+
 
 def windows_is_activated():
-    """Check if Windows is activated via slmgr.vbs and return bool."""
-    activation_string = subprocess.run(
-        ['cscript', '//nologo', SLMGR, '/xpr'], check=False,
-        stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    activation_string = activation_string.stdout.decode()
-    
-    return bool(activation_string and 'permanent' in activation_string)
+  """Check if Windows is activated via slmgr.vbs and return bool."""
+  activation_string = subprocess.run(
+    ['cscript', '//nologo', SLMGR, '/xpr'], check=False,
+    stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  activation_string = activation_string.stdout.decode()
+
+  return bool(activation_string and 'permanent' in activation_string)
+
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/backup.py

@@ -1,158 +1,219 @@
 # Wizard Kit: Functions - Backup
 
+import ctypes
+
 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)
+  r'([<>:"/\|\?\*]'
+  r'|^(CON|PRN|AUX|NUL|COM\d*|LPT\d*)$)'
+  r'|^\s+'
+  r'|[\s\.]+$',
+  re.IGNORECASE)
+
 
 def backup_partition(disk, par):
-    """Create a backup image of a partition."""
-    if par.get('Image Exists', False) 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)
+  """Create a backup image of a partition."""
+  if (par.get('Image Exists', False)
+      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):
-    """Replace invalid filename characters with underscores."""
-    return REGEX_BAD_PATH_NAMES.sub('_', path)
+  """Replace invalid filename characters with underscores."""
+  local_drive = path[1:2] == ':'
+  new_path = REGEX_BAD_PATH_NAMES.sub('_', path)
+  if local_drive:
+    new_path = '{}:{}'.format(new_path[0:1], new_path[2:])
+  return new_path
 
-def prep_disk_for_backup(destination, disk, ticket_number):
-    """Gather details about the disk and its partitions.
-    
-    This includes partitions that can't be backed up,
-        whether backups already exist on the BACKUP_SERVER,
-        partition names/sizes/used space, etc."""
-    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(par)]
-    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 = '{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'])
-        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'])
+def get_volume_display_name(mountpoint):
+  """Get display name from volume mountpoint and label, returns str."""
+  name = mountpoint
+  try:
+    kernel32 = ctypes.windll.kernel32
+    vol_name_buffer = ctypes.create_unicode_buffer(1024)
+    fs_name_buffer = ctypes.create_unicode_buffer(1024)
+    serial_number = None
+    max_component_length = None
+    file_system_flags = None
+
+    vol_info = kernel32.GetVolumeInformationW(
+      ctypes.c_wchar_p(mountpoint),
+      vol_name_buffer,
+      ctypes.sizeof(vol_name_buffer),
+      serial_number,
+      max_component_length,
+      file_system_flags,
+      fs_name_buffer,
+      ctypes.sizeof(fs_name_buffer)
+      )
+
+    name = '{} "{}"'.format(name, vol_name_buffer.value)
+  except:
+    pass
+
+  return name
+
+
+def prep_disk_for_backup(destination, disk, backup_prefix):
+  """Gather details about the disk and its partitions.
+
+  This includes partitions that can't be backed up,
+    whether backups already exist on the BACKUP_SERVER,
+    partition names/sizes/used space, etc."""
+  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(par)]
+  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 = '{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'])
+    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'], backup_prefix)
+      else:
+        par['Image Path'] = r'{}:\{}'.format(
+          destination['Letter'], backup_prefix)
+      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(display)
+      else:
+        display = '  {}'.format(display)
+
+      # Append rest of Display String for valid/clobber partitions
+      display += ' (Used: {used})\t{q}{name}{q}'.format(
+        used = par['Used Space'],
+        q = '"' if par['Name'] != '' else '',
+        name = par['Name'])
+    # 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
 
-            # 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(display)
-            else:
-                display = '  {}'.format(display)
-            
-            # Append rest of Display String for valid/clobber partitions
-            display += ' (Used: {used})\t{q}{name}{q}'.format(
-                used = par['Used Space'],
-                q = '"' if par['Name'] != '' else '',
-                name = par['Name'])
-        # 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):
-    """Select a backup destination from a menu, returns server dict."""
-    destinations = [s for s in BACKUP_SERVERS if s['Mounted']]
-    actions = [
-        {'Name': 'Main Menu', 'Letter': 'M'},
-        ]
+  """Select a backup destination from a menu, returns server dict."""
+  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)
+  # Add local disks
+  for d in psutil.disk_partitions():
+    if re.search(
+        r'^{}'.format(global_vars['Env']['SYSTEMDRIVE']),
+        d.mountpoint,
+        re.IGNORECASE):
+      # Skip current OS drive
+      pass
+    elif 'fixed' in d.opts:
+      # Skip DVD, etc
+      destinations.append({
+        'Name':   'Local Disk - {}'.format(
+          get_volume_display_name(d.mountpoint)),
+        'Letter':   re.sub(r'^(\w):\\.*$', r'\1', d.mountpoint),
+        })
 
-    # 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
+  # Size check
+  for dest in destinations:
+    if 'IP' in dest:
+      dest['Usage'] = shutil.disk_usage(r'\\{IP}\{Share}'.format(**dest))
     else:
-        return destinations[int(selection)-1]
+      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):
-    """Verify WIM integrity."""
-    if not os.path.exists(partition['Image Path']):
-        raise PathNotFoundError
-    cmd = [
-        global_vars['Tools']['wimlib-imagex'],
-        'verify',
-        partition['Image Path'],
-        '--nocheck',
-        ]
-    run_program(cmd)
+  """Verify WIM integrity."""
+  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.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/browsers.py

@@ -1,446 +1,470 @@
 # Wizard Kit: Functions - Browsers
 
 from functions.common import *
+from operator import itemgetter
+from settings.browsers import *
+
 
 # Define other_results for later try_and_print
 browser_data = {}
 other_results = {
-    'Error': {
-        'MultipleInstallationsError': 'Multiple installations detected',
-        },
-    'Warning': {
-        'NotInstalledError': 'Not installed',
-        'NoProfilesError': 'No profiles found',
-        }
+  'Error': {
+    'MultipleInstallationsError': 'Multiple installations detected',
+    },
+  'Warning': {
+    'NotInstalledError': 'Not installed',
+    'NoProfilesError': 'No profiles found',
     }
+  }
 
-# Regex
-REGEX_BACKUP = re.compile(
-    r'\.\w*bak.*',
-    re.IGNORECASE)
-REGEX_CHROMIUM_PROFILE = re.compile(
-    r'^(Default|Profile)',
-    re.IGNORECASE)
-REGEX_CHROMIUM_ITEMS = re.compile(
-    r'^(Bookmarks|Cookies|Favicons|Google Profile'
-    r'|History|Login Data|Top Sites|TransportSecurity'
-    r'|Visited Links|Web Data)',
-    re.IGNORECASE)
-REGEX_MOZILLA = re.compile(
-    r'^(bookmarkbackups|(cookies|formhistory|places).sqlite'
-    r'|key3.db|logins.json|persdict.dat)$',
-    re.IGNORECASE)
 
-# STATIC VARIABLES
-DEFAULT_HOMEPAGE =      'https://www.google.com/'
-IE_GALLERY =            'https://www.microsoft.com/en-us/iegallery'
-MOZILLA_PREFS = {
-    'browser.search.defaultenginename': '"Google"',
-    'browser.search.defaultenginename.US': '"Google"',
-    'browser.search.geoSpecificDefaults': 'false',
-    'browser.startup.homepage': '"{}"'.format(DEFAULT_HOMEPAGE),
-    'extensions.ui.lastCategory': '"addons://list/extension"',
-    }
-UBO_CHROME =            'https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm?hl=en'
-UBO_CHROME_REG =        r'Software\Wow6432Node\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm'
-UBO_EXTRA_CHROME =      'https://chrome.google.com/webstore/detail/ublock-origin-extra/pgdnlhfefecpicbbihgmbmffkjpaplco?hl=en'
-UBO_EXTRA_CHROME_REG =  r'Software\Wow6432Node\Google\Chrome\Extensions\pgdnlhfefecpicbbihgmbmffkjpaplco'
-UBO_MOZILLA =           'https://addons.mozilla.org/en-us/firefox/addon/ublock-origin/'
-UBO_OPERA =             'https://addons.opera.com/en/extensions/details/ublock/?display=en'
-SUPPORTED_BROWSERS = {
-    'Internet Explorer': {
-        'base':             'ie',
-        'exe_name':         'iexplore.exe',
-        'rel_install_path': 'Internet Explorer',
-        'user_data_path':   r'{USERPROFILE}\Favorites',
-        },
-    'Google Chrome': {
-        'base':             'chromium',
-        'exe_name':         'chrome.exe',
-        'rel_install_path': r'Google\Chrome\Application',
-        'user_data_path':   r'{LOCALAPPDATA}\Google\Chrome\User Data',
-        },
-    'Google Chrome Canary': {
-        'base':             'chromium',
-        'exe_name':         'chrome.exe',
-        'rel_install_path': r'Google\Chrome SxS\Application',
-        'user_data_path':   r'{LOCALAPPDATA}\Google\Chrome SxS\User Data',
-        },
-    'Mozilla Firefox': {
-        'base':             'mozilla',
-        'exe_name':         'firefox.exe',
-        'rel_install_path': 'Mozilla Firefox',
-        'user_data_path':   r'{APPDATA}\Mozilla\Firefox\Profiles',
-        },
-    'Mozilla Firefox Dev': {
-        'base':             'mozilla',
-        'exe_name':         'firefox.exe',
-        'rel_install_path': 'Firefox Developer Edition',
-        'user_data_path':   r'{APPDATA}\Mozilla\Firefox\Profiles',
-        },
-    'Opera': {
-        'base':             'chromium',
-        'exe_name':         'launcher.exe',
-        'rel_install_path': 'Opera',
-        'user_data_path':   r'{APPDATA}\Opera Software\Opera Stable',
-        },
-    'Opera Beta': {
-        'base':             'chromium',
-        'exe_name':         'launcher.exe',
-        'rel_install_path': 'Opera beta',
-        'user_data_path':   r'{APPDATA}\Opera Software\Opera Next',
-        },
-    'Opera Dev': {
-        'base':             'chromium',
-        'exe_name':         'launcher.exe',
-        'rel_install_path': 'Opera developer',
-        'user_data_path':   r'{APPDATA}\Opera Software\Opera Developer',
-        },
-    }
+def archive_all_users():
+  """Create backups for all browsers for all users."""
+  users_root = r'{}\Users'.format(global_vars['Env']['SYSTEMDRIVE'])
+  user_envs = []
 
-def archive_browser(name):
-    """Create backup of Browser saved in the BackupDir."""
-    source = '{}*'.format(browser_data[name]['user_data_path'])
-    dest = r'{BackupDir}\Browsers ({USERNAME})'.format(
-        **global_vars, **global_vars['Env'])
-    archive = r'{}\{}.7z'.format(dest, name)
-    os.makedirs(dest, exist_ok=True)
-    cmd = [
+  # Build list of valid users
+  for user_name in os.listdir(users_root):
+    valid_user = True
+    if user_name in ('Default', 'Default User'):
+      # Skip default users
+      continue
+    user_path = os.path.join(users_root, user_name)
+    appdata_local = os.path.join(user_path, r'AppData\Local')
+    appdata_roaming = os.path.join(user_path, r'AppData\Roaming')
+    valid_user = valid_user and os.path.exists(appdata_local)
+    valid_user = valid_user and os.path.exists(appdata_roaming)
+    if valid_user:
+      user_envs.append({
+        'USERNAME': user_name,
+        'USERPROFILE': user_path,
+        'APPDATA': appdata_roaming,
+        'LOCALAPPDATA': appdata_local})
+
+  # Backup browsers for all valid users
+  print_info('Backing up browsers')
+  for fake_env in sorted(user_envs, key=itemgetter('USERPROFILE')):
+    print_standard('  {}'.format(fake_env['USERNAME']))
+    for b_k, b_v in sorted(SUPPORTED_BROWSERS.items()):
+      if b_k == 'Mozilla Firefox Dev':
+        continue
+      source_path = b_v['user_data_path'].format(**fake_env)
+      if not os.path.exists(source_path):
+        continue
+      source_items = source_path + '*'
+      archive_path = r'{BackupDir}\Browsers ({USERNAME})\{Date}'.format(
+        **global_vars, **fake_env)
+      os.makedirs(archive_path, exist_ok=True)
+      archive_path += r'\{}.7z'.format(b_k)
+      cmd = [
         global_vars['Tools']['SevenZip'],
         'a', '-aoa', '-bso0', '-bse0', '-mx=1',
-        archive, source]
-    run_program(cmd)
+        archive_path, source_items]
+      try_and_print(message='{}...'.format(b_k),
+        function=run_program, cmd=cmd)
+    print_standard(' ')
+
+
+def archive_browser(name):
+  """Create backup of Browser saved in the BackupDir."""
+  source = '{}*'.format(browser_data[name]['user_data_path'])
+  dest = r'{BackupDir}\Browsers ({USERNAME})\{Date}'.format(
+    **global_vars, **global_vars['Env'])
+  archive = r'{}\{}.7z'.format(dest, name)
+  os.makedirs(dest, exist_ok=True)
+  cmd = [
+    global_vars['Tools']['SevenZip'],
+    'a', '-aoa', '-bso0', '-bse0', '-mx=1',
+    '-mhe=on', '-p{}'.format(ARCHIVE_PASSWORD),
+    archive, source]
+  run_program(cmd)
+
 
 def backup_browsers():
-    """Create backup of all detected browser profiles."""
-    for name in [k for k, v in sorted(browser_data.items()) if v['profiles']]:
-        try_and_print(message='{}...'.format(name),
-        function=archive_browser, name=name)
+  """Create backup of all detected browser profiles."""
+  for name in [k for k, v in sorted(browser_data.items()) if v['profiles']]:
+    try_and_print(message='{}...'.format(name),
+    function=archive_browser, name=name)
+
 
 def clean_chromium_profile(profile):
-    """Renames profile, creates a new folder, and copies the user data to it."""
-    if profile is None:
-        raise Exception
-    backup_path = '{path}_{Date}.bak'.format(
-        path=profile['path'], **global_vars)
-    backup_path = non_clobber_rename(backup_path)
-    shutil.move(profile['path'], backup_path)
-    os.makedirs(profile['path'], exist_ok=True)
+  """Recreate profile with only the essential user data.
+
+  This is done by renaming the existing profile, creating a new folder
+  with the original name, then copying the essential files from the
+  backup folder. This way the original state is preserved in case
+  something goes wrong.
+  """
+  if profile is None:
+    raise Exception
+  backup_path = '{path}_{Date}.bak'.format(
+    path=profile['path'], **global_vars)
+  backup_path = non_clobber_rename(backup_path)
+  shutil.move(profile['path'], backup_path)
+  os.makedirs(profile['path'], exist_ok=True)
+
+  # Restore essential files from backup_path
+  for entry in os.scandir(backup_path):
+    if REGEX_CHROMIUM_ITEMS.search(entry.name):
+      shutil.copy(entry.path, r'{}\{}'.format(
+        profile['path'], entry.name))
 
-    # Restore essential files from backup_path
-    for entry in os.scandir(backup_path):
-        if REGEX_CHROMIUM_ITEMS.search(entry.name):
-            shutil.copy(entry.path, r'{}\{}'.format(
-                profile['path'], entry.name))
 
 def clean_internet_explorer(**kwargs):
-    """Uses the built-in function to reset IE and sets the homepage.
-    
-    NOTE: kwargs set but unused as a workaround."""
-    kill_process('iexplore.exe')
-    run_program(['rundll32.exe', 'inetcpl.cpl,ResetIEtoDefaults'], check=False)
-    key = r'Software\Microsoft\Internet Explorer\Main'
+  """Uses the built-in function to reset IE and sets the homepage.
+
+  NOTE: kwargs set but unused as a workaround."""
+  kill_process('iexplore.exe')
+  run_program(['rundll32.exe', 'inetcpl.cpl,ResetIEtoDefaults'], check=False)
+  key = r'Software\Microsoft\Internet Explorer\Main'
+
+  # Set homepage
+  with winreg.OpenKey(HKCU, key, access=winreg.KEY_WRITE) as _key:
+    winreg.SetValueEx(_key, 'Start Page', 0,
+      winreg.REG_SZ, DEFAULT_HOMEPAGE)
+    try:
+      winreg.DeleteValue(_key, 'Secondary Start Pages')
+    except FileNotFoundError:
+      pass
 
-    # Set homepage
-    with winreg.OpenKey(HKCU, key, access=winreg.KEY_WRITE) as _key:
-        winreg.SetValueEx(_key, 'Start Page', 0,
-            winreg.REG_SZ, DEFAULT_HOMEPAGE)
-        try:
-            winreg.DeleteValue(_key, 'Secondary Start Pages')
-        except FileNotFoundError:
-            pass
 
 def clean_mozilla_profile(profile):
-    """Renames profile, creates a new folder, and copies the user data to it."""
-    if profile is None:
-        raise Exception
-    backup_path = '{path}_{Date}.bak'.format(
-        path=profile['path'], **global_vars)
-    backup_path = non_clobber_rename(backup_path)
-    shutil.move(profile['path'], backup_path)
-    homepages = []
-    os.makedirs(profile['path'], exist_ok=True)
+  """Recreate profile with only the essential user data.
 
-    # Restore essential files from backup_path
-    for entry in os.scandir(backup_path):
-        if REGEX_MOZILLA.search(entry.name):
-            if entry.is_dir():
-                shutil.copytree(entry.path, r'{}\{}'.format(
-                    profile['path'], entry.name))
-            else:
-                shutil.copy(entry.path, r'{}\{}'.format(
-                    profile['path'], entry.name))
+  This is done by renaming the existing profile, creating a new folder
+  with the original name, then copying the essential files from the
+  backup folder. This way the original state is preserved in case
+  something goes wrong.
+  """
+  if profile is None:
+    raise Exception
+  backup_path = '{path}_{Date}.bak'.format(
+    path=profile['path'], **global_vars)
+  backup_path = non_clobber_rename(backup_path)
+  shutil.move(profile['path'], backup_path)
+  homepages = []
+  os.makedirs(profile['path'], exist_ok=True)
+
+  # Restore essential files from backup_path
+  for entry in os.scandir(backup_path):
+    if REGEX_MOZILLA.search(entry.name):
+      if entry.is_dir():
+        shutil.copytree(entry.path, r'{}\{}'.format(
+          profile['path'], entry.name))
+      else:
+        shutil.copy(entry.path, r'{}\{}'.format(
+          profile['path'], entry.name))
+
+  # Set profile defaults
+  with open(r'{path}\prefs.js'.format(**profile), 'a', encoding='ascii') as f:
+    for k, v in MOZILLA_PREFS.items():
+      f.write('user_pref("{}", {});\n'.format(k, v))
 
-    # Set profile defaults
-    with open(r'{path}\prefs.js'.format(**profile), 'a', encoding='ascii') as f:
-        for k, v in MOZILLA_PREFS.items():
-            f.write('user_pref("{}", {});\n'.format(k, v))
 
 def get_browser_details(name):
-    """Get installation status and profile details for all supported browsers."""
-    browser = SUPPORTED_BROWSERS[name].copy()
-    
-    # Update user_data_path
-    browser['user_data_path'] = browser['user_data_path'].format(
-        **global_vars['Env'])
-    
-    # Find executable (if multiple files are found, the last one is used)
-    exe_path = None
-    num_installs = 0
-    for install_path in ['LOCALAPPDATA', 'PROGRAMFILES(X86)', 'PROGRAMFILES']:
-        test_path = r'{install_path}\{rel_install_path}\{exe_name}'.format(
-            install_path = global_vars['Env'].get(install_path, ''),
-            **browser)
-        if os.path.exists(test_path):
-            num_installs += 1
-            exe_path = test_path
-    
-    # Find profile(s)
-    profiles = []
-    if browser['base'] == 'ie':
-        profiles.append({'name': 'Default', 'path': None})
-    elif 'Google Chrome' in name:
-        profiles.extend(
-            get_chromium_profiles(
-                search_path=browser['user_data_path']))
-    elif browser['base'] == 'mozilla':
-        dev = 'Dev' in name
-        profiles.extend(
-            get_mozilla_profiles(
-                search_path=browser['user_data_path'], dev=dev))
-        if exe_path and not dev and len(profiles) == 0:
-            # e.g. If Firefox is installed but no profiles were found.
-            ## Rename profiles.ini and create a new default profile
-            profiles_ini_path = browser['user_data_path'].replace(
-                'Profiles', 'profiles.ini')
-            if os.path.exists(profiles_ini_path):
-                backup_path = '{path}_{Date}.bak'.format(
-                    path=profiles_ini_path, **global_vars)
-                backup_path = non_clobber_rename(backup_path)
-                shutil.move(profiles_ini_path, backup_path)
-            run_program([exe_path, '-createprofile', 'default'], check=False)
-            profiles.extend(
-                get_mozilla_profiles(
-                    search_path=browser['user_data_path'], dev=dev))
-            
-    elif 'Opera' in name:
-        if os.path.exists(browser['user_data_path']):
-            profiles.append(
-                {'name': 'Default', 'path': browser['user_data_path']})
-    
-    # Get homepages
-    if browser['base'] == 'ie':
-        # IE is set to only have one profile above
-        profiles[0]['homepages'] = get_ie_homepages()
-    elif browser['base'] == 'mozilla':
-        for profile in profiles:
-            prefs_path = r'{path}\prefs.js'.format(**profile)
-            profile['homepages'] = get_mozilla_homepages(prefs_path=prefs_path)
-    
-    # Add to browser_data
-    browser_data[name] = browser
-    browser_data[name].update({
-        'exe_path': exe_path,
-        'profiles': profiles,
-        })
-    
-    # Raise installation warnings (if any)
-    if num_installs == 0:
-        raise NotInstalledError
-    elif num_installs > 1 and browser['base'] != 'ie':
-        raise MultipleInstallationsError
+  """Get installation and profile details for all supported browsers."""
+  browser = SUPPORTED_BROWSERS[name].copy()
+
+  # Update user_data_path
+  browser['user_data_path'] = browser['user_data_path'].format(
+    **global_vars['Env'])
+
+  # Find executable (if multiple files are found, the last one is used)
+  exe_path = None
+  num_installs = 0
+  for install_path in ['LOCALAPPDATA', 'PROGRAMFILES(X86)', 'PROGRAMFILES']:
+    test_path = r'{install_path}\{rel_install_path}\{exe_name}'.format(
+      install_path = global_vars['Env'].get(install_path, ''),
+      **browser)
+    if os.path.exists(test_path):
+      num_installs += 1
+      exe_path = test_path
+
+  # Find profile(s)
+  profiles = []
+  if browser['base'] == 'ie':
+    profiles.append({'name': 'Default', 'path': None})
+  elif 'Google Chrome' in name:
+    profiles.extend(
+      get_chromium_profiles(
+        search_path=browser['user_data_path']))
+  elif browser['base'] == 'mozilla':
+    dev = 'Dev' in name
+    profiles.extend(
+      get_mozilla_profiles(
+        search_path=browser['user_data_path'], dev=dev))
+    if exe_path and not dev and len(profiles) == 0:
+      # e.g. If Firefox is installed but no profiles were found.
+      ## Rename profiles.ini and create a new default profile
+      profiles_ini_path = browser['user_data_path'].replace(
+        'Profiles', 'profiles.ini')
+      if os.path.exists(profiles_ini_path):
+        backup_path = '{path}_{Date}.bak'.format(
+          path=profiles_ini_path, **global_vars)
+        backup_path = non_clobber_rename(backup_path)
+        shutil.move(profiles_ini_path, backup_path)
+      run_program([exe_path, '-createprofile', 'default'], check=False)
+      profiles.extend(
+        get_mozilla_profiles(
+          search_path=browser['user_data_path'], dev=dev))
+
+  elif 'Opera' in name:
+    if os.path.exists(browser['user_data_path']):
+      profiles.append(
+        {'name': 'Default', 'path': browser['user_data_path']})
+
+  # Get homepages
+  if browser['base'] == 'ie':
+    # IE is set to only have one profile above
+    profiles[0]['homepages'] = get_ie_homepages()
+  elif browser['base'] == 'mozilla':
+    for profile in profiles:
+      prefs_path = r'{path}\prefs.js'.format(**profile)
+      profile['homepages'] = get_mozilla_homepages(prefs_path=prefs_path)
+
+  # Add to browser_data
+  browser_data[name] = browser
+  browser_data[name].update({
+    'exe_path': exe_path,
+    'profiles': profiles,
+    })
+
+  # Raise installation warnings (if any)
+  if num_installs == 0:
+    raise NotInstalledError
+  elif num_installs > 1 and browser['base'] != 'ie':
+    raise MultipleInstallationsError
+
 
 def get_chromium_profiles(search_path):
-    """Find any chromium-style profiles and return as a list of dicts."""
-    profiles = []
-    try:
-        for entry in os.scandir(search_path):
-            if entry.is_dir() and REGEX_CHROMIUM_PROFILE.search(entry.name):
-                profiles.append(entry)
-                REGEX_PROFILE_BACKUP = r'\.\w+bak.*'
-        profiles = [p for p in profiles if not REGEX_BACKUP.search(p.name)]
-        # Convert os.DirEntries to dicts
-        profiles = [{'name': p.name, 'path': p.path} for p in profiles]
-    except Exception:
-        pass
+  """Find any chromium-style profiles and return as a list of dicts."""
+  profiles = []
+  try:
+    for entry in os.scandir(search_path):
+      if entry.is_dir() and REGEX_CHROMIUM_PROFILE.search(entry.name):
+        profiles.append(entry)
+        REGEX_PROFILE_BACKUP = r'\.\w+bak.*'
+    profiles = [p for p in profiles if not REGEX_BACKUP.search(p.name)]
+    # Convert os.DirEntries to dicts
+    profiles = [{'name': p.name, 'path': p.path} for p in profiles]
+  except Exception:
+    pass
+
+  return profiles
 
-    return profiles
 
 def get_ie_homepages():
-    """Read homepages from the registry and return as a list."""
-    homepages = []
-    main_page = ''
-    extra_pages = []
-    key = r'Software\Microsoft\Internet Explorer\Main'
-    with winreg.OpenKey(HKCU, key) as _key:
-       try:
-           main_page = winreg.QueryValueEx(_key, 'Start Page')[0]
-       except FileNotFoundError:
-           pass
-       try:
-           extra_pages = winreg.QueryValueEx(_key, 'Secondary Start Pages')[0]
-       except FileNotFoundError:
-           pass
-    if main_page != '':
-        homepages.append(main_page)
-    if len(extra_pages) > 0:
-        homepages.extend(extra_pages)
-    return homepages
+  """Read homepages from the registry and return as a list."""
+  homepages = []
+  main_page = ''
+  extra_pages = []
+  key = r'Software\Microsoft\Internet Explorer\Main'
+  with winreg.OpenKey(HKCU, key) as _key:
+     try:
+       main_page = winreg.QueryValueEx(_key, 'Start Page')[0]
+     except FileNotFoundError:
+       pass
+     try:
+       extra_pages = winreg.QueryValueEx(_key, 'Secondary Start Pages')[0]
+     except FileNotFoundError:
+       pass
+  if main_page != '':
+    homepages.append(main_page)
+  if len(extra_pages) > 0:
+    homepages.extend(extra_pages)
+
+  # Remove all curly braces
+  homepages = [h.replace('{', '').replace('}', '') for h in homepages]
+  return homepages
+
 
 def get_mozilla_homepages(prefs_path):
-    """Read homepages from prefs.js and return as a list."""
-    homepages = []
-    try:
-        with open(prefs_path, 'r') as f:
-            search = re.search(
-                r'browser\.startup\.homepage", "([^"]*)"',
-                f.read(), re.IGNORECASE)
-            if search:
-                homepages = search.group(1).split('|')
-    except Exception:
-        pass
-    
-    return homepages
+  """Read homepages from prefs.js and return as a list."""
+  homepages = []
+  try:
+    with open(prefs_path, 'r') as f:
+      search = re.search(
+        r'browser\.startup\.homepage", "([^"]*)"',
+        f.read(), re.IGNORECASE)
+      if search:
+        homepages = search.group(1).split('|')
+  except Exception:
+    pass
+
+  return homepages
+
 
 def get_mozilla_profiles(search_path, dev=False):
-    """Find any mozilla-style profiles and return as a list of dicts."""
-    profiles = []
-    try:
-        for entry in os.scandir(search_path):
-            if entry.is_dir():
-                if 'dev-edition' in entry.name:
-                    # NOTE: Not always present which can lead
-                    # to Dev profiles being marked as non-Dev
-                    ## NOTE 2: It is possible that a non-Dev profile
-                    ##      to be created with 'dev-edition' in the name.
-                    ##      (It wouldn't make sense, but possible)
-                    if dev:
-                        profiles.append(entry)
-                elif not dev:
-                    profiles.append(entry)
-        profiles = [p for p in profiles if not REGEX_BACKUP.search(p.name)]
-        # Convert os.DirEntries to dicts
-        profiles = [{'name': p.name, 'path': p.path} for p in profiles]
-    except Exception:
+  """Find any mozilla-style profiles and return as a list of dicts."""
+  profiles = []
+  try:
+    for entry in os.scandir(search_path):
+      if entry.is_dir():
+        if 'dev-edition' in entry.name:
+          # NOTE: Not always present which can lead
+          # to Dev profiles being marked as non-Dev
+          ## NOTE 2: It is possible that a non-Dev profile
+          ##    to be created with 'dev-edition' in the name.
+          ##    (It wouldn't make sense, but possible)
+          if dev:
+            profiles.append(entry)
+        elif not dev:
+          profiles.append(entry)
+    profiles = [p for p in profiles if not REGEX_BACKUP.search(p.name)]
+    # Convert os.DirEntries to dicts
+    profiles = [{'name': p.name, 'path': p.path} for p in profiles]
+  except Exception:
+    pass
+
+  return profiles
+
+
+def install_adblock(indent=8, width=32, just_firefox=False):
+  """Install adblock for all supported browsers."""
+  for browser in sorted(browser_data):
+    if just_firefox and browser_data[browser]['base'] != 'mozilla':
+      continue
+    exe_path = browser_data[browser].get('exe_path', None)
+    if not exe_path:
+      if browser_data[browser]['profiles']:
+        print_standard(
+          '{indent}{browser:<{width}}'.format(
+            indent=' '*indent, width=width, browser=browser+'...'),
+          end='', flush=True)
+        print_warning('Profile(s) detected but browser not installed',
+          timestamp=False)
+      else:
+        # Only warn if profile(s) are detected.
         pass
+    else:
+      # Set urls to open
+      urls = []
+      if browser_data[browser]['base'] == 'chromium':
+        if browser == 'Google Chrome':
+          # Check for system exensions
+          try:
+            winreg.QueryValue(HKLM, UBO_CHROME_REG)
+          except FileNotFoundError:
+            urls.append(UBO_CHROME)
+          try:
+            winreg.QueryValue(HKLM, UBO_EXTRA_CHROME_REG)
+          except FileNotFoundError:
+            urls.append(UBO_EXTRA_CHROME)
 
-    return profiles
-
-def install_adblock(indent=8, width=32):
-    """Install adblock for all supported browsers."""
-    for browser in sorted(browser_data):
-        exe_path = browser_data[browser].get('exe_path', None)
-        function=run_program
-        if not exe_path:
-            if browser_data[browser]['profiles']:
-                print_standard(
-                    '{indent}{browser:<{width}}'.format(
-                        indent=' '*indent, width=width, browser=browser+'...'),
-                    end='', flush=True)
-                print_warning('Profile(s) detected but browser not installed',
-                    timestamp=False)
-            else:
-                # Only warn if profile(s) are detected.
-                pass
+          if len(urls) == 0:
+            urls = ['chrome://extensions']
+        elif 'Opera' in browser:
+          urls.append(UBO_OPERA)
         else:
-            # Set urls to open
-            urls = []
-            if browser_data[browser]['base'] == 'chromium':
-                if browser == 'Google Chrome':
-                    # Check for system exensions
-                    try:
-                        winreg.QueryValue(HKLM, UBO_CHROME_REG)
-                    except FileNotFoundError:
-                        urls.append(UBO_CHROME)
-                    try:
-                        winreg.QueryValue(HKLM, UBO_EXTRA_CHROME_REG)
-                    except FileNotFoundError:
-                        urls.append(UBO_EXTRA_CHROME)
-                    
-                    if len(urls) == 0:
-                        urls = ['chrome://extensions']
-                elif 'Opera' in browser:
-                    urls.append(UBO_OPERA)
-                else:
-                    urls.append(UBO_CHROME)
-                    urls.append(UBO_EXTRA_CHROME)
-            
-            elif browser_data[browser]['base'] == 'mozilla':
-                # Assume UBO is not installed first and change if it is
-                urls.append(UBO_MOZILLA)
-                if browser == 'Mozilla Firefox':
-                    ubo = browser_data[browser]['exe_path'].replace(
-                        'firefox.exe',
-                        r'distribution\extensions\uBlock0@raymondhill.net')
-                    if os.path.exists(ubo):
-                        urls = ['about:addons']
-            
-            elif browser_data[browser]['base'] == 'ie':
-                urls.append(IE_GALLERY)
-                function=popen_program
-            
-            # By using check=False we're skipping any return codes so
-            # it should only fail if the program can't be run
-            #   (or can't be found).
-            # In other words, this isn't tracking the addon/extension's
-            #   installation status.
-            try_and_print(message='{}...'.format(browser),
-                indent=indent, width=width,
-                cs='Done', function=function,
-                cmd=[exe_path, *urls], check=False)
+          urls.append(UBO_CHROME)
+          urls.append(UBO_EXTRA_CHROME)
+
+      elif browser_data[browser]['base'] == 'mozilla':
+        # Check for system extensions
+        try:
+          with winreg.OpenKey(HKLM, UBO_MOZILLA_REG) as key:
+            winreg.QueryValueEx(key, UBO_MOZILLA_REG_NAME)
+        except FileNotFoundError:
+          urls = [UBO_MOZILLA]
+        else:
+          if os.path.exists(UBO_MOZZILA_PATH):
+            urls = ['about:addons']
+          else:
+            urls = [UBO_MOZILLA]
+
+      elif browser_data[browser]['base'] == 'ie':
+        urls.append(IE_GALLERY)
+
+      # By using check=False we're skipping any return codes so
+      # it should only fail if the program can't be run
+      #   (or can't be found).
+      # In other words, this isn't tracking the addon/extension's
+      #   installation status.
+      try_and_print(message='{}...'.format(browser),
+        indent=indent, width=width,
+        cs='Started', function=popen_program,
+        cmd=[exe_path, *urls], check=False)
+
+
+def is_installed(browser_name):
+  """Checks if browser is installed based on exe_path, returns bool."""
+  browser_name = browser_name.replace(' Chromium', '')
+  return bool(browser_data.get(browser_name, {}).get('exe_path', False))
+
 
 def list_homepages(indent=8, width=32):
-    """List current homepages for reference."""
-    
-    for browser in [k for k, v in sorted(browser_data.items()) if v['exe_path']]:
-        # Skip Chromium-based browsers
-        if browser_data[browser]['base'] == 'chromium':
-            print_info(
-                '{indent}{browser:<{width}}'.format(
-                    indent=' '*indent, width=width, browser=browser+'...'),
-                end='', flush=True)
-            print_warning('Not implemented', timestamp=False)
-            continue
-        
-        # All other browsers
-        print_info('{indent}{browser:<{width}}'.format(
-            indent=' '*indent, width=width, browser=browser+'...'))
-        for profile in browser_data[browser].get('profiles', []):
-            name = profile.get('name', '?')
-            homepages = profile.get('homepages', [])
-            if len(homepages) == 0:
-                print_standard(
-                    '{indent}{name:<{width}}'.format(
-                        indent=' '*indent, width=width, name=name),
-                    end='', flush=True)
-                print_warning('None found', timestamp=False)
-            else:
-                for page in homepages:
-                    print_standard('{indent}{name:<{width}}{page}'.format(
-                        indent=' '*indent, width=width, name=name, page=page))
+  """List current homepages for reference."""
+  browser_list = [k for k, v in sorted(browser_data.items()) if v['exe_path']]
+  for browser in browser_list:
+    # Skip Chromium-based browsers
+    if browser_data[browser]['base'] == 'chromium':
+      print_info(
+        '{indent}{browser:<{width}}'.format(
+          indent=' '*indent, width=width, browser=browser+'...'),
+        end='', flush=True)
+      print_warning('Not implemented', timestamp=False)
+      continue
+
+    # All other browsers
+    print_info('{indent}{browser:<{width}}'.format(
+      indent=' '*indent, width=width, browser=browser+'...'))
+    for profile in browser_data[browser].get('profiles', []):
+      name = profile.get('name', '?')
+      homepages = profile.get('homepages', [])
+      if len(homepages) == 0:
+        print_standard(
+          '{indent}{name:<{width}}'.format(
+            indent=' '*indent, width=width, name=name),
+          end='', flush=True)
+        print_warning('None found', timestamp=False)
+      else:
+        for page in homepages:
+          print_standard('{indent}{name:<{width}}{page}'.format(
+            indent=' '*indent, width=width, name=name, page=page))
+
+
+def profile_present(browser_name):
+  """Checks if a profile was detected for browser, returns bool."""
+  browser_name = browser_name.replace(' Chromium', '')
+  return bool(browser_data.get(browser_name, {}).get('profiles', False))
+
 
 def reset_browsers(indent=8, width=32):
-    """Reset all detected browsers to safe defaults."""
-    for browser in [k for k, v in sorted(browser_data.items()) if v['profiles']]:
-        print_info('{indent}{name}'.format(indent=' '*indent, name=browser))
-        for profile in browser_data[browser]['profiles']:
-            if browser_data[browser]['base'] == 'chromium':
-                function = clean_chromium_profile
-            elif browser_data[browser]['base'] == 'ie':
-                function = clean_internet_explorer
-            elif browser_data[browser]['base'] == 'mozilla':
-                function = clean_mozilla_profile
-            try_and_print(
-                message='{}...'.format(profile['name']),
-                indent=indent, width=width, function=function,
-                other_results=other_results, profile=profile)
+  """Reset all detected browsers to safe defaults."""
+  browser_list = [k for k, v in sorted(browser_data.items()) if v['profiles']]
+  for browser in browser_list:
+    print_info('{indent}{name}'.format(indent=' '*indent, name=browser))
+    for profile in browser_data[browser]['profiles']:
+      if browser_data[browser]['base'] == 'chromium':
+        function = clean_chromium_profile
+      elif browser_data[browser]['base'] == 'ie':
+        function = clean_internet_explorer
+      elif browser_data[browser]['base'] == 'mozilla':
+        function = clean_mozilla_profile
+      try_and_print(
+        message='{}...'.format(profile['name']),
+        indent=indent, width=width, function=function,
+        other_results=other_results, profile=profile)
+
+
+def scan_for_browsers(just_firefox=False, silent=False):
+  """Scan system for any supported browsers."""
+  for name, details in sorted(SUPPORTED_BROWSERS.items()):
+    if just_firefox and details['base'] != 'mozilla':
+      continue
+    if silent:
+      try:
+        get_browser_details(name)
+      except Exception:
+        # Ignore errors in silent mode
+        pass
+    else:
+      try_and_print(message='{}...'.format(name),
+        function=get_browser_details, cs='Detected',
+        other_results=other_results, name=name)
 
-def scan_for_browsers():
-    """Scan system for any supported browsers."""
-    for name in sorted(SUPPORTED_BROWSERS):
-        try_and_print(message='{}...'.format(name),
-            function=get_browser_details, cs='Detected',
-            other_results=other_results, name=name)
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/cleanup.py

@@ -1,91 +1,144 @@
-# Wizard Kit: Functions - Cleanup
+'''Wizard Kit: Functions - Cleanup'''
+# pylint: disable=no-name-in-module,wildcard-import
+# vim: sts=2 sw=2 ts=2
 
-from functions.common import *
+from functions.setup import *
+from settings.cleanup import *
 
 def cleanup_adwcleaner():
-    """Move AdwCleaner folders into the ClientDir."""
-    source_path = r'{SYSTEMDRIVE}\AdwCleaner'.format(**global_vars['Env'])
-    source_quarantine = r'{}\Quarantine'.format(source_path)
-    
-    # Quarantine
-    if os.path.exists(source_quarantine):
-        os.makedirs(global_vars['QuarantineDir'], exist_ok=True)
-        dest_name = r'{QuarantineDir}\AdwCleaner_{Date-Time}'.format(
-            **global_vars)
-        dest_name = non_clobber_rename(dest_name)
-        shutil.move(source_quarantine, dest_name)
-    
-    # Delete source folder if empty
-    try:
-        os.rmdir(source_path)
-    except OSError:
-        pass
-    
-    # Main folder
-    if os.path.exists(source_path):
-        os.makedirs(global_vars['ProgBackupDir'], exist_ok=True)
-        dest_name = r'{ProgBackupDir}\AdwCleaner_{Date-Time}'.format(
-            **global_vars)
-        dest_name = non_clobber_rename(dest_name)
-        shutil.move(source_path, dest_name)
+  """Move AdwCleaner folders into the ClientDir."""
+  source_path = r'{SYSTEMDRIVE}\AdwCleaner'.format(**global_vars['Env'])
+  source_quarantine = r'{}\Quarantine'.format(source_path)
+
+  # Quarantine
+  if os.path.exists(source_quarantine):
+    os.makedirs(global_vars['QuarantineDir'], exist_ok=True)
+    dest_name = r'{QuarantineDir}\AdwCleaner_{Date-Time}'.format(
+      **global_vars)
+    dest_name = non_clobber_rename(dest_name)
+    shutil.move(source_quarantine, dest_name)
+
+  # Delete source folder if empty
+  delete_empty_folders(source_path)
+
+  # Main folder
+  if os.path.exists(source_path):
+    os.makedirs(global_vars['LogDir'], exist_ok=True)
+    dest_name = r'{LogDir}\Tools\AdwCleaner'.format(
+      **global_vars)
+    dest_name = non_clobber_rename(dest_name)
+    shutil.move(source_path, dest_name)
+
 
 def cleanup_cbs(dest_folder):
-    """Safely cleanup a known CBS archive bug under Windows 7.
-    
-    If a CbsPersist file is larger than 2 Gb then the auto archive feature
-    continually fails and will fill up the system drive with temp files.
-    
-    This function moves the temp files and CbsPersist file to a temp folder,
-    compresses the CbsPersist files with 7-Zip, and then opens the temp folder
-    for the user to manually save the backup files and delete the temp files.
-    """
-    backup_folder = r'{dest_folder}\CbsFix'.format(dest_folder=dest_folder)
-    temp_folder = r'{backup_folder}\Temp'.format(backup_folder=backup_folder)
-    os.makedirs(backup_folder, exist_ok=True)
-    os.makedirs(temp_folder, exist_ok=True)
-    
-    # Move files into temp folder
-    cbs_path = r'{SYSTEMROOT}\Logs\CBS'.format(**global_vars['Env'])
-    for entry in os.scandir(cbs_path):
-        # CbsPersist files
-        if entry.name.lower().startswith('cbspersist'):
-            dest_name = r'{}\{}'.format(temp_folder, entry.name)
-            dest_name = non_clobber_rename(dest_name)
-            shutil.move(entry.path, dest_name)
-    temp_path = r'{SYSTEMROOT}\Temp'.format(**global_vars['Env'])
-    for entry in os.scandir(temp_path):
-        # cab_ files
-        if entry.name.lower().startswith('cab_'):
-            dest_name = r'{}\{}'.format(temp_folder, entry.name)
-            dest_name = non_clobber_rename(dest_name)
-            shutil.move(entry.path, dest_name)
-    
-    # Compress CbsPersist files with 7-Zip
-    cmd = [
-        global_vars['Tools']['SevenZip'],
-        'a', '-t7z', '-mx=3', '-bso0', '-bse0',
-        r'{}\CbsPersists.7z'.format(backup_folder),
-        r'{}\CbsPersist*'.format(temp_folder)]
-    run_program(cmd)
+  """Safely cleanup a known CBS archive bug under Windows 7.
+
+  If a CbsPersist file is larger than 2 Gb then the auto archive feature
+  continually fails and will fill up the system drive with temp files.
+
+  This function moves the temp files and CbsPersist file to a temp folder,
+  compresses the CbsPersist files with 7-Zip, and then opens the temp folder
+  for the user to manually save the backup files and delete the temp files.
+  """
+  backup_folder = r'{dest_folder}\CbsFix'.format(dest_folder=dest_folder)
+  temp_folder = r'{backup_folder}\Temp'.format(backup_folder=backup_folder)
+  os.makedirs(backup_folder, exist_ok=True)
+  os.makedirs(temp_folder, exist_ok=True)
+
+  # Move files into temp folder
+  cbs_path = r'{SYSTEMROOT}\Logs\CBS'.format(**global_vars['Env'])
+  for entry in os.scandir(cbs_path):
+    # CbsPersist files
+    if entry.name.lower().startswith('cbspersist'):
+      dest_name = r'{}\{}'.format(temp_folder, entry.name)
+      dest_name = non_clobber_rename(dest_name)
+      shutil.move(entry.path, dest_name)
+  temp_path = r'{SYSTEMROOT}\Temp'.format(**global_vars['Env'])
+  for entry in os.scandir(temp_path):
+    # cab_ files
+    if entry.name.lower().startswith('cab_'):
+      dest_name = r'{}\{}'.format(temp_folder, entry.name)
+      dest_name = non_clobber_rename(dest_name)
+      shutil.move(entry.path, dest_name)
+
+  # Compress CbsPersist files with 7-Zip
+  cmd = [
+    global_vars['Tools']['SevenZip'],
+    'a', '-t7z', '-mx=3', '-bso0', '-bse0',
+    r'{}\CbsPersists.7z'.format(backup_folder),
+    r'{}\CbsPersist*'.format(temp_folder)]
+  run_program(cmd)
+
 
 def cleanup_desktop():
-    """Move known backup files and reports into the ClientDir."""
-    dest_folder = r'{ProgBackupDir}\Desktop_{Date-Time}'.format(**global_vars)
-    os.makedirs(dest_folder, exist_ok=True)
-    
-    desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
-    for entry in os.scandir(desktop_path):
-        # JRT, RKill, Shortcut cleaner
-        if re.search(r'^(JRT|RKill|sc-cleaner)', entry.name, re.IGNORECASE):
-            dest_name = r'{}\{}'.format(dest_folder, entry.name)
-            dest_name = non_clobber_rename(dest_name)
-            shutil.move(entry.path, dest_name)
-    
-    # Remove dir if empty
-    try:
-        os.rmdir(dest_folder)
-    except OSError:
-        pass
+  """Move known backup files and reports into the ClientDir."""
+  dest_folder = r'{LogDir}\Tools'.format(**global_vars)
+  os.makedirs(dest_folder, exist_ok=True)
+
+  desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
+  for entry in os.scandir(desktop_path):
+    if DESKTOP_ITEMS.search(entry.name):
+      dest_name = r'{}\{}'.format(dest_folder, entry.name)
+      dest_name = non_clobber_rename(dest_name)
+      shutil.move(entry.path, dest_name)
+
+  # Remove dir if empty
+  delete_empty_folders(dest_folder)
+
+
+def delete_empty_folders(folder_path):
+  """Delete all empty folders in path (depth first)."""
+  if not os.path.exists(folder_path) or not os.path.isdir(folder_path):
+    # Bail early (silently)
+    return
+
+  # Delete empty subfolders first
+  for item in os.scandir(folder_path):
+    if item.is_dir():
+      delete_empty_folders(item.path)
+
+  # Remove top folder
+  try:
+    os.rmdir(folder_path)
+  except OSError:
+    pass
+
+
+def delete_registry_key(hive, key, recurse=False):
+  """Delete a registry key and all it's subkeys."""
+  access = winreg.KEY_ALL_ACCESS
+
+  try:
+    if recurse:
+      # Delete all subkeys first
+      with winreg.OpenKeyEx(hive, key, 0, access) as k:
+        key_info = winreg.QueryInfoKey(k)
+        for x in range(key_info[0]):
+          subkey = r'{}\{}'.format(key, winreg.EnumKey(k, 0))
+          delete_registry_key(hive, subkey)
+
+    # Delete key
+    winreg.DeleteKey(hive, key)
+  except FileNotFoundError:
+    # Ignore
+    pass
+
+
+def delete_registry_value(hive, key, value):
+  """Delete a registry value."""
+  access = winreg.KEY_ALL_ACCESS
+  with winreg.OpenKeyEx(hive, key, 0, access) as k:
+    winreg.DeleteValue(k, value)
+
+
+def restore_default_uac():
+  """Restores default UAC settings via the registry."""
+  if global_vars['OS']['Version'] == '10':
+    write_registry_settings(UAC_DEFAULTS_WIN10, all_users=True)
+  else:
+    # Haven't checked Win8 settings, only applying minimum set
+    write_registry_settings(UAC_DEFAULTS_WIN7, all_users=True)
+
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")

.bin/Scripts/functions/diags.py

@@ -1,114 +0,0 @@
-# Wizard Kit: Functions - Diagnostics
-
-from functions.common import *
-
-# STATIC VARIABLES
-AUTORUNS_SETTINGS = {
-    r'Software\Sysinternals\AutoRuns': {
-        'checkvirustotal': 1,
-        'EulaAccepted': 1,
-        'shownomicrosoft': 1,
-        'shownowindows': 1,
-        'showonlyvirustotal': 1,
-        'submitvirustotal': 0,
-        'verifysignatures': 1,
-        },
-    r'Software\Sysinternals\AutoRuns\SigCheck': {
-        'EulaAccepted': 1,
-        },
-    r'Software\Sysinternals\AutoRuns\Streams': {
-        'EulaAccepted': 1,
-        },
-    r'Software\Sysinternals\AutoRuns\VirusTotal': {
-        'VirusTotalTermsAccepted': 1,
-        },
-    }
-
-def check_connection():
-    """Check if the system is online and optionally abort the script."""
-    while True:
-        result = try_and_print(message='Ping test...',  function=ping, cs='OK')
-        if result['CS']:
-            break
-        else:
-            if not ask('ERROR: System appears offline, try again?'):
-                if ask('Continue anyway?'):
-                    break
-                else:
-                    abort()
-
-def run_autoruns():
-    """Run AutoRuns in the background with VirusTotal checks enabled."""
-    extract_item('Autoruns', filter='autoruns*', silent=True)
-    # Update AutoRuns settings before running
-    for path, settings in AUTORUNS_SETTINGS.items():
-        winreg.CreateKey(HKCU, path)
-        with winreg.OpenKey(HKCU, path, access=winreg.KEY_WRITE) as key:
-            for name, value in settings.items():
-                winreg.SetValueEx(key, name, 0, winreg.REG_DWORD, value)
-    popen_program(global_vars['Tools']['AutoRuns'], minimized=True)
-
-def run_hwinfo_sensors():
-    """Run HWiNFO sensors."""
-    path = r'{BinDir}\HWiNFO'.format(**global_vars)
-    for bit in [32, 64]:
-        # Configure
-        source = r'{}\general.ini'.format(path)
-        dest =   r'{}\HWiNFO{}.ini'.format(path, bit)
-        shutil.copy(source, dest)
-        with open(dest, 'a') as f:
-            f.write('SensorsOnly=1\n')
-            f.write('SummaryOnly=0\n')
-    popen_program(global_vars['Tools']['HWiNFO'])
-
-def run_xmplay():
-    """Run XMPlay to test audio."""
-    extract_item('XMPlay', silent=True)
-    cmd = [global_vars['Tools']['XMPlay'],
-        r'{BinDir}\XMPlay\music.7z'.format(**global_vars)]
-    popen_program(cmd)
-
-def run_hitmanpro():
-    """Run HitmanPro in the background."""
-    extract_item('HitmanPro', silent=True)
-    cmd = [
-        global_vars['Tools']['HitmanPro'],
-        '/quiet', '/noinstall', '/noupload',
-        r'/log={LogDir}\hitman.xml'.format(**global_vars)]
-    popen_program(cmd)
-
-def run_process_killer():
-    """Kill most running processes skipping those in the whitelist.txt."""
-    # borrowed from TronScript (reddit.com/r/TronScript)
-    # credit to /u/cuddlychops06
-    prev_dir = os.getcwd()
-    extract_item('ProcessKiller', silent=True)
-    os.chdir(r'{BinDir}\ProcessKiller'.format(**global_vars))
-    run_program(['ProcessKiller.exe', '/silent'], check=False)
-    os.chdir(prev_dir)
-
-def run_rkill():
-    """Run RKill and cleanup afterwards."""
-    extract_item('RKill', silent=True)
-    cmd = [
-        global_vars['Tools']['RKill'],
-        '-l', r'{LogDir}\RKill.log'.format(**global_vars),
-        '-new_console:n', '-new_console:s33V']
-    run_program(cmd, check=False)
-    wait_for_process('RKill')
-    kill_process('notepad.exe')
-
-    # RKill cleanup
-    desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
-    if os.path.exists(desktop_path):
-        for item in os.scandir(desktop_path):
-            if re.search(r'^RKill', item.name, re.IGNORECASE):
-                dest = re.sub(r'^(.*)\.', '\1_{Date-Time}.'.format(
-                    **global_vars), item.name)
-                dest = r'{ClientDir}\Info\{name}'.format(
-                    name=dest, **global_vars)
-                dest = non_clobber_rename(dest)
-                shutil.move(item.path, dest)
-
-if __name__ == '__main__':
-    print("This file is not meant to be called directly.")

.bin/Scripts/functions/disk.py

@@ -1,395 +1,414 @@
 # Wizard Kit: Functions - Disk
 
 from functions.common import *
-from functions import partition_uids
+from settings.partition_uids import *
+
 
 # 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)
+  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():
-    """Assign a volume letter to all available volumes."""
-    remove_volume_letters()
-    
-    # Write script
-    script = []
-    for vol in get_volumes():
-        script.append('select volume {}'.format(vol['Number']))
-        script.append('assign')
-    
-    # Run
-    run_diskpart(script)
+  """Assign a volume letter to all available volumes."""
+  remove_volume_letters()
+
+  # Write script
+  script = []
+  for vol in get_volumes():
+    script.append('select volume {}'.format(vol['Number']))
+    script.append('assign')
+
+  # Run
+  run_diskpart(script)
+
 
 def get_boot_mode():
-    """Check if the boot mode was UEFI or legacy."""
-    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
+  """Check if the boot mode was UEFI or legacy."""
+  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):
-    """Get disk details using DiskPart."""
-    details = {}
-    script = [
-        'select disk {}'.format(disk['Number']),
-        'detail disk']
-    
-    # Run
-    try:
-        result = run_diskpart(script)
-    except subprocess.CalledProcessError:
-        pass
-    else:
-        output = result.stdout.decode().strip()
-        # 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
-    
+  """Get disk details using DiskPart."""
+  details = {}
+  script = [
+    'select disk {}'.format(disk['Number']),
+    'detail disk']
+
+  # Run
+  try:
+    result = run_diskpart(script)
+  except subprocess.CalledProcessError:
+    pass
+  else:
+    output = result.stdout.decode().strip()
+    # 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():
-    """Get list of attached disks using DiskPart."""
-    disks = []
-    
-    try:
-        # Run script
-        result = run_diskpart(['list disk'])
-    except subprocess.CalledProcessError:
-        pass
-    else:
-        # Append disk numbers
-        output = result.stdout.decode().strip()
-        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
+  """Get list of attached disks using DiskPart."""
+  disks = []
+
+  try:
+    # Run script
+    result = run_diskpart(['list disk'])
+  except subprocess.CalledProcessError:
+    pass
+  else:
+    # Append disk numbers
+    output = result.stdout.decode().strip()
+    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):
-    """Get partition details using DiskPart and fsutil."""
-    details = {}
-    script = [
-        'select disk {}'.format(disk['Number']),
-        'select partition {}'.format(partition['Number']),
-        'detail partition']
-    
-    # Diskpart details
+  """Get partition details using DiskPart and fsutil."""
+  details = {}
+  script = [
+    'select disk {}'.format(disk['Number']),
+    'select partition {}'.format(partition['Number']),
+    'detail partition']
+
+  # Diskpart details
+  try:
+    # Run script
+    result = run_diskpart(script)
+  except subprocess.CalledProcessError:
+    pass
+  else:
+    # Get volume letter or RAW status
+    output = result.stdout.decode().strip()
+    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.get(details.get('Type').upper(), {})
+  if guid:
+    details.update({
+      'Description':  guid.get('Description', '')[:29],
+      'OS':       guid.get('OS', 'Unknown')[:27]})
+
+  if 'Letter' in details:
+    # Disk usage
     try:
-        # Run script
-        result = run_diskpart(script)
-    except subprocess.CalledProcessError:
-        pass
+      tmp = psutil.disk_usage('{}:\\'.format(details['Letter']))
+    except OSError as err:
+      details['FileSystem'] = 'Unknown'
+      details['Error'] = err.strerror
     else:
-        # Get volume letter or RAW status
-        output = result.stdout.decode().strip()
-        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.get('Type'))
-    if guid:
-        details.update({
-            'Description':  guid.get('Description', '')[:29],
-            'OS':           guid.get('OS', 'Unknown')[:27]})
-    
-    if 'Letter' in details:
-        # Disk usage
-        try:
-            tmp = psutil.disk_usage('{}:\\'.format(details['Letter']))
-        except OSError as err:
-            details['FileSystem'] = 'Unknown'
-            details['Error'] = err.strerror
-        else:
-            details['Used Space'] = human_readable_size(tmp.used)
-        
-        # fsutil details
-        cmd = [
-            'fsutil',
-            'fsinfo',
-            'volumeinfo',
-            '{}:'.format(details['Letter'])
-            ]
-        try:
-            result = run_program(cmd)
-        except subprocess.CalledProcessError:
-            pass
-        else:
-            output = result.stdout.decode().strip()
-            # 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', '') not in ['RAW', 'Unknown']:
-        details['FileSystem'] = details.get('File System Name', 'Unknown')
-    
-    return details
+      details['Used Space'] = human_readable_size(tmp.used)
+
+    # fsutil details
+    cmd = [
+      'fsutil',
+      'fsinfo',
+      'volumeinfo',
+      '{}:'.format(details['Letter'])
+      ]
+    try:
+      result = run_program(cmd)
+    except subprocess.CalledProcessError:
+      pass
+    else:
+      output = result.stdout.decode().strip()
+      # 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', '') not in ['RAW', 'Unknown']:
+    details['FileSystem'] = details.get('File System Name', 'Unknown')
+
+  return details
+
 
 def get_partitions(disk):
-    """Get list of partition using DiskPart."""
-    partitions = []
-    script = [
-        'select disk {}'.format(disk['Number']),
-        'list partition']
-    
-    try:
-        # Run script
-        result = run_diskpart(script)
-    except subprocess.CalledProcessError:
-        pass
-    else:
-        # Append partition numbers
-        output = result.stdout.decode().strip()
-        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
+  """Get list of partition using DiskPart."""
+  partitions = []
+  script = [
+    'select disk {}'.format(disk['Number']),
+    'list partition']
+
+  try:
+    # Run script
+    result = run_diskpart(script)
+  except subprocess.CalledProcessError:
+    pass
+  else:
+    # Append partition numbers
+    output = result.stdout.decode().strip()
+    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):
-    """Get disk partition table type using DiskPart."""
-    part_type = 'Unknown'
-    script = [
-        'select disk {}'.format(disk['Number']),
-        'uniqueid disk']
-    
-    try:
-        result = run_diskpart(script)
-    except subprocess.CalledProcessError:
-        pass
-    else:
-        output = result.stdout.decode().strip()
-        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'
-    
-    return part_type
+  """Get disk partition table type using DiskPart."""
+  part_type = 'Unknown'
+  script = [
+    'select disk {}'.format(disk['Number']),
+    'uniqueid disk']
+
+  try:
+    result = run_diskpart(script)
+  except subprocess.CalledProcessError:
+    pass
+  else:
+    output = result.stdout.decode().strip()
+    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'
+
+  return part_type
+
 
 def get_volumes():
-    """Get list of volumes using DiskPart."""
-    vols = []
-    try:
-        result = run_diskpart(['list volume'])
-    except subprocess.CalledProcessError:
-        pass
-    else:
-        # Append volume numbers
-        output = result.stdout.decode().strip()
-        for tmp in re.findall(r'Volume (\d+)\s+([A-Za-z]?)\s+', output):
-            vols.append({'Number': tmp[0], 'Letter': tmp[1]})
-    
-    return vols
+  """Get list of volumes using DiskPart."""
+  vols = []
+  try:
+    result = run_diskpart(['list volume'])
+  except subprocess.CalledProcessError:
+    pass
+  else:
+    # Append volume numbers
+    output = result.stdout.decode().strip()
+    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):
-    """Check if the partition is accessible."""
-    return 'Letter' not in par or REGEX_BAD_PARTITION.search(par['FileSystem'])
+  """Check if the partition is accessible."""
+  return 'Letter' not in par or REGEX_BAD_PARTITION.search(par['FileSystem'])
+
 
 def prep_disk_for_formatting(disk=None):
-    """Gather details about the disk and its partitions."""
-    disk['Format Warnings'] = '\n'
-    width = len(str(len(disk['Partitions'])))
-    
-    # Bail early
-    if disk is None:
-        raise Exception('Disk not provided.')
+  """Gather details about the disk and its partitions."""
+  disk['Format Warnings'] = '\n'
+  width = len(str(len(disk['Partitions'])))
 
-    # 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
+  # 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 = '{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:
-        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 = '{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
+      # 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'):
-    """Assign a new letter to a volume using DiskPart."""
-    if not letter:
-        # Ignore
-        return None
-    script = [
-        'select volume {}'.format(letter),
-        'remove noerr',
-        'assign letter={}'.format(new_letter)]
-    try:
-        run_diskpart(script)
-    except subprocess.CalledProcessError:
-        pass
-    else:
-        return new_letter
+  """Assign a new letter to a volume using DiskPart."""
+  if not letter:
+    # Ignore
+    return None
+  script = [
+    'select volume {}'.format(letter),
+    'remove noerr',
+    'assign letter={}'.format(new_letter)]
+  try:
+    run_diskpart(script)
+  except subprocess.CalledProcessError:
+    pass
+  else:
+    return new_letter
+
 
 def remove_volume_letters(keep=None):
-    """Remove all assigned volume letters using DiskPart."""
-    if not keep:
-        keep = ''
-    
-    script = []
-    for vol in get_volumes():
-        if vol['Letter'].upper() != keep.upper():
-            script.append('select volume {}'.format(vol['Number']))
-            script.append('remove noerr')
-    
-    # Run script
-    try:
-        run_diskpart(script)
-    except subprocess.CalledProcessError:
-        pass
+  """Remove all assigned volume letters using DiskPart."""
+  if not keep:
+    keep = ''
+
+  script = []
+  for vol in get_volumes():
+    if vol['Letter'].upper() != keep.upper():
+      script.append('select volume {}'.format(vol['Number']))
+      script.append('remove noerr')
+
+  # Run script
+  try:
+    run_diskpart(script)
+  except subprocess.CalledProcessError:
+    pass
+
 
 def run_diskpart(script):
-    """Run DiskPart script."""
-    tempfile = r'{}\diskpart.script'.format(global_vars['Env']['TMP'])
-    
-    # Write script
-    with open(tempfile, 'w') as f:
-        for line in script:
-            f.write('{}\n'.format(line))
-    
-    # Run script
-    cmd = [
-        r'{}\Windows\System32\diskpart.exe'.format(
-            global_vars['Env']['SYSTEMDRIVE']),
-        '/s', tempfile]
-    result = run_program(cmd)
-    sleep(2)
-    return result
+  """Run DiskPart script."""
+  tempfile = r'{}\diskpart.script'.format(global_vars['Env']['TMP'])
+
+  # Write script
+  with open(tempfile, 'w') as f:
+    for line in script:
+      f.write('{}\n'.format(line))
+
+  # Run script
+  cmd = [
+    r'{}\Windows\System32\diskpart.exe'.format(
+      global_vars['Env']['SYSTEMDRIVE']),
+    '/s', tempfile]
+  result = run_program(cmd)
+  sleep(2)
+  return result
+
 
 def scan_disks():
-    """Get details about the attached disks"""
-    disks = get_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 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 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))
+    # 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
 
-    # 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 = '{}\t[{}] ({}) {}'.format(
-            disk.get('Size', ''),
-            disk.get('Table', ''),
-            disk.get('Type', ''),
-            disk.get('Name', 'Unknown'),
-            )
-        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_name = '{YELLOW}{p_name}{CLEAR}'.format(
-                    p_name=p_name, **COLORS)
-            
-            display_name += '\n\t\t\t{}'.format(p_name)
-        if not disk['Partitions']:
-            display_name += '\n\t\t\t{}No partitions found.{}'.format(
-                COLORS['YELLOW'], COLORS['CLEAR'])
+  """Select a disk from the attached disks"""
+  # Build menu
+  disk_options = []
+  for disk in disks:
+    display_name = '{}\t[{}] ({}) {}'.format(
+      disk.get('Size', ''),
+      disk.get('Table', ''),
+      disk.get('Type', ''),
+      disk.get('Name', 'Unknown'),
+      )
+    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'])
 
-        disk_options.append({'Name': display_name, 'Disk': disk})
-    actions = [
-        {'Name': 'Main Menu', 'Letter': 'M'},
-        ]
+      # Show unsupported partition(s)
+      if is_bad_partition(partition):
+        p_name = '{YELLOW}{p_name}{CLEAR}'.format(
+          p_name=p_name, **COLORS)
 
-    # Menu loop
-    selection = menu_select(
-        title = title,
-        main_entries = disk_options,
-        action_entries = actions)
+      display_name += '\n\t\t\t{}'.format(p_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 (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.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/info.py

@@ -1,467 +1,500 @@
 # Wizard Kit: Functions - Information
 
 from borrowed import knownpaths
-from operator import itemgetter
-
-from functions.common import *
 from functions.activation import *
+from operator import itemgetter
+from settings.info import *
 
-# Regex
-REGEX_OFFICE = re.compile(
-    r'(Microsoft (Office\s+'
-        r'(365|Enterprise|Home|Pro(\s|fessional)'
-        r'|Single|Small|Standard|Starter|Ultimate|system)'
-        r'|Works[-\s\d]+\d)'
-    r'|(Libre|Open|Star)\s*Office'
-    r'|WordPerfect|Gnumeric|Abiword)',
-    re.IGNORECASE)
-
-# STATIC VARIABLES
-REG_PROFILE_LIST = r'SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList'
-REG_SHELL_FOLDERS = r'Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
-TMP_HIVE_PATH = 'TEMP_HIVE_MOUNT'
-EXTRA_FOLDERS = [
-    'Dropbox',
-    'Google Drive',
-    'OneDrive',
-    'SkyDrive',
-]
-SHELL_FOLDERS = {
-    #GUIDs from: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378457(v=vs.85).aspx
-    'Desktop': (
-        '{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}',
-        ),
-    'Documents': (
-        'Personal',
-        '{FDD39AD0-238F-46AF-ADB4-6C85480369C7}',
-        ),
-    'Downloads': (
-        '{374DE290-123F-4565-9164-39C4925E467B}',
-        ),
-    'Favorites': (
-        '{1777F761-68AD-4D8A-87BD-30B759FA33DD}',
-        ),
-    'Music': (
-        'My Music',
-        '{4BD8D571-6D19-48D3-BE97-422220080E43}',
-        ),
-    'Pictures': (
-        'My Pictures',
-        '{33E28130-4E1E-4676-835A-98395C3BC3BB}',
-        ),
-    'Videos': (
-        'My Video',
-        '{18989B1D-99B5-455B-841C-AB7C74E4DDFC}',
-        ),
-}
 
 def backup_file_list():
-    """Export current file listing for the system."""
-    extract_item('Everything', silent=True)
-    cmd = [
-        global_vars['Tools']['Everything'],
-        '-nodb',
-        '-create-filelist',
-        r'{LogDir}\File List.txt'.format(**global_vars),
-        global_vars['Env']['SYSTEMDRIVE']]
-    run_program(cmd)
+  """Export current file listing for the system."""
+  extract_item('Everything', silent=True)
+  cmd = [
+    global_vars['Tools']['Everything'],
+    '-nodb',
+    '-create-filelist',
+    r'{LogDir}\File List.txt'.format(**global_vars),
+    global_vars['Env']['SYSTEMDRIVE']]
+  run_program(cmd)
+
 
 def backup_power_plans():
-    """Export current power plans."""
-    os.makedirs(r'{BackupDir}\Power Plans'.format(**global_vars), exist_ok=True)
-    plans = run_program(['powercfg', '/L'])
-    plans = plans.stdout.decode().splitlines()
-    plans = [p for p in plans if re.search(r'^Power Scheme', p)]
-    for p in plans:
-        guid = re.sub(r'Power Scheme GUID:\s+([0-9a-f\-]+).*', r'\1', p)
-        name = re.sub(
-            r'Power Scheme GUID:\s+[0-9a-f\-]+\s+\(([^\)]+)\).*', r'\1', p)
-        out = r'{BackupDir}\Power Plans\{name}.pow'.format(
-            name=name, **global_vars)
-        if not os.path.exists(out):
-            cmd = ['powercfg', '-export', out, guid]
-            run_program(cmd, check=False)
+  """Export current power plans."""
+  os.makedirs(r'{BackupDir}\Power Plans\{Date}'.format(
+    **global_vars), exist_ok=True)
+  plans = run_program(['powercfg', '/L'])
+  plans = plans.stdout.decode().splitlines()
+  plans = [p for p in plans if re.search(r'^Power Scheme', p)]
+  for p in plans:
+    guid = re.sub(r'Power Scheme GUID:\s+([0-9a-f\-]+).*', r'\1', p)
+    name = re.sub(
+      r'Power Scheme GUID:\s+[0-9a-f\-]+\s+\(([^\)]+)\).*', r'\1', p)
+    out = r'{BackupDir}\Power Plans\{Date}\{name}.pow'.format(
+      name=name, **global_vars)
+    if not os.path.exists(out):
+      cmd = ['powercfg', '-export', out, guid]
+      run_program(cmd, check=False)
+
+
+def backup_registry(overwrite=False):
+  """Backup registry including user hives."""
+  extract_item('erunt', silent=True)
+  cmd = [
+    global_vars['Tools']['ERUNT'],
+    r'{BackupDir}\Registry\{Date}'.format(**global_vars),
+    'sysreg',
+    'curuser',
+    'otherusers',
+    '/noprogresswindow']
+  if overwrite:
+    cmd.append('/noconfirmdelete')
+  run_program(cmd)
 
-def backup_registry():
-    """Backup registry including user hives."""
-    extract_item('erunt', silent=True)
-    cmd = [
-        global_vars['Tools']['ERUNT'],
-        r'{BackupDir}\Registry'.format(**global_vars),
-        'sysreg',
-        'curuser',
-        'otherusers',
-        '/noprogresswindow']
-    run_program(cmd)
 
 def get_folder_size(path):
-    """Get (human-readable) size of folder passed, returns str."""
-    size = 'Unknown'
-    cmd = [global_vars['Tools']['Du'], '-nobanner', '-q', path]
+  """Get (human-readable) size of folder passed, returns str."""
+  size = 'Unknown'
+  cmd = [global_vars['Tools']['Du'], '-c', '-nobanner', '-q', path]
+  try:
+    out = run_program(cmd)
+  except FileNotFoundError:
+    # Failed to find folder
+    pass
+  except subprocess.CalledProcessError:
+    # Failed to get folder size
+    pass
+  else:
     try:
-        out = run_program(cmd)
-    except FileNotFoundError:
-        # Failed to find folder
-        pass
-    except subprocess.CalledProcessError:
-        # Failed to get folder size
-        pass
+      size = out.stdout.decode().split(',')[-2]
+    except IndexError:
+      # Failed to parse csv data
+      pass
     else:
-        size = out.stdout.decode().splitlines()[4]
-        size = re.sub(r'Size:\s+([\d,]+)\sbytes$', r'\1', size)
-        size = size.replace(',', '')
-        size = human_readable_size(size)
-    return size
+      size = human_readable_size(size)
+  return size
+
+
+def get_installed_antivirus():
+  """Get list of installed Antivirus programs."""
+  programs = []
+  cmd = ['WMIC', r'/namespace:\\root\SecurityCenter2',
+    'path', 'AntivirusProduct',
+    'get', 'displayName', '/value']
+  out = run_program(cmd)
+  out = out.stdout.decode().strip()
+  products = out.splitlines()
+  products = [p.split('=')[1] for p in products if p]
+  for prod in sorted(products):
+    # Get product state and check if it's enabled
+    # credit: https://jdhitsolutions.com/blog/powershell/5187/get-antivirus-product-status-with-powershell/
+    cmd = ['WMIC', r'/namespace:\\root\SecurityCenter2',
+      'path', 'AntivirusProduct',
+      'where', 'displayName="{}"'.format(prod),
+      'get', 'productState', '/value']
+    out = run_program(cmd)
+    out = out.stdout.decode().strip()
+    state = out.split('=')[1]
+    state = hex(int(state))
+    if str(state)[3:5] not in ['10', '11']:
+      programs.append('[Disabled] {}'.format(prod))
+    else:
+      programs.append(prod)
+
+  if len(programs) == 0:
+    programs = ['No programs found']
+  return programs
+
 
 def get_installed_office():
-    """Get list of installed Office programs."""
-    programs = []
-    log_file = r'{LogDir}\Installed Program List (AIDA64).txt'.format(
-        **global_vars)
-    with open (log_file, 'r') as f:
-        for line in sorted(f.readlines()):
-            if REGEX_OFFICE.search(line):
-                programs.append(line[4:82].strip())
+  """Get list of installed Office programs."""
+  programs = []
+  log_file = r'{LogDir}\Installed Program List (AIDA64).txt'.format(
+    **global_vars)
+  with open (log_file, 'r') as f:
+    for line in sorted(f.readlines()):
+      if REGEX_OFFICE.search(line):
+        programs.append(line[4:82].strip())
+
+  if len(programs) == 0:
+    programs = ['No programs found']
+  return programs
 
-    if len(programs) == 0:
-        programs = ['No programs found']
-    return programs
 
 def get_shell_path(folder, user='current'):
-    """Get shell path using SHGetKnownFolderPath via knownpaths, returns str.
-    
-    NOTE: Only works for the current user.
-    Code based on https://gist.github.com/mkropat/7550097
-    """
-    path = None
-    folderid = None
-    if user.lower() == 'public':
-        user = 'common'
+  """Get shell path using knownpaths, returns str.
+
+  NOTE: Only works for the current user.
+  Code based on https://gist.github.com/mkropat/7550097
+  """
+  path = None
+  folderid = None
+  if user.lower() == 'public':
+    user = 'common'
+  try:
+    folderid = getattr(knownpaths.FOLDERID, folder)
+  except AttributeError:
+    # Unknown folder ID, ignore and return None
+    pass
+
+  if folderid:
     try:
-        folderid = getattr(knownpaths.FOLDERID, folder)
-    except AttributeError:
-        # Unknown folder ID, ignore and return None
-        pass
-    
-    if folderid:
-        try:
-            path = knownpaths.get_path(folderid, getattr(knownpaths.UserHandle, user))
-        except PathNotFoundError:
-            # Folder not found, ignore and return None
-            pass
-    
-    return path
+      path = knownpaths.get_path(
+        folderid, getattr(knownpaths.UserHandle, user))
+    except PathNotFoundError:
+      # Folder not found, ignore and return None
+      pass
+
+  return path
+
 
 def get_user_data_paths(user):
-    """Get user data paths for provided user, returns dict."""
-    hive_path = user['SID']
-    paths = {
-        'Profile': {
-            'Path': None,
-            },
-        'Shell Folders': {},
-        'Extra Folders': {},
-        }
-    unload_hive = False
-    
-    if user['Name'] == global_vars['Env']['USERNAME']:
-        # We can use SHGetKnownFolderPath for the current user
-        paths['Profile']['Path'] = get_shell_path('Profile')
-        paths['Shell Folders'] = {f: {'Path': get_shell_path(f)}
-            for f in SHELL_FOLDERS.keys()}
-    else:
-        # We have to use the NTUSER.dat hives which isn't recommended by MS
-        try:
-            key_path = r'{}\{}'.format(REG_PROFILE_LIST, user['SID'])
-            with winreg.OpenKey(HKLM, key_path) as key:
-                paths['Profile']['Path'] = winreg.QueryValueEx(
-                    key, 'ProfileImagePath')[0]
-        except Exception:
-            # Profile path not found, leaving as None.
-            pass
-        
-        # Shell folders (Prep)
-        if not reg_path_exists(HKU, hive_path) and paths['Profile']['Path']:
-            # User not logged-in, loading hive
-            # Also setting unload_hive so it will be unloaded later.
-            hive_path = TMP_HIVE_PATH
-            cmd = ['reg', 'load', r'HKU\{}'.format(TMP_HIVE_PATH),
-                r'{}\NTUSER.DAT'.format(paths['Profile']['Path'])]
-            unload_hive = True
-            try:
-                run_program(cmd)
-            except subprocess.CalledProcessError:
-                # Failed to load user hive
-                pass
-        
-        # Shell folders
-        shell_folders = r'{}\{}'.format(hive_path, REG_SHELL_FOLDERS)
-        if (reg_path_exists(HKU, hive_path)
-            and reg_path_exists(HKU, shell_folders)):
-            with winreg.OpenKey(HKU, shell_folders) as key:
-                for folder, values in SHELL_FOLDERS.items():
-                    for value in values:
-                        try:
-                            path = winreg.QueryValueEx(key, value)[0]
-                        except FileNotFoundError:
-                            # Skip missing values
-                            pass
-                        else:
-                            paths['Shell Folders'][folder] = {'Path': path}
-                            # Stop checking values for this folder
-                            break
+  """Get user data paths for provided user, returns dict."""
+  hive_path = user['SID']
+  paths = {
+    'Profile': {
+      'Path': None,
+      },
+    'Shell Folders': {},
+    'Extra Folders': {},
+    }
+  unload_hive = False
 
-        # Shell folder (extra check)
-        if paths['Profile']['Path']:
-            for folder in SHELL_FOLDERS.keys():
-                folder_path = r'{Path}\{folder}'.format(
-                    folder=folder, **paths['Profile'])
-                if (folder not in paths['Shell Folders']
-                    and os.path.exists(folder_path)):
-                    paths['Shell Folders'][folder] = {'Path': folder_path}
-    
-    # Extra folders
+  if user['Name'] == global_vars['Env']['USERNAME']:
+    # We can use SHGetKnownFolderPath for the current user
+    paths['Profile']['Path'] = get_shell_path('Profile')
+    paths['Shell Folders'] = {f: {'Path': get_shell_path(f)}
+      for f in SHELL_FOLDERS.keys()}
+  else:
+    # We have to use the NTUSER.dat hives which isn't recommended by MS
+    try:
+      key_path = r'{}\{}'.format(REG_PROFILE_LIST, user['SID'])
+      with winreg.OpenKey(HKLM, key_path) as key:
+        paths['Profile']['Path'] = winreg.QueryValueEx(
+          key, 'ProfileImagePath')[0]
+    except Exception:
+      # Profile path not found, leaving as None.
+      pass
+
+    # Shell folders (Prep)
+    if not reg_path_exists(HKU, hive_path) and paths['Profile']['Path']:
+      # User not logged-in, loading hive
+      # Also setting unload_hive so it will be unloaded later.
+      hive_path = TMP_HIVE_PATH
+      cmd = ['reg', 'load', r'HKU\{}'.format(TMP_HIVE_PATH),
+        r'{}\NTUSER.DAT'.format(paths['Profile']['Path'])]
+      unload_hive = True
+      try:
+        run_program(cmd)
+      except subprocess.CalledProcessError:
+        # Failed to load user hive
+        pass
+
+    # Shell folders
+    shell_folders = r'{}\{}'.format(hive_path, REG_SHELL_FOLDERS)
+    if (reg_path_exists(HKU, hive_path)
+      and reg_path_exists(HKU, shell_folders)):
+      with winreg.OpenKey(HKU, shell_folders) as key:
+        for folder, values in SHELL_FOLDERS.items():
+          for value in values:
+            try:
+              path = winreg.QueryValueEx(key, value)[0]
+            except FileNotFoundError:
+              # Skip missing values
+              pass
+            else:
+              paths['Shell Folders'][folder] = {'Path': path}
+              # Stop checking values for this folder
+              break
+
+    # Shell folder (extra check)
     if paths['Profile']['Path']:
-        for folder in EXTRA_FOLDERS:
-            folder_path = r'{Path}\{folder}'.format(
-                folder=folder, **paths['Profile'])
-            if os.path.exists(folder_path):
-                paths['Extra Folders'][folder] = {'Path': folder_path}
-        
-    # Shell folders (cleanup)
-    if unload_hive:
-        cmd = ['reg', 'unload', r'HKU\{}'.format(TMP_HIVE_PATH)]
-        run_program(cmd, check=False)
-    
-    # Done
-    return paths
+      for folder in SHELL_FOLDERS.keys():
+        folder_path = r'{Path}\{folder}'.format(
+          folder=folder, **paths['Profile'])
+        if (folder not in paths['Shell Folders']
+          and os.path.exists(folder_path)):
+          paths['Shell Folders'][folder] = {'Path': folder_path}
+
+  # Extra folders
+  if paths['Profile']['Path']:
+    for folder in EXTRA_FOLDERS:
+      folder_path = r'{Path}\{folder}'.format(
+        folder=folder, **paths['Profile'])
+      if os.path.exists(folder_path):
+        paths['Extra Folders'][folder] = {'Path': folder_path}
+
+  # Shell folders (cleanup)
+  if unload_hive:
+    cmd = ['reg', 'unload', r'HKU\{}'.format(TMP_HIVE_PATH)]
+    run_program(cmd, check=False)
+
+  # Done
+  return paths
+
 
 def get_user_folder_sizes(users):
-    """Update list(users) to include folder paths and sizes."""
-    extract_item('du', filter='du*', silent=True)
-    # Configure Du
-    winreg.CreateKey(HKCU, r'Software\Sysinternals\Du')
-    with winreg.OpenKey(HKCU,
-        r'Software\Sysinternals\Du', access=winreg.KEY_WRITE) as key:
-        winreg.SetValueEx(key, 'EulaAccepted', 0, winreg.REG_DWORD, 1)
-    
-    for u in users:
-        u.update(get_user_data_paths(u))
-        if u['Profile']['Path']:
-            u['Profile']['Size'] = get_folder_size(u['Profile']['Path'])
-            for folder in u['Shell Folders'].keys():
-                u['Shell Folders'][folder]['Size'] = get_folder_size(
-                    u['Shell Folders'][folder]['Path'])
-            for folder in u['Extra Folders'].keys():
-                u['Extra Folders'][folder]['Size'] = get_folder_size(
-                    u['Extra Folders'][folder]['Path'])
+  """Update list(users) to include folder paths and sizes."""
+  extract_item('du', filter='du*', silent=True)
+  # Configure Du
+  winreg.CreateKey(HKCU, r'Software\Sysinternals\Du')
+  with winreg.OpenKey(HKCU,
+    r'Software\Sysinternals\Du', access=winreg.KEY_WRITE) as key:
+    winreg.SetValueEx(key, 'EulaAccepted', 0, winreg.REG_DWORD, 1)
+
+  for u in users:
+    u.update(get_user_data_paths(u))
+    if u['Profile']['Path']:
+      u['Profile']['Size'] = get_folder_size(u['Profile']['Path'])
+      for folder in u['Shell Folders'].keys():
+        u['Shell Folders'][folder]['Size'] = get_folder_size(
+          u['Shell Folders'][folder]['Path'])
+      for folder in u['Extra Folders'].keys():
+        u['Extra Folders'][folder]['Size'] = get_folder_size(
+          u['Extra Folders'][folder]['Path'])
+
 
 def get_user_list():
-    """Get user list via WMIC, returns list of dicts."""
-    users = []
-    
-    # Get user info from WMI
-    cmd = ['wmic', 'useraccount', 'get', '/format:csv']
-    try:
-        out = run_program(cmd)
-    except subprocess.CalledProcessError:
-        # Meh, return empty list to avoid a full crash
-        return users
-        
-    entries = out.stdout.decode().splitlines()
-    entries = [e.strip().split(',') for e in entries if e.strip()]
-    
-    # Add user(s) to dict
-    keys = entries[0]
-    for e in entries[1:]:
-        # Create dict using 1st line (keys)
-        e = dict(zip(keys, e))
-        # Set Active status via 'Disabled' TRUE/FALSE str
-        e['Active'] = bool(e['Disabled'].upper() == 'FALSE')
-        # Assume SIDs ending with 1000+ are "Standard" and others are "System"
-        e['Type'] = 'Standard' if re.search(r'-1\d+$', e['SID']) else 'System'
-        users.append(e)
-    
-    # Sort list
-    users.sort(key=itemgetter('Name'))
-    
-    # Done
+  """Get user list via WMIC, returns list of dicts."""
+  users = []
+
+  # Get user info from WMI
+  cmd = ['wmic', 'useraccount', 'get', '/format:csv']
+  try:
+    out = run_program(cmd)
+  except subprocess.CalledProcessError:
+    # Meh, return empty list to avoid a full crash
     return users
 
+  entries = out.stdout.decode().splitlines()
+  entries = [e.strip().split(',') for e in entries if e.strip()]
+
+  # Add user(s) to dict
+  keys = entries[0]
+  for e in entries[1:]:
+    # Create dict using 1st line (keys)
+    e = dict(zip(keys, e))
+    # Set Active status via 'Disabled' TRUE/FALSE str
+    e['Active'] = bool(e['Disabled'].upper() == 'FALSE')
+    # Assume SIDs ending with 1000+ are "Standard" and others are "System"
+    e['Type'] = 'Standard' if re.search(r'-1\d+$', e['SID']) else 'System'
+    users.append(e)
+
+  # Sort list
+  users.sort(key=itemgetter('Name'))
+
+  # Done
+  return users
+
+
 def reg_path_exists(hive, path):
-    """Test if specified path exists, returns bool."""
-    try:
-        winreg.QueryValue(hive, path)
-    except FileNotFoundError:
-        return False
-    else:
-        return True
+  """Test if specified path exists, returns bool."""
+  try:
+    winreg.QueryValue(hive, path)
+  except FileNotFoundError:
+    return False
+  else:
+    return True
+
 
 def run_aida64():
-    """Run AIDA64 to save system reports."""
-    extract_item('AIDA64', silent=True)
-    # All system info
-    config = r'{BinDir}\AIDA64\full.rpf'.format(**global_vars)
-    report_file = r'{LogDir}\System Information (AIDA64).html'.format(
-        **global_vars)
-    if not os.path.exists(report_file):
-        cmd = [
-            global_vars['Tools']['AIDA64'],
-            '/R', report_file,
-            '/CUSTOM', config,
-            '/HTML', '/SILENT', '/SAFEST']
-        run_program(cmd, check=False)
+  """Run AIDA64 to save system reports."""
+  extract_item('AIDA64', silent=True)
+  # All system info
+  config = r'{BinDir}\AIDA64\full.rpf'.format(**global_vars)
+  report_file = r'{LogDir}\System Information (AIDA64).html'.format(
+    **global_vars)
+  if not os.path.exists(report_file):
+    cmd = [
+      global_vars['Tools']['AIDA64'],
+      '/R', report_file,
+      '/CUSTOM', config,
+      '/HTML', '/SILENT', '/SAFEST']
+    run_program(cmd, check=False)
 
-    # Installed Programs
-    config = r'{BinDir}\AIDA64\installed_programs.rpf'.format(**global_vars)
-    report_file = r'{LogDir}\Installed Program List (AIDA64).txt'.format(
-        **global_vars)
-    if not os.path.exists(report_file):
-        cmd = [
-            global_vars['Tools']['AIDA64'],
-            '/R', report_file,
-            '/CUSTOM', config,
-            '/TEXT', '/SILENT', '/SAFEST']
-        run_program(cmd, check=False)
+  # Installed Programs
+  config = r'{BinDir}\AIDA64\installed_programs.rpf'.format(**global_vars)
+  report_file = r'{LogDir}\Installed Program List (AIDA64).txt'.format(
+    **global_vars)
+  if not os.path.exists(report_file):
+    cmd = [
+      global_vars['Tools']['AIDA64'],
+      '/R', report_file,
+      '/CUSTOM', config,
+      '/TEXT', '/SILENT', '/SAFEST']
+    run_program(cmd, check=False)
 
-    # Product Keys
-    config = r'{BinDir}\AIDA64\licenses.rpf'.format(**global_vars)
-    report_file = r'{LogDir}\Product Keys (AIDA64).txt'.format(**global_vars)
-    if not os.path.exists(report_file):
-        cmd = [
-            global_vars['Tools']['AIDA64'],
-            '/R', report_file,
-            '/CUSTOM', config,
-            '/TEXT', '/SILENT', '/SAFEST']
-        run_program(cmd, check=False)
+  # Product Keys
+  config = r'{BinDir}\AIDA64\licenses.rpf'.format(**global_vars)
+  report_file = r'{LogDir}\Product Keys (AIDA64).txt'.format(**global_vars)
+  if not os.path.exists(report_file):
+    cmd = [
+      global_vars['Tools']['AIDA64'],
+      '/R', report_file,
+      '/CUSTOM', config,
+      '/TEXT', '/SILENT', '/SAFEST']
+    run_program(cmd, check=False)
+
+
+def run_bleachbit(cleaners=None, preview=True):
+  """Run BleachBit preview and save log.
+
+  If preview is True then no files should be deleted."""
+  error_path = r'{}\Tools\BleachBit.err'.format(global_vars['LogDir'])
+  log_path = error_path.replace('err', 'log')
+  extract_item('BleachBit', silent=True)
+
+  # Safety check
+  if not cleaners:
+    # Disable cleaning and use preset config
+    cleaners = ['--preset']
+    preview = True
+
+  # Run
+  cmd = [
+    global_vars['Tools']['BleachBit'],
+    '--preview' if preview else '--clean']
+  cmd.extend(cleaners)
+  out = run_program(cmd, check=False)
+
+  # Save stderr
+  if out.stderr.decode().splitlines():
+    with open(error_path, 'a', encoding='utf-8') as f:
+      for line in out.stderr.decode().splitlines():
+        f.write(line.strip() + '\n')
+
+  # Save stdout
+  with open(log_path, 'a', encoding='utf-8') as f:
+    for line in out.stdout.decode().splitlines():
+      f.write(line.strip() + '\n')
 
-def run_bleachbit():
-    """Run BleachBit preview and save log.
-    
-    This is a preview so no files should be deleted."""
-    if not os.path.exists(global_vars['LogDir']+r'\BleachBit.log'):
-        extract_item('BleachBit', silent=True)
-        cmd = [global_vars['Tools']['BleachBit'], '--preview', '--preset']
-        out = run_program(cmd, check=False)
-        # Save stderr
-        if out.stderr.decode().splitlines():
-            with open(global_vars['LogDir']+r'\BleachBit.err', 'a',
-                encoding='utf-8') as f:
-                for line in out.stderr.decode().splitlines():
-                    f.write(line.strip() + '\n')
-        # Save stdout
-        with open(global_vars['LogDir']+r'\BleachBit.log', 'a',
-            encoding='utf-8') as f:
-            for line in out.stdout.decode().splitlines():
-                f.write(line.strip() + '\n')
 
 def show_disk_usage(disk):
-    """Show free and used space for a specified disk."""
-    print_standard('{:5}'.format(disk.device.replace('/', ' ')),
-        end='', flush=True, timestamp=False)
-    try:
-        usage = psutil.disk_usage(disk.device)
-        display_string = '{percent:>5.2f}% Free  ({free} / {total})'.format(
-            percent = 100 - usage.percent,
-            free = human_readable_size(usage.free, 2),
-            total = human_readable_size(usage.total, 2))
-        if usage.percent > 85:
-            print_error(display_string, timestamp=False)
-        elif usage.percent > 75:
-            print_warning(display_string, timestamp=False)
-        else:
-            print_standard(display_string, timestamp=False)
-    except Exception:
-        print_warning('Unknown', timestamp=False)
+  """Show free and used space for a specified disk."""
+  print_standard('{:5}'.format(disk.device.replace('/', ' ')),
+    end='', flush=True, timestamp=False)
+  try:
+    usage = psutil.disk_usage(disk.device)
+    display_string = '{percent:>5.2f}% Free  ({free} / {total})'.format(
+      percent = 100 - usage.percent,
+      free = human_readable_size(usage.free, 2),
+      total = human_readable_size(usage.total, 2))
+    if usage.percent > 85:
+      print_error(display_string, timestamp=False)
+    elif usage.percent > 75:
+      print_warning(display_string, timestamp=False)
+    else:
+      print_standard(display_string, timestamp=False)
+  except Exception:
+    print_warning('Unknown', timestamp=False)
+
 
 def show_free_space(indent=8, width=32):
-    """Show free space info for all fixed disks."""
-    message = 'Free Space:'
-    for disk in psutil.disk_partitions():
-        try:
-            if 'fixed' in disk.opts:
-                try_and_print(message=message, function=show_disk_usage,
-                    ns='Unknown', silent_function=False,
-                    indent=indent, width=width, disk=disk)
-                message = ''
-        except Exception:
-            pass
+  """Show free space info for all fixed disks."""
+  message = 'Free Space:'
+  for disk in psutil.disk_partitions():
+    try:
+      if 'fixed' in disk.opts:
+        try_and_print(message=message, function=show_disk_usage,
+          ns='Unknown', silent_function=False,
+          indent=indent, width=width, disk=disk)
+        message = ''
+    except Exception:
+      pass
+
 
 def show_installed_ram():
-    """Show installed RAM."""
-    mem = psutil.virtual_memory()
-    if mem.total > 5905580032:
-        # > 5.5 Gb so 6Gb or greater
-        print_standard(human_readable_size(mem.total).strip(), timestamp=False)
-    elif mem.total > 3758096384:
-        # > 3.5 Gb so 4Gb or greater
-        print_warning(human_readable_size(mem.total).strip(), timestamp=False)
-    else:
-        print_error(human_readable_size(mem.total).strip(), timestamp=False)
+  """Show installed RAM."""
+  mem = psutil.virtual_memory()
+  if mem.total > 5905580032:
+    # > 5.5 Gb so 6Gb or greater
+    print_standard(human_readable_size(mem.total).strip(), timestamp=False)
+  elif mem.total > 3758096384:
+    # > 3.5 Gb so 4Gb or greater
+    print_warning(human_readable_size(mem.total).strip(), timestamp=False)
+  else:
+    print_error(human_readable_size(mem.total).strip(), timestamp=False)
+
 
 def show_os_activation():
-    """Show OS activation info."""
-    act_str = get_activation_string()
-    if windows_is_activated():
-        print_standard(act_str, timestamp=False)
-    elif re.search(r'unavailable', act_str, re.IGNORECASE):
-        print_warning(act_str, timestamp=False)
-    else:
-        print_error(act_str, timestamp=False)
+  """Show OS activation info."""
+  act_str = get_activation_string()
+  if windows_is_activated():
+    print_standard(act_str, timestamp=False)
+  elif re.search(r'unavailable', act_str, re.IGNORECASE):
+    print_warning(act_str, timestamp=False)
+  else:
+    print_error(act_str, timestamp=False)
+
 
 def show_os_name():
-    """Show extended OS name (including warnings)."""
-    os_name = global_vars['OS']['DisplayName']
-    if global_vars['OS']['Arch'] == 32:
-        # Show all 32-bit installs as an error message
-        print_error(os_name, timestamp=False)
+  """Show extended OS name (including warnings)."""
+  os_name = global_vars['OS']['DisplayName']
+  if global_vars['OS']['Arch'] == 32:
+    # Show all 32-bit installs as an error message
+    print_error(os_name, timestamp=False)
+  else:
+    if re.search(
+        r'(preview build|unrecognized|unsupported)',
+        os_name,
+        re.IGNORECASE):
+      print_error(os_name, timestamp=False)
+    elif re.search(r'outdated', os_name, re.IGNORECASE):
+      print_warning(os_name, timestamp=False)
     else:
-        if re.search(r'(unrecognized|very outdated)', os_name, re.IGNORECASE):
-            print_error(os_name, timestamp=False)
-        elif re.search(r'outdated', os_name, re.IGNORECASE):
-            print_warning(os_name, timestamp=False)
-        else:
-            print_standard(os_name, timestamp=False)
+      print_standard(os_name, timestamp=False)
+
 
 def show_temp_files_size():
-    """Show total size of temp files identified by BleachBit."""
-    size = None
-    with open(r'{LogDir}\BleachBit.log'.format(**global_vars), 'r') as f:
-        for line in f.readlines():
-            if re.search(r'^disk space to be recovered:', line, re.IGNORECASE):
-                size = re.sub(r'.*: ', '', line.strip())
-                size = re.sub(r'(\w)iB$', r' \1b', size)
-    if size is None:
-        print_warning(size, timestamp=False)
-    else:
-        print_standard(size, timestamp=False)
+  """Show total size of temp files identified by BleachBit."""
+  size_str = None
+  total = 0
+  with open(r'{LogDir}\Tools\BleachBit.log'.format(**global_vars), 'r') as f:
+    for line in f.readlines():
+      if re.search(r'^Disk space (to be |)recovered:', line, re.IGNORECASE):
+        size = re.sub(r'.*: ', '', line.strip())
+        size = re.sub(r'(\w)iB$', r' \1b', size)
+        total += convert_to_bytes(size)
+        size_str = human_readable_size(total, decimals=1)
+  if size_str is None:
+    print_warning('UNKNOWN', timestamp=False)
+  else:
+    print_standard(size_str, timestamp=False)
+
 
 def show_user_data_summary(indent=8, width=32):
-    """Print user data folder sizes for all users."""
-    users = get_user_list()
-    users = [u for u in users if u['Active']]
-    get_user_folder_sizes(users)
-    for user in users:
-        print_success('{indent}User: {user}'.format(
-            indent = ' '*int(indent/2),
-            user = user['Name']))
-        for section in ['Profile', None, 'Shell Folders', 'Extra Folders']:
-            folders = []
-            if section is None:
-                # Divider
-                print_standard('{}{}'.format(' '*indent, '-'*(width+6)))
-            elif section == 'Profile':
-                folders = {'Profile': user['Profile']}
-            else:
-                folders = user[section]
-            for folder in folders:
-                print_standard(
-                    '{indent}{folder:<{width}}{size:>6} ({path})'.format(
-                        indent =    ' ' * indent,
-                        width =     width,
-                        folder =    folder,
-                        size =      folders[folder].get('Size', 'Unknown'),
-                        path =      folders[folder].get('Path', 'Unknown')))
+  """Print user data folder sizes for all users."""
+  users = get_user_list()
+  users = [u for u in users if u['Active']]
+  get_user_folder_sizes(users)
+  for user in users:
+    if ('Size' not in user['Profile']
+      and not any(user['Shell Folders'])
+      and not any(user['Extra Folders'])):
+      # Skip empty users
+      continue
+    print_success('{indent}User: {user}'.format(
+      indent = ' '*int(indent/2),
+      user = user['Name']))
+    for section in ['Profile', None, 'Shell Folders', 'Extra Folders']:
+      folders = []
+      if section is None:
+        # Divider
+        print_standard('{}{}'.format(' '*indent, '-'*(width+6)))
+      elif section == 'Profile':
+        folders = {'Profile': user['Profile']}
+      else:
+        folders = user[section]
+      for folder in folders:
+        print_standard(
+          '{indent}{folder:<{width}}{size:>6} ({path})'.format(
+            indent =  ' ' * indent,
+            width =   width,
+            folder =  folder,
+            size =    folders[folder].get('Size', 'Unknown'),
+            path =    folders[folder].get('Path', 'Unknown')))
+
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/json.py

@@ -0,0 +1,32 @@
+# Wizard Kit: Functions - JSON
+
+import json
+
+from functions.common import *
+
+def get_json_from_command(cmd, check=True, ignore_errors=True):
+  """Capture JSON content from cmd output, returns dict.
+
+  If the data can't be decoded then either an exception is raised
+  or an empty dict is returned depending on ignore_errors.
+  """
+  errors = 'strict'
+  json_data = {}
+
+  if ignore_errors:
+    errors = 'ignore'
+
+  try:
+    result = run_program(cmd, check=check, encoding='utf-8', errors=errors)
+    json_data = json.loads(result.stdout)
+  except (subprocess.CalledProcessError, json.decoder.JSONDecodeError):
+    if not ignore_errors:
+      raise
+
+  return json_data
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/network.py

@@ -1,83 +1,53 @@
-#!/bin/python3
-#
-## Wizard Kit: Functions - Network
+# Wizard Kit: Functions - Network
 
 import os
+import shutil
 import sys
 
-# Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
 from functions.common import *
 
+
 # REGEX
 REGEX_VALID_IP = re.compile(
-    r'(10.\d+.\d+.\d+'
-    r'|172.(1[6-9]|2\d|3[0-1])'
-    r'|192.168.\d+.\d+)',
-    re.IGNORECASE)
+  r'(10.\d+.\d+.\d+'
+  r'|172.(1[6-9]|2\d|3[0-1])'
+  r'|192.168.\d+.\d+)',
+  re.IGNORECASE)
 
-def connect_to_network():
-    """Connect to network if not already connected."""
-    net_ifs = psutil.net_if_addrs()
-    net_ifs = [i[:2] for i in net_ifs.keys()]
-
-    # Bail if currently connected
-    if is_connected():
-        return
-    
-    # LAN
-    if 'en' in net_ifs:
-        # Reload the tg3/broadcom driver (known fix for some Dell systems)
-        try_and_print(message='Reloading drivers...', function=reload_tg3)
-    
-    # WiFi
-    if not is_connected() and 'wl' in net_ifs:
-        cmd = [
-            'nmcli', 'dev', 'wifi',
-            'connect', WIFI_SSID,
-            'password', WIFI_PASSWORD]
-        try_and_print(
-            message = 'Connecting to {}...'.format(WIFI_SSID),
-            function = run_program,
-            cmd = cmd)
 
 def is_connected():
-    """Check for a valid private IP."""
-    devs = psutil.net_if_addrs()
-    for dev in devs.values():
-        for family in dev:
-            if REGEX_VALID_IP.search(family.address):
-                # Valid IP found
-                return True
-    # Else
-    return False
+  """Check for a valid private IP."""
+  devs = psutil.net_if_addrs()
+  for dev in devs.values():
+    for family in dev:
+      if REGEX_VALID_IP.search(family.address):
+        # Valid IP found
+        return True
+  # Else
+  return False
+
 
 def show_valid_addresses():
-    """Show all valid private IP addresses assigned to the system."""
-    devs = psutil.net_if_addrs()
-    for dev, families in sorted(devs.items()):
-        for family in families:
-            if REGEX_VALID_IP.search(family.address):
-                # Valid IP found
-                show_data(message=dev, data=family.address)
+  """Show all valid private IP addresses assigned to the system."""
+  devs = psutil.net_if_addrs()
+  for dev, families in sorted(devs.items()):
+    for family in families:
+      if REGEX_VALID_IP.search(family.address):
+        # Valid IP found
+        show_data(message=dev, data=family.address)
+
 
 def speedtest():
-    """Run a network speedtest using speedtest-cli."""
-    result = run_program(['speedtest-cli', '--simple'])
-    output = [line.strip() for line in result.stdout.decode().splitlines()
-        if line.strip()]
-    output = [line.split() for line in output]
-    output = [(a, float(b), c) for a, b, c in output]
-    return ['{:10}{:6.2f} {}'.format(*line) for line in output]
+  """Run a network speedtest using speedtest-cli."""
+  result = run_program(['speedtest-cli', '--simple'])
+  output = [line.strip() for line in result.stdout.decode().splitlines()
+    if line.strip()]
+  output = [line.split() for line in output]
+  output = [(a, float(b), c) for a, b, c in output]
+  return ['{:10}{:6.2f} {}'.format(*line) for line in output]
 
-def reload_tg3():
-    """Reload tg3 module as a workaround for some Dell systems."""
-    run_program(['sudo', 'modprobe', '-r', 'tg3'])
-    run_program(['sudo', 'modprobe', 'broadcom'])
-    run_program(['sudo', 'modprobe', 'tg3'])
-    sleep(5)
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
 
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/partition_uids.py

@@ -1,326 +0,0 @@
-# Wizard Kit: Functions - PARTITION UIDs
-# sources:  https://en.wikipedia.org/wiki/GUID_Partition_Table
-#           https://en.wikipedia.org/wiki/Partition_type
-# NOTE: Info has been trimmed for brevity. As such, there may be some inaccuracy.
-
-PARTITION_UIDS = {
-    '00': {'OS': 'All','Description': 'Empty partition entry'},
-    '01': {'OS': 'DOS','Description': 'FAT12 as primary partition'},
-    '02': {'OS': 'XENIX','Description': 'XENIX root'},
-    '03': {'OS': 'XENIX','Description': 'XENIX usr'},
-    '04': {'OS': 'DOS','Description': 'FAT16 with less than 32 MB'},
-    '05': {'OS': 'DOS / SpeedStor','Description': 'Extended partition'},
-    '06': {'OS': 'DOS1+','Description': 'FAT16B [over 65K sectors]'},
-    '07': {'OS': 'Windows / OS/2 / QNX 2','Description': 'NTFS/exFAT/HPFS/IFS/QNX'},
-    '08': {'OS': 'CBM / DOS / OS/2 / AIX /QNX','Description': 'FAT12-16/AIX/QNY/SplitDrive'},
-    '09': {'OS': 'AIX / QNX / Coherent / OS-9','Description': 'AIX/QNZ/Coherent/RBF'},
-    '0A': {'OS': 'OS/2 / Coherent','Description': 'Boot Manager / Swap'},
-    '0B': {'OS': 'DOS','Description': 'FAT32 with CHS addressing'},
-    '0C': {'OS': 'DOS','Description': 'FAT32 with LBA'},
-    '0D': {'OS': 'Silicon Safe','Description': 'Reserved'},
-    '0E': {'OS': 'DOS','Description': 'FAT16B with LBA'},
-    '0F': {'OS': 'DOS','Description': 'Extended partition with LBA'},
-    '10': {'OS': 'OPUS','Description': 'Unknown'},
-    '11': {'OS': 'Leading Edge MS-DOS / OS/2','Description': 'FAT12/FAT16'},
-    '12': {'OS': 'Compaq Contura','Description': 'conf/diag/hiber/rescue/serv'},
-    '14': {'OS': 'AST DOS / OS/2 / MaverickOS','Description': 'FAT12/FAT16/Omega'},
-    '15': {'OS': 'OS/2 / Maverick OS','Description': 'Hidden extended / Swap'},
-    '16': {'OS': 'OS/2 Boot Manager','Description': 'Hidden FAT16B'},
-    '17': {'OS': 'OS/2 Boot Manager','Description': 'Hidden IFS/HPFS/NTFS/exFAT'},
-    '18': {'OS': 'AST Windows','Description': '0-Volt Suspend/SmartSleep'},
-    '19': {'OS': 'Willowtech Photon coS','Description': 'Willowtech Photon coS'},
-    '1B': {'OS': 'OS/2 Boot Manager','Description': 'Hidden FAT32'},
-    '1C': {'OS': 'OS/2 Boot Manager','Description': 'Hidden FAT32 with LBA'},
-    '1E': {'OS': 'OS/2 Boot Manager','Description': 'Hidden FAT16 with LBA'},
-    '1F': {'OS': 'OS/2 Boot Manager','Description': 'Hidden extended with LBA'},
-    '20': {'OS': 'Windows Mobile','Description': 'update XIP/Willowsoft OFS1'},
-    '21': {'OS': 'Oxygen','Description': 'SpeedStor / FSo2'},
-    '22': {'OS': 'Oxygen','Description': 'Oxygen Extended Partition'},
-    '23': {'OS': 'Windows Mobile','Description': 'Reserved / boot XIP'},
-    '24': {'OS': 'NEC MS-DOS0','Description': 'Logical FAT12 or FAT16'},
-    '25': {'OS': 'Windows Mobile','Description': 'IMGFS[citation needed]'},
-    '26': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
-    '27': {'OS': 'Win/PQserv/MirOS/RooterBOOT','Description': 'WinRE/Rescue/MirOS/RooterBOOT'},
-    '2A': {'OS': 'AtheOS','Description': 'AthFS/AFS/Reserved'},
-    '2B': {'OS': 'SyllableOS','Description': 'SyllableSecure (SylStor)'},
-    '31': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
-    '32': {'OS': 'NOS','Description': 'Unknown'},
-    '33': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
-    '34': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
-    '35': {'OS': 'OS/2 Server /eComStation','Description': 'JFS'},
-    '36': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
-    '38': {'OS': 'THEOS','Description': 'THEOS version 3.2, 2 GB'},
-    '39': {'OS': 'Plan 9 / THEOS','Description': 'Plan 9 edition 3 / THEOS v4'},
-    '3A': {'OS': 'THEOS','Description': 'THEOS v4, 4 GB'},
-    '3B': {'OS': 'THEOS','Description': 'THEOS v4 extended'},
-    '3C': {'OS': 'PartitionMagic','Description': 'PqRP (image in progress)'},
-    '3D': {'OS': 'PartitionMagic','Description': 'Hidden NetWare'},
-    '3F': {'OS': 'OS/32','Description': 'Unknown'},
-    '40': {'OS': 'PICK / Venix','Description': 'PICK R83 / Venix 80286'},
-    '41': {'OS': 'RISC / Linux / PowerPC','Description': 'Boot / Old Linux/Minix'},
-    '42': {'OS': 'SFS / Linux / Win2K/XP/etc','Description': 'SFS / Old Linux Swap'},
-    '43': {'OS': 'Linux','Description': 'Old Linux native'},
-    '44': {'OS': 'GoBack','Description': 'Norton/WildFire/Adaptec/Roxio'},
-    '45': {'OS': 'Boot-US / EUMEL/ELAN','Description': 'Priam/Boot/EUMEL/ELAN (L2)'},
-    '46': {'OS': 'EUMEL/ELAN','Description': 'EUMEL/ELAN (L2)'},
-    '47': {'OS': 'EUMEL/ELAN','Description': 'EUMEL/ELAN (L2)'},
-    '48': {'OS': 'EUMEL/ELAN','Description': 'EUMEL/ELAN (L2), ERGOS L3'},
-    '4A': {'OS': 'AdaOS / ALFS/THIN','Description': 'Aquila / ALFS/THIN'},
-    '4C': {'OS': 'ETH Oberon','Description': 'Aos (A2) file system (76)'},
-    '4D': {'OS': 'QNX Neutrino','Description': 'Primary QNX POSIX volume'},
-    '4E': {'OS': 'QNX Neutrino','Description': 'Secondary QNX POSIX volume'},
-    '4F': {'OS': 'QNX Neutrino / ETH Oberon','Description': '3rd QNX POSIX/Boot/Native'},
-    '50': {'OS': 'DiskMan4/ETH/LynxOS/Novell','Description': 'Alt FS/Read-only/Lynx RTOS'},
-    '51': {'OS': 'Disk Manager 4-6','Description': 'R/W partition (Aux 1)'},
-    '52': {'OS': 'CP/M-80/ System V/AT, V/386','Description': 'CP/M-80'},
-    '53': {'OS': 'Disk Manager 6','Description': 'Auxiliary 3 (WO)'},
-    '54': {'OS': 'Disk Manager 6','Description': 'Dynamic Drive Overlay (DDO)'},
-    '55': {'OS': 'EZ-Drive','Description': 'Maxtor/MaxBlast/DriveGuide'},
-    '56': {'OS': 'AT&T DOS/EZ-Drive/VFeature','Description': 'FAT12~16/EZ-BIOS/VFeature'},
-    '57': {'OS': 'DrivePro','Description': 'VNDI partition'},
-    '5C': {'OS': 'EDISK','Description': 'Priam EDisk Volume'},
-    '61': {'OS': 'SpeedStor','Description': 'Unknown'},
-    '63': {'OS': 'Unix','Description': 'Unix,ISC,SysV,ix,BSD,HURD'},
-    '64': {'OS': 'SpeedStor / NetWare','Description': 'NetWare FS 286/2,PC-ARMOUR'},
-    '65': {'OS': 'NetWare','Description': 'NetWare File System 386'},
-    '66': {'OS': 'NetWare / NetWare','Description': 'NetWare FS 386 / SMS'},
-    '67': {'OS': 'NetWare','Description': 'Wolf Mountain'},
-    '68': {'OS': 'NetWare','Description': 'Unknown'},
-    '69': {'OS': 'NetWare 5 / NetWare','Description': 'Novell Storage Services'},
-    '6E': {'Description': 'Unknown'},
-    '70': {'OS': 'DiskSecure','Description': 'DiskSecure multiboot'},
-    '71': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
-    '72': {'OS': 'APTI systems / Unix V7/x86','Description': 'APTI altFAT12 / V7 / x86'},
-    '73': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
-    '74': {'OS': 'Microsoft, IBM','Description': 'Reserved / Scramdisk'},
-    '75': {'OS': 'PC/IX','Description': 'Unknown'},
-    '76': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
-    '77': {'OS': 'Novell','Description': 'VNDI, M2FS, M2CS'},
-    '78': {'OS': 'Geurt Vos','Description': 'XOSL bootloader file system'},
-    '79': {'OS': 'APTI conformant systems','Description': 'APTI altFAT16 (CHS, SFN)'},
-    '7A': {'OS': 'APTI conformant systems','Description': 'APTI altFAT16 (LBA, SFN)'},
-    '7B': {'OS': 'APTI conformant systems','Description': 'APTI altFAT16B (CHS, SFN)'},
-    '7C': {'OS': 'APTI conformant systems','Description': 'APTI altFAT32 (LBA, SFN)'},
-    '7D': {'OS': 'APTI conformant systems','Description': 'APTI altFAT32 (CHS, SFN)'},
-    '7E': {'OS': 'F.I.X. (claim) / PrimoCache','Description': 'Level 2 cache'},
-    '7F': {'OS': 'Varies','Description': 'AltOS DevPartition Standard'},
-    '80': {'OS': 'Minix 1.1-1.4a','Description': 'Minix file system (old)'},
-    '81': {'OS': 'Minix 1.4b+ / Linux','Description': 'MINIX FS/Mitac AdvDiskManager'},
-    '82': {'OS': 'Linux / Sun Microsystems','Description': 'Swap / Solaris x86 / Prime'},
-    '83': {'OS': 'GNU/Linux','Description': 'Any native Linux FS'},
-    '84': {'OS': 'OS/2 / Windows 7','Description': 'Hibernat/HiddenC/RapidStart'},
-    '85': {'OS': 'GNU/Linux','Description': 'Linux extended'},
-    '86': {'OS': 'Windows NT 4 Server / Linux','Description': 'FAT16B mirror/LinuxRAID-old'},
-    '87': {'OS': 'Windows NT 4 Server','Description': 'HPFS/NTFS mirrored volume'},
-    '88': {'OS': 'GNU/Linux','Description': 'Plaintext partition table'},
-    '8A': {'OS': 'AiR-BOOT','Description': 'Linux kernel image'},
-    '8B': {'OS': 'Windows NT 4 Server','Description': 'FAT32 mirrored volume set'},
-    '8C': {'OS': 'Windows NT 4 Server','Description': 'FAT32 mirrored volume set'},
-    '8D': {'OS': 'Free FDISK','Description': 'Hidden FAT12'},
-    '8E': {'OS': 'Linux','Description': 'Linux LVM'},
-    '90': {'OS': 'Free FDISK','Description': 'Hidden FAT16'},
-    '91': {'OS': 'Free FDISK','Description': 'Hidden extended partition'},
-    '92': {'OS': 'Free FDISK','Description': 'Hidden FAT16B'},
-    '93': {'OS': 'Amoeba / Linux','Description': 'Amoeba native/Hidden Linux'},
-    '94': {'OS': 'Amoeba','Description': 'Amoeba bad block table'},
-    '95': {'OS': 'EXOPC','Description': 'EXOPC native'},
-    '96': {'OS': 'CHRP','Description': 'ISO-9660 file system'},
-    '97': {'OS': 'Free FDISK','Description': 'Hidden FAT32'},
-    '98': {'OS': 'Free FDISK / ROM-DOS','Description': 'Hidden FAT32 / service part'},
-    '99': {'OS': 'early Unix','Description': 'Unknown'},
-    '9A': {'OS': 'Free FDISK','Description': 'Hidden FAT16'},
-    '9B': {'OS': 'Free FDISK','Description': 'Hidden extended partition'},
-    '9E': {'OS': 'VSTA / ForthOS','Description': 'ForthOS (eForth port)'},
-    '9F': {'OS': 'BSD/OS 3.0+, BSDI','Description': 'Unknown'},
-    'A0': {'OS': 'HP/Phoenix/IBM/Toshiba/Sony','Description': 'Diagnostic for HP/Hibernate'},
-    'A1': {'OS': 'HP / Phoenix, NEC','Description': 'HP Vol Expansion/Hibernate'},
-    'A2': {'OS': 'Cyclone V','Description': 'Hard Processor System (HPS)'},
-    'A3': {'OS': 'HP','Description': 'HP Vol Expansion(SpeedStor)'},
-    'A4': {'OS': 'HP','Description': 'HP Vol Expansion(SpeedStor)'},
-    'A5': {'OS': 'BSD','Description': 'BSD slice'},
-    'A6': {'OS': 'OpenBSD','Description': 'HP Vol Expansion/BSD slice'},
-    'A7': {'OS': 'NeXT','Description': 'NeXTSTEP'},
-    'A8': {'OS': 'Darwin, Mac OS X','Description': 'Apple Darwin, Mac OS X UFS'},
-    'A9': {'OS': 'NetBSD','Description': 'NetBSD slice'},
-    'AA': {'OS': 'MS-DOS','Description': 'Olivetti DOS FAT12(1.44 MB)'},
-    'AB': {'OS': 'Darwin, Mac OS X / GO! OS','Description': 'Apple Darwin/OS X boot/GO!'},
-    'AD': {'OS': 'RISC OS','Description': 'ADFS / FileCore format'},
-    'AE': {'OS': 'ShagOS','Description': 'ShagOS file system'},
-    'AF': {'OS': 'ShagOS','Description': 'OS X HFS & HFS+/ShagOS Swap'},
-    'B0': {'OS': 'Boot-Star','Description': 'Boot-Star dummy partition'},
-    'B1': {'OS': 'QNX 6.x','Description': 'HPVolExpansion/QNX Neutrino'},
-    'B2': {'OS': 'QNX 6.x','Description': 'QNX Neutrino power-safe FS'},
-    'B3': {'OS': 'QNX 6.x','Description': 'HPVolExpansion/QNX Neutrino'},
-    'B4': {'OS': 'HP','Description': 'HP Vol Expansion(SpeedStor)'},
-    'B6': {'OS': 'Windows NT 4 Server','Description': 'HPVolExpansion/FAT16Bmirror'},
-    'B7': {'OS': 'BSDI / Windows NT 4 Server','Description': 'BSDI,Swap,HPFS/NTFS mirror'},
-    'B8': {'OS': 'BSDI (before 3.0)','Description': 'BSDI Swap / native FS'},
-    'BB': {'OS': 'Acronis/BootWizard/WinNT 4','Description': 'BootWizard/OEM/FAT32 mirror'},
-    'BC': {'OS': 'Acronis/WinNT/BackupCapsule','Description': 'FAT32RAID/SecureZone/Backup'},
-    'BD': {'OS': 'BonnyDOS/286','Description': 'Unknown'},
-    'BE': {'OS': 'Solaris 8','Description': 'Solaris 8 boot'},
-    'BF': {'OS': 'Solaris','Description': 'Solaris x86'},
-    'C0': {'OS': 'DR-DOS,MultiuserDOS,REAL/32','Description': 'Secured FAT (under 32 MB)'},
-    'C1': {'OS': 'DR DOS','Description': 'Secured FAT12'},
-    'C2': {'OS': 'Power Boot','Description': 'Hidden Linux native FS'},
-    'C3': {'OS': 'Power Boot','Description': 'Hidden Linux Swap'},
-    'C4': {'OS': 'DR DOS','Description': 'Secured FAT16'},
-    'C5': {'OS': 'DR DOS','Description': 'Secured extended partition'},
-    'C6': {'OS': 'DR DOS / WinNT 4 Server','Description': 'Secured FAT16B/FAT16Bmirror'},
-    'C7': {'OS': 'Syrinx / WinNT 4 Server','Description': 'Syrinx boot/HPFS/NTFSmirror'},
-    'C8': {'Description': "DR-DOS Reserved (since '97)"},
-    'C9': {'Description': "DR-DOS Reserved (since '97)"},
-    'CA': {'Description': "DR-DOS Reserved (since '97)"},
-    'CB': {'OS': 'DR-DOSx / WinNT 4 Server','Description': 'Secured FAT32/FAT32 mirror'},
-    'CC': {'OS': 'DR-DOSx / WinNT 4 Server','Description': 'Secured FAT32/FAT32 mirror'},
-    'CD': {'OS': 'CTOS','Description': 'Memory dump'},
-    'CE': {'OS': 'DR-DOSx','Description': 'Secured FAT16B'},
-    'CF': {'OS': 'DR-DOSx','Description': 'Secured extended partition'},
-    'D0': {'OS': 'Multiuser DOS, REAL/32','Description': 'Secured FAT (over 32 MB)'},
-    'D1': {'OS': 'Multiuser DOS','Description': 'Secured FAT12'},
-    'D4': {'OS': 'Multiuser DOS','Description': 'Secured FAT16'},
-    'D5': {'OS': 'Multiuser DOS','Description': 'Secured extended partition'},
-    'D6': {'OS': 'Multiuser DOS','Description': 'Secured FAT16B'},
-    'D8': {'OS': 'Digital Research','Description': 'CP/M-86 [citation needed]'},
-    'DA': {'OS': 'Powercopy Backup','Description': 'Non-FS data / Shielded disk'},
-    'DB': {'OS': 'CP/M-86/CDOS/CTOS/D800/DRMK','Description': 'CP/M-86/ConcDOS/Boot/FAT32'},
-    'DD': {'OS': 'CTOS','Description': 'Hidden memory dump'},
-    'DE': {'OS': 'Dell','Description': 'FAT16 utility/diagnostic'},
-    'DF': {'OS': 'DG/UX / BootIt / Aviion','Description': 'DG/UX Virt DiskMan / EMBRM'},
-    'E0': {'OS': 'STMicroelectronics','Description': 'ST AVFS'},
-    'E1': {'OS': 'SpeedStor','Description': 'ExtendedFAT12 >1023cylinder'},
-    'E2': {'Description': 'DOS read-only (XFDISK)'},
-    'E3': {'OS': 'SpeedStor','Description': 'DOS read-only'},
-    'E4': {'OS': 'SpeedStor','Description': 'ExtendedFAT16 <1024cylinder'},
-    'E5': {'OS': 'Tandy MS-DOS','Description': 'Logical FAT12 or FAT16'},
-    'E6': {'OS': 'SpeedStor','Description': 'Unknown'},
-    'E8': {'OS': 'LUKS','Description': 'Linux Unified Key Setup'},
-    'EB': {'OS': 'BeOS, Haiku','Description': 'BFS'},
-    'EC': {'OS': 'SkyOS','Description': 'SkyFS'},
-    'ED': {'OS': 'Sprytix / EDD 4','Description': 'EDC loader / GPT hybrid MBR'},
-    'EE': {'OS': 'EFI','Description': 'GPT protective MBR'},
-    'EF': {'OS': 'EFI','Description': 'EFI system partition'},
-    'F0': {'OS': 'Linux / OS/32','Description': 'PA-RISC Linux boot loader.'},
-    'F1': {'OS': 'SpeedStor','Description': 'Unknown'},
-    'F2': {'OS': 'SperryIT DOS/Unisys DOS','Description': 'Logical FAT12/FAT16'},
-    'F3': {'OS': 'SpeedStor','Description': 'Unknown'},
-    'F4': {'OS': 'SpeedStor / Prologue','Description': '"large"DOS part/NGF/TwinFS'},
-    'F5': {'OS': 'Prologue','Description': 'MD0-MD9 part for NGF/TwinFS'},
-    'F6': {'OS': 'SpeedStor','Description': 'Unknown'},
-    'F7': {'OS': 'O.S.G. / X1','Description': 'EFAT / Solid State FS'},
-    'F9': {'OS': 'Linux','Description': 'pCache ext2/ext3 cache'},
-    'FA': {'OS': 'Bochs','Description': 'x86 emulator'},
-    'FB': {'OS': 'VMware','Description': 'VMware VMFS partition'},
-    'FC': {'OS': 'VMware','Description': 'Swap / VMKCORE kernel dump'},
-    'FD': {'OS': 'Linux / FreeDOS','Description': 'LinuxRAID/Reserved4FreeDOS'},
-    'FE': {'OS': 'SpeedStor/LANstep/NT/Linux','Description': 'PS/2/DiskAdmin/old LinuxLVM'},
-    'FF': {'OS': 'XENIX','Description': 'XENIX bad block table'},
-    '00000000-0000-0000-0000-000000000000': {'Description': 'Unused entry'},
-    '024DEE41-33E7-11D3-9D69-0008C781F39F': {'Description': 'MBR partition scheme'},
-    'C12A7328-F81F-11D2-BA4B-00A0C93EC93B': {'Description': 'EFI System partition'},
-    '21686148-6449-6E6F-744E-656564454649': {'Description': 'BIOS Boot partition'},
-    'D3BFE2DE-3DAF-11DF-BA40-E3A556D89593': {'Description': 'Intel Fast Flash (iFFS) partition (for Intel Rapid Start technology)'},
-    'F4019732-066E-4E12-8273-346C5641494F': {'Description': 'Sony boot partition'},
-    'BFBFAFE7-A34F-448A-9A5B-6213EB736C22': {'Description': 'Lenovo boot partition'},
-    'E3C9E316-0B5C-4DB8-817D-F92DF00215AE': {'OS': 'Windows', 'Description': 'Microsoft Reserved Partition (MSR)'},
-    'EBD0A0A2-B9E5-4433-87C0-68B6B72699C7': {'OS': 'Windows', 'Description': 'Basic data partition'},
-    '5808C8AA-7E8F-42E0-85D2-E1E90434CFB3': {'OS': 'Windows', 'Description': 'Logical Disk Manager (LDM) metadata partition'},
-    'AF9B60A0-1431-4F62-BC68-3311714A69AD': {'OS': 'Windows', 'Description': 'Logical Disk Manager data partition'},
-    'DE94BBA4-06D1-4D40-A16A-BFD50179D6AC': {'OS': 'Windows', 'Description': 'Windows Recovery Environment'},
-    '37AFFC90-EF7D-4E96-91C3-2D7AE055B174': {'OS': 'Windows', 'Description': 'IBM General Parallel File System (GPFS) partition'},
-    'E75CAF8F-F680-4CEE-AFA3-B001E56EFC2D': {'OS': 'Windows', 'Description': 'Storage Spaces partition'},
-    '75894C1E-3AEB-11D3-B7C1-7B03A0000000': {'OS': 'HP-UX', 'Description': 'Data partition'},
-    'E2A1E728-32E3-11D6-A682-7B03A0000000': {'OS': 'HP-UX', 'Description': 'Service Partition'},
-    '0FC63DAF-8483-4772-8E79-3D69D8477DE4': {'OS': 'Linux', 'Description': 'Linux filesystem data'},
-    'A19D880F-05FC-4D3B-A006-743F0F84911E': {'OS': 'Linux', 'Description': 'RAID partition'},
-    '44479540-F297-41B2-9AF7-D131D5F0458A': {'OS': 'Linux', 'Description': 'Root partition (x86)'},
-    '4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709': {'OS': 'Linux', 'Description': 'Root partition (x86-64)'},
-    '69DAD710-2CE4-4E3C-B16C-21A1D49ABED3': {'OS': 'Linux', 'Description': 'Root partition (32-bit ARM)'},
-    'B921B045-1DF0-41C3-AF44-4C6F280D3FAE': {'OS': 'Linux', 'Description': 'Root partition (64-bit ARM)/AArch64)'},
-    '0657FD6D-A4AB-43C4-84E5-0933C84B4F4F': {'OS': 'Linux', 'Description': 'Swap partition'},
-    'E6D6D379-F507-44C2-A23C-238F2A3DF928': {'OS': 'Linux', 'Description': 'Logical Volume Manager (LVM) partition'},
-    '933AC7E1-2EB4-4F13-B844-0E14E2AEF915': {'OS': 'Linux', 'Description': '/home partition'},
-    '3B8F8425-20E0-4F3B-907F-1A25A76F98E8': {'OS': 'Linux', 'Description': '/srv (server data) partition'},
-    '7FFEC5C9-2D00-49B7-8941-3EA10A5586B7': {'OS': 'Linux', 'Description': 'Plain dm-crypt partition'},
-    'CA7D7CCB-63ED-4C53-861C-1742536059CC': {'OS': 'Linux', 'Description': 'LUKS partition'},
-    '8DA63339-0007-60C0-C436-083AC8230908': {'OS': 'Linux', 'Description': 'Reserved'},
-    '83BD6B9D-7F41-11DC-BE0B-001560B84F0F': {'OS': 'FreeBSD', 'Description': 'Boot partition'},
-    '516E7CB4-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'Data partition'},
-    '516E7CB5-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'Swap partition'},
-    '516E7CB6-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'Unix File System (UFS) partition'},
-    '516E7CB8-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'Vinum volume manager partition'},
-    '516E7CBA-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'ZFS partition'},
-    '48465300-0000-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Hierarchical File System Plus (HFS+) partition'},
-    '55465300-0000-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple UFS'},
-    '6A898CC3-1DD2-11B2-99A6-080020736631': {'OS': 'OS X Darwin', 'Description': 'ZFS'},
-    '52414944-0000-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple RAID partition'},
-    '52414944-5F4F-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple RAID partition, offline'},
-    '426F6F74-0000-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple Boot partition (Recovery HD)'},
-    '4C616265-6C00-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple Label'},
-    '5265636F-7665-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple TV Recovery partition'},
-    '53746F72-6167-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple Core Storage (i.e. Lion FileVault) partition'},
-    '6A82CB45-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Boot partition'},
-    '6A85CF4D-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Root partition'},
-    '6A87C46F-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Swap partition'},
-    '6A8B642B-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Backup partition'},
-    '6A898CC3-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': '/usr partition'},
-    '6A8EF2E9-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': '/var partition'},
-    '6A90BA39-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': '/home partition'},
-    '6A9283A5-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Alternate sector'},
-    '6A945A3B-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Reserved partition'},
-    '6A9630D1-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos'},
-    '6A980767-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos'},
-    '6A96237F-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos'},
-    '6A8D2AC7-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos'},
-    '49F48D32-B10E-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'Swap partition'},
-    '49F48D5A-B10E-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'FFS partition'},
-    '49F48D82-B10E-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'LFS partition'},
-    '49F48DAA-B10E-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'RAID partition'},
-    '2DB519C4-B10F-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'Concatenated partition'},
-    '2DB519EC-B10F-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'Encrypted partition'},
-    'FE3A2A5D-4F32-41A7-B725-ACCC3285A309': {'OS': 'ChromeOS', 'Description': 'ChromeOS kernel'},
-    '3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC': {'OS': 'ChromeOS', 'Description': 'ChromeOS rootfs'},
-    '2E0A753D-9E48-43B0-8337-B15192CB1B5E': {'OS': 'ChromeOS', 'Description': 'ChromeOS future use'},
-    '42465331-3BA3-10F1-802A-4861696B7521': {'OS': 'Haiku', 'Description': 'Haiku BFS'},
-    '85D5E45E-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Boot partition'},
-    '85D5E45A-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Data partition'},
-    '85D5E45B-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Swap partition'},
-    '0394EF8B-237E-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Unix File System (UFS) partition'},
-    '85D5E45C-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Vinum volume manager partition'},
-    '85D5E45D-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'ZFS partition'},
-    '45B0969E-9B03-4F30-B4C6-B4B80CEFF106': {'OS': 'Ceph', 'Description': 'Ceph Journal'},
-    '45B0969E-9B03-4F30-B4C6-5EC00CEFF106': {'OS': 'Ceph', 'Description': 'Ceph dm-crypt Encrypted Journal'},
-    '4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D': {'OS': 'Ceph', 'Description': 'Ceph OSD'},
-    '4FBD7E29-9D25-41B8-AFD0-5EC00CEFF05D': {'OS': 'Ceph', 'Description': 'Ceph dm-crypt OSD'},
-    '89C57F98-2FE5-4DC0-89C1-F3AD0CEFF2BE': {'OS': 'Ceph', 'Description': 'Ceph disk in creation'},
-    '89C57F98-2FE5-4DC0-89C1-5EC00CEFF2BE': {'OS': 'Ceph', 'Description': 'Ceph dm-crypt disk in creation'},
-    '824CC7A0-36A8-11E3-890A-952519AD3F61': {'OS': 'OpenBSD', 'Description': 'Data partition'},
-    'CEF5A9AD-73BC-4601-89F3-CDEEEEE321A1': {'OS': 'QNX', 'Description': 'Power-safe (QNX6) file system'},
-    'C91818F9-8025-47AF-89D2-F030D7000C2C': {'OS': 'Plan 9', 'Description': 'Plan 9 partition'},
-    '9D275380-40AD-11DB-BF97-000C2911D1B8': {'OS': 'VMware ESX', 'Description': 'vmkcore (coredump partition)'},
-    'AA31E02A-400F-11DB-9590-000C2911D1B8': {'OS': 'VMware ESX', 'Description': 'VMFS filesystem partition'},
-    '9198EFFC-31C0-11DB-8F78-000C2911D1B8': {'OS': 'VMware ESX', 'Description': 'VMware Reserved'},
-    '2568845D-2332-4675-BC39-8FA5A4748D15': {'OS': 'Android-IA', 'Description': 'Bootloader'},
-    '114EAFFE-1552-4022-B26E-9B053604CF84': {'OS': 'Android-IA', 'Description': 'Bootloader2'},
-    '49A4D17F-93A3-45C1-A0DE-F50B2EBE2599': {'OS': 'Android-IA', 'Description': 'Boot'},
-    '4177C722-9E92-4AAB-8644-43502BFD5506': {'OS': 'Android-IA', 'Description': 'Recovery'},
-    'EF32A33B-A409-486C-9141-9FFB711F6266': {'OS': 'Android-IA', 'Description': 'Misc'},
-    '20AC26BE-20B7-11E3-84C5-6CFDB94711E9': {'OS': 'Android-IA', 'Description': 'Metadata'},
-    '38F428E6-D326-425D-9140-6E0EA133647C': {'OS': 'Android-IA', 'Description': 'System'},
-    'A893EF21-E428-470A-9E55-0668FD91A2D9': {'OS': 'Android-IA', 'Description': 'Cache'},
-    'DC76DDA9-5AC1-491C-AF42-A82591580C0D': {'OS': 'Android-IA', 'Description': 'Data'},
-    'EBC597D0-2053-4B15-8B64-E0AAC75F4DB1': {'OS': 'Android-IA', 'Description': 'Persistent'},
-    '8F68CC74-C5E5-48DA-BE91-A0C8C15E9C80': {'OS': 'Android-IA', 'Description': 'Factory'},
-    '767941D0-2085-11E3-AD3B-6CFDB94711E9': {'OS': 'Android-IA', 'Description': 'Fastboot / Tertiary'},
-    'AC6D7924-EB71-4DF8-B48D-E267B27148FF': {'OS': 'Android-IA', 'Description': 'OEM'},
-    '7412F7D5-A156-4B13-81DC-867174929325': {'OS': 'ONIE', 'Description': 'Boot'},
-    'D4E6E2CD-4469-46F3-B5CB-1BFF57AFC149': {'OS': 'ONIE', 'Description': 'Config'},
-    '9E1A2D38-C612-4316-AA26-8B49521E5A8B': {'OS': 'PowerPC', 'Description': 'PReP boot'},
-    'BC13C2FF-59E6-4262-A352-B275FD6F7172': {'OS': 'Freedesktop', 'Description': 'Extended Boot Partition ($BOOT)'},
-}
-
-def lookup_guid(guid):
-    return PARTITION_UIDS.get(guid.upper(), {})
-
-if __name__ == '__main__':
-    print("This file is not meant to be called directly.")

.bin/Scripts/functions/product_keys.py

@@ -2,110 +2,119 @@
 
 from functions.common import *
 
+
 # Regex
 REGEX_REGISTRY_DIRS = re.compile(
-    r'^(config$|RegBack$|System32$|Transfer|Win)',
-    re.IGNORECASE)
+  r'^(config$|RegBack$|System32$|Transfer|Win)',
+  re.IGNORECASE)
 REGEX_SOFTWARE_HIVE = re.compile(r'^Software$', re.IGNORECASE)
 
-def extract_keys():
-    """Extract keys from provided hives and return a dict."""
-    keys = {}
 
-    # Extract keys
-    extract_item('ProduKey', silent=True)
-    for hive in find_software_hives():
-        cmd = [
-            global_vars['Tools']['ProduKey'],
-            '/IEKeys', '0',
-            '/WindowsKeys', '1',
-            '/OfficeKeys', '1',
-            '/ExtractEdition', '1',
-            '/nosavereg',
-            '/regfile', hive,
-            '/scomma', '']
-        try:
-            out = run_program(cmd)
-        except subprocess.CalledProcessError:
-            # Ignore and return empty dict
-            pass
-        else:
-            for line in out.stdout.decode().splitlines():
-                # Add key to keys under product only if unique
-                tmp = line.split(',')
-                product = tmp[0]
-                key = tmp[2]
-                if product not in keys:
-                    keys[product] = []
-                if key not in keys[product]:
-                    keys[product].append(key)
-    
-    # Done
-    return keys
+def extract_keys():
+  """Extract keys from provided hives and return a dict."""
+  keys = {}
+
+  # Extract keys
+  extract_item('ProduKey', silent=True)
+  for hive in find_software_hives():
+    cmd = [
+      global_vars['Tools']['ProduKey'],
+      '/IEKeys', '0',
+      '/WindowsKeys', '1',
+      '/OfficeKeys', '1',
+      '/ExtractEdition', '1',
+      '/nosavereg',
+      '/regfile', hive,
+      '/scomma', '']
+    try:
+      out = run_program(cmd)
+    except subprocess.CalledProcessError:
+      # Ignore and return empty dict
+      pass
+    else:
+      for line in out.stdout.decode().splitlines():
+        # Add key to keys under product only if unique
+        tmp = line.split(',')
+        product = tmp[0]
+        key = tmp[2]
+        if product not in keys:
+          keys[product] = []
+        if key not in keys[product]:
+          keys[product].append(key)
+
+  # Done
+  return keys
+
 
 def list_clientdir_keys():
-    """List product keys found in hives inside the ClientDir."""
-    keys = extract_keys()
-    key_list = []
-    if keys:
-        for product in sorted(keys):
-            key_list.append(product)
-            for key in sorted(keys[product]):
-                key_list.append('    {key}'.format(key=key))
-    else:
-        key_list.append('No keys found.')
+  """List product keys found in hives inside the ClientDir."""
+  keys = extract_keys()
+  key_list = []
+  if keys:
+    for product in sorted(keys):
+      key_list.append(product)
+      for key in sorted(keys[product]):
+        key_list.append('  {key}'.format(key=key))
+  else:
+    key_list.append('No keys found.')
+
+  return key_list
 
-    return key_list
 
 def find_software_hives():
-    """Search for transferred SW hives and return a list."""
-    hives = []
-    search_paths = [global_vars['ClientDir']]
+  """Search for transferred SW hives and return a list."""
+  hives = []
+  search_paths = [global_vars['ClientDir']]
 
-    while len(search_paths) > 0:
-        for item in os.scandir(search_paths.pop(0)):
-            if item.is_dir() and REGEX_REGISTRY_DIRS.search(item.name):
-                search_paths.append(item.path)
-            if item.is_file() and REGEX_SOFTWARE_HIVE.search(item.name):
-                hives.append(item.path)
+  while len(search_paths) > 0:
+    for item in os.scandir(search_paths.pop(0)):
+      if item.is_dir() and REGEX_REGISTRY_DIRS.search(item.name):
+        search_paths.append(item.path)
+      if item.is_file() and REGEX_SOFTWARE_HIVE.search(item.name):
+        hives.append(item.path)
+
+  return hives
 
-    return hives
 
 def get_product_keys():
-    """List product keys from saved report."""
-    keys = []
-    log_file = r'{LogDir}\Product Keys (ProduKey).txt'.format(**global_vars)
-    with open (log_file, 'r') as f:
-        for line in f.readlines():
-            if re.search(r'^Product Name', line):
-                line = re.sub(r'^Product Name\s+:\s+(.*)', r'\1', line.strip())
-                keys.append(line)
+  """List product keys from saved report."""
+  keys = []
+  log_file = r'{LogDir}\Product Keys (ProduKey).txt'.format(**global_vars)
+  with open (log_file, 'r') as f:
+    for line in f.readlines():
+      if re.search(r'^Product Name', line):
+        line = re.sub(r'^Product Name\s+:\s+(.*)', r'\1', line.strip())
+        keys.append(line)
+
+  if keys:
+    return keys
+  else:
+    return ['No product keys found']
 
-    if keys:
-        return keys
-    else:
-        return ['No product keys found']
 
 def run_produkey():
-    """Run ProduKey and save report in the ClientDir."""
-    extract_item('ProduKey', silent=True)
-    log_file = r'{LogDir}\Product Keys (ProduKey).txt'.format(**global_vars)
-    if not os.path.exists(log_file):
-        # Clear current configuration
-        for config in ['ProduKey.cfg', 'ProduKey64.cfg']:
-            config = r'{BinDir}\ProduKey\{config}'.format(
-                config=config, **global_vars)
-            try:
-                if os.path.exists(config):
-                    os.remove(config)
-            except Exception:
-                pass
-        cmd = [
-            global_vars['Tools']['ProduKey'],
-            '/nosavereg',
-            '/stext',
-            log_file]
-        run_program(cmd, check=False)
+  """Run ProduKey and save report in the ClientDir."""
+  extract_item('ProduKey', silent=True)
+  log_file = r'{LogDir}\Product Keys (ProduKey).txt'.format(**global_vars)
+  if not os.path.exists(log_file):
+    # Clear current configuration
+    for config in ['ProduKey.cfg', 'ProduKey64.cfg']:
+      config = r'{BinDir}\ProduKey\{config}'.format(
+        config=config, **global_vars)
+      try:
+        if os.path.exists(config):
+          os.remove(config)
+      except Exception:
+        pass
+    cmd = [
+      global_vars['Tools']['ProduKey'],
+      '/nosavereg',
+      '/stext',
+      log_file]
+    run_program(cmd, check=False)
+
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/repairs.py

@@ -2,125 +2,135 @@
 
 from functions.common import *
 
+
 def run_chkdsk(repair=False):
-    """Run CHKDSK scan or schedule offline repairs."""
-    if repair:
-        run_chkdsk_offline()
-    else:
-        run_chkdsk_scan()
+  """Run CHKDSK scan or schedule offline repairs."""
+  if repair:
+    run_chkdsk_offline()
+  else:
+    run_chkdsk_scan()
+
 
 def run_chkdsk_scan():
-    """Run CHKDSK in a "split window" and report errors."""
-    if global_vars['OS']['Version'] in ['8', '10']:
-        cmd = ['chkdsk', global_vars['Env']['SYSTEMDRIVE'], '/scan', '/perf']
-    else:
-        cmd = ['chkdsk', global_vars['Env']['SYSTEMDRIVE']]
-    out = run_program(cmd, check=False)
-    # retcode == 0: no issues
-    # retcode == 1: fixed issues (also happens when chkdsk.exe is killed?)
-    # retcode == 2: issues
-    if int(out.returncode) > 0:
-        # print_error('  ERROR: CHKDSK encountered errors')
-        raise GenericError
+  """Run CHKDSK in a "split window" and report errors."""
+  if global_vars['OS']['Version'] in ('8', '8.1', '10'):
+    cmd = ['chkdsk', global_vars['Env']['SYSTEMDRIVE'], '/scan', '/perf']
+  else:
+    cmd = ['chkdsk', global_vars['Env']['SYSTEMDRIVE']]
+  out = run_program(cmd, check=False)
+  # retcode == 0: no issues
+  # retcode == 1: fixed issues (also happens when chkdsk.exe is killed?)
+  # retcode == 2: issues
+  if int(out.returncode) > 0:
+    # print_error('  ERROR: CHKDSK encountered errors')
+    raise GenericError
+
+  # Save stderr
+  with open(r'{LogDir}\Tools\CHKDSK.err'.format(**global_vars), 'a') as f:
+    for line in out.stderr.decode().splitlines():
+      f.write(line.strip() + '\n')
+  # Save stdout
+  with open(r'{LogDir}\Tools\CHKDSK.log'.format(**global_vars), 'a') as f:
+    for line in out.stdout.decode().splitlines():
+      f.write(line.strip() + '\n')
 
-    # Save stderr
-    with open(r'{LogDir}\CHKDSK.err'.format(**global_vars), 'a') as f:
-        for line in out.stderr.decode().splitlines():
-            f.write(line.strip() + '\n')
-    # Save stdout
-    with open(r'{LogDir}\CHKDSK.log'.format(**global_vars), 'a') as f:
-        for line in out.stdout.decode().splitlines():
-            f.write(line.strip() + '\n')
 
 def run_chkdsk_offline():
-    """Set filesystem 'dirty bit' to force a chkdsk during next boot."""
-    cmd = [
-        'fsutil', 'dirty',
-        'set',
-        global_vars['Env']['SYSTEMDRIVE']]
-    out = run_program(cmd, check=False)
-    if int(out.returncode) > 0:
-        raise GenericError
+  """Set filesystem 'dirty bit' to force a chkdsk during next boot."""
+  cmd = [
+    'fsutil', 'dirty',
+    'set',
+    global_vars['Env']['SYSTEMDRIVE']]
+  out = run_program(cmd, check=False)
+  if int(out.returncode) > 0:
+    raise GenericError
+
 
 def run_dism(repair=False):
-    """Run DISM /RestoreHealth, then /CheckHealth, and then report errors."""
-    if global_vars['OS']['Version'] in ['8', '10']:
-        if repair:
-            # Restore Health
-            cmd = [
-                'DISM', '/Online',
-                '/Cleanup-Image', '/RestoreHealth',
-                r'/LogPath:"{LogDir}\DISM_RestoreHealth.log"'.format(
-                    **global_vars),
-                '-new_console:n', '-new_console:s33V']
-        else:
-            # Scan Health
-            cmd = [
-                'DISM', '/Online',
-                '/Cleanup-Image', '/ScanHealth',
-                r'/LogPath:"{LogDir}\DISM_ScanHealth.log"'.format(
-                    **global_vars),
-                '-new_console:n', '-new_console:s33V']
-        run_program(cmd, pipe=False, check=False, shell=True)
-        wait_for_process('dism')
-        # Now check health
-        cmd = [
-            'DISM', '/Online',
-            '/Cleanup-Image', '/CheckHealth',
-            r'/LogPath:"{LogDir}\DISM_CheckHealth.log"'.format(**global_vars)]
-        result = run_program(cmd, shell=True).stdout.decode()
-        # Check result
-        if 'no component store corruption detected' not in result.lower():
-            raise GenericError
+  """Run DISM to either scan or repair component store health."""
+  if global_vars['OS']['Version'] in ('8', '8.1', '10'):
+    if repair:
+      # Restore Health
+      cmd = [
+        'DISM', '/Online',
+        '/Cleanup-Image', '/RestoreHealth',
+        r'/LogPath:"{LogDir}\Tools\DISM_RestoreHealth.log"'.format(
+          **global_vars),
+        '-new_console:n', '-new_console:s33V']
     else:
-        raise UnsupportedOSError
+      # Scan Health
+      cmd = [
+        'DISM', '/Online',
+        '/Cleanup-Image', '/ScanHealth',
+        r'/LogPath:"{LogDir}\Tools\DISM_ScanHealth.log"'.format(
+          **global_vars),
+        '-new_console:n', '-new_console:s33V']
+    run_program(cmd, pipe=False, check=False, shell=True)
+    wait_for_process('dism')
+    # Now check health
+    cmd = [
+      'DISM', '/Online',
+      '/Cleanup-Image', '/CheckHealth',
+      r'/LogPath:"{LogDir}\Tools\DISM_CheckHealth.log"'.format(**global_vars)]
+    result = run_program(cmd, shell=True).stdout.decode()
+    # Check result
+    if 'no component store corruption detected' not in result.lower():
+      raise GenericError
+  else:
+    raise UnsupportedOSError
+
 
 def run_kvrt():
-    """Run KVRT."""
-    extract_item('KVRT', silent=True)
-    os.makedirs(global_vars['QuarantineDir'], exist_ok=True)
-    cmd = [
-        global_vars['Tools']['KVRT'],
-        '-accepteula', '-dontcryptsupportinfo', '-fixednames',
-        '-d', global_vars['QuarantineDir'],
-        '-processlevel', '3']
-    popen_program(cmd, pipe=False)
+  """Run KVRT."""
+  extract_item('KVRT', silent=True)
+  os.makedirs(global_vars['QuarantineDir'], exist_ok=True)
+  cmd = [
+    global_vars['Tools']['KVRT'],
+    '-accepteula', '-dontcryptsupportinfo', '-fixednames',
+    '-d', global_vars['QuarantineDir'],
+    '-processlevel', '3']
+  popen_program(cmd, pipe=False)
+
 
 def run_sfc_scan():
-    """Run SFC in a "split window" and report errors."""
-    cmd = [
-        r'{SYSTEMROOT}\System32\sfc.exe'.format(**global_vars['Env']),
-        '/scannow']
-    out = run_program(cmd, check=False)
-    # Save stderr
-    with open(r'{LogDir}\SFC.err'.format(**global_vars), 'a') as f:
-        for line in out.stderr.decode('utf-8', 'ignore').splitlines():
-            f.write(line.strip() + '\n')
-    # Save stdout
-    with open(r'{LogDir}\SFC.log'.format(**global_vars), 'a') as f:
-        for line in out.stdout.decode('utf-8', 'ignore').splitlines():
-            f.write(line.strip() + '\n')
-    # Check result
-    log_text = out.stdout.decode('utf-8', 'ignore').replace('\0', '')
-    if re.findall(r'did\s+not\s+find\s+any\s+integrity\s+violations', log_text):
-        pass
-    elif re.findall(r'successfully\s+repaired\s+them', log_text):
-        raise GenericRepair
-    else:
-        raise GenericError
+  """Run SFC in a "split window" and report errors."""
+  cmd = [
+    r'{SYSTEMROOT}\System32\sfc.exe'.format(**global_vars['Env']),
+    '/scannow']
+  out = run_program(cmd, check=False)
+  # Save stderr
+  with open(r'{LogDir}\Tools\SFC.err'.format(**global_vars), 'a') as f:
+    for line in out.stderr.decode('utf-8', 'ignore').splitlines():
+      f.write(line.strip() + '\n')
+  # Save stdout
+  with open(r'{LogDir}\Tools\SFC.log'.format(**global_vars), 'a') as f:
+    for line in out.stdout.decode('utf-8', 'ignore').splitlines():
+      f.write(line.strip() + '\n')
+  # Check result
+  log_text = out.stdout.decode('utf-8', 'ignore').replace('\0', '')
+  if re.findall(r'did\s+not\s+find\s+any\s+integrity\s+violations', log_text):
+    pass
+  elif re.findall(r'successfully\s+repaired\s+them', log_text):
+    raise GenericRepair
+  else:
+    raise GenericError
+
 
 def run_tdsskiller():
-    """Run TDSSKiller."""
-    extract_item('TDSSKiller', silent=True)
-    os.makedirs(r'{QuarantineDir}\TDSSKiller'.format(
-        **global_vars), exist_ok=True)
-    cmd = [
-        global_vars['Tools']['TDSSKiller'],
-        '-l', r'{LogDir}\TDSSKiller.log'.format(**global_vars),
-        '-qpath', r'{QuarantineDir}\TDSSKiller'.format(**global_vars),
-        '-accepteula', '-accepteulaksn',
-        '-dcexact', '-tdlfs']
-    run_program(cmd, pipe=False)
+  """Run TDSSKiller."""
+  extract_item('TDSSKiller', silent=True)
+  os.makedirs(r'{QuarantineDir}\TDSSKiller'.format(
+    **global_vars), exist_ok=True)
+  cmd = [
+    global_vars['Tools']['TDSSKiller'],
+    '-l', r'{LogDir}\Tools\TDSSKiller.log'.format(**global_vars),
+    '-qpath', r'{QuarantineDir}\TDSSKiller'.format(**global_vars),
+    '-accepteula', '-accepteulaksn',
+    '-dcexact', '-tdlfs']
+  run_program(cmd, pipe=False)
+
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/safemode.py

@@ -0,0 +1,45 @@
+# Wizard Kit: Functions - SafeMode
+
+from functions.common import *
+
+
+# STATIC VARIABLES
+REG_MSISERVER = r'HKLM\SYSTEM\CurrentControlSet\Control\SafeBoot\Network\MSIServer'
+
+
+def disable_safemode_msi():
+  """Disable MSI access under safemode."""
+  cmd = ['reg', 'delete', REG_MSISERVER, '/f']
+  run_program(cmd)
+
+
+def disable_safemode():
+  """Edit BCD to remove safeboot value."""
+  cmd = ['bcdedit', '/deletevalue', '{default}', 'safeboot']
+  run_program(cmd)
+
+
+def enable_safemode_msi():
+  """Enable MSI access under safemode."""
+  cmd = ['reg', 'add', REG_MSISERVER, '/f']
+  run_program(cmd)
+  cmd = ['reg', 'add', REG_MSISERVER, '/ve',
+      '/t', 'REG_SZ', '/d', 'Service', '/f']
+  run_program(cmd)
+
+
+def enable_safemode():
+  """Edit BCD to set safeboot as default."""
+  cmd = ['bcdedit', '/set', '{default}', 'safeboot', 'network']
+  run_program(cmd)
+
+
+def reboot(delay=3):
+  cmd = ['shutdown', '-r', '-t', '{}'.format(delay)]
+  run_program(cmd, check=False)
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/sensors.py

@@ -0,0 +1,243 @@
+'''Wizard Kit: Functions - Sensors'''
+# pylint: disable=no-name-in-module,wildcard-import
+# vim: sts=2 sw=2 ts=2
+
+import json
+import re
+
+from functions.tmux import *
+from settings.sensors import *
+
+
+# Error Classes
+class ThermalLimitReachedError(Exception):
+  '''Thermal limit reached error.'''
+
+
+def clear_temps(sensor_data):
+  """Clear saved temps but keep structure, returns dict."""
+  for _section, _adapters in sensor_data.items():
+    for _adapter, _sources in _adapters.items():
+      for _source, _data in _sources.items():
+        _data['Temps'] = []
+
+
+def fix_sensor_str(_s):
+  """Cleanup string and return str."""
+  _s = re.sub(r'^(\w+)-(\w+)-(\w+)', r'\1 (\2 \3)', _s, re.IGNORECASE)
+  _s = _s.title()
+  _s = _s.replace('Coretemp', 'CPUTemp')
+  _s = _s.replace('Acpi', 'ACPI')
+  _s = _s.replace('ACPItz', 'ACPI TZ')
+  _s = _s.replace('Isa ', 'ISA ')
+  _s = _s.replace('Pci ', 'PCI ')
+  _s = _s.replace('Id ', 'ID ')
+  _s = re.sub(r'(\D+)(\d+)', r'\1 \2', _s, re.IGNORECASE)
+  _s = re.sub(r'^K (\d+)Temp', r'AMD K\1 Temps', _s, re.IGNORECASE)
+  _s = re.sub(r'T(ctl|die)', r'CPU (T\1)', _s, re.IGNORECASE)
+  return _s
+
+
+def generate_sensor_report(
+    sensor_data, *temp_labels,
+    colors=True, cpu_only=False):
+  """Generate report based on temp_labels, returns list if str."""
+  report = []
+  for _section, _adapters in sorted(sensor_data.items()):
+    # CPU temps then Other temps
+    if cpu_only and 'CPU' not in _section:
+      continue
+    for _adapter, _sources in sorted(_adapters.items()):
+      # Adapter
+      report.append(fix_sensor_str(_adapter))
+      for _source, _data in sorted(_sources.items()):
+        # Source
+        _line = '{:18}  '.format(fix_sensor_str(_source))
+        # Temps (skip label for Current)
+        for _label in temp_labels:
+          _line += '{}{}{} '.format(
+            _label.lower() if _label != 'Current' else '',
+            ': ' if _label != 'Current' else '',
+            get_temp_str(_data.get(_label, '???'), colors=colors))
+        report.append(_line)
+      if not cpu_only:
+        report.append(' ')
+
+  # Handle empty reports (i.e. no sensors detected)
+  if not report:
+    report = [
+      '{}WARNING: No sensors found{}'.format(
+        COLORS['YELLOW'] if colors else '',
+        COLORS['CLEAR'] if colors else ''),
+      ' ',
+      'Please monitor temps manually']
+
+  # Done
+  return report
+
+
+def get_colored_temp_str(temp):
+  """Get colored string based on temp, returns str."""
+  try:
+    temp = float(temp)
+  except ValueError:
+    return '{YELLOW}{temp}{CLEAR}'.format(temp=temp, **COLORS)
+  if temp > TEMP_LIMITS['RED']:
+    color = COLORS['RED']
+  elif temp > TEMP_LIMITS['ORANGE']:
+    color = COLORS['ORANGE']
+  elif temp > TEMP_LIMITS['YELLOW']:
+    color = COLORS['YELLOW']
+  elif temp > TEMP_LIMITS['GREEN']:
+    color = COLORS['GREEN']
+  elif temp > 0:
+    color = COLORS['BLUE']
+  else:
+    color = COLORS['CLEAR']
+  return '{color}{prefix}{temp:2.0f}°C{CLEAR}'.format(
+    color=color,
+    prefix='-' if temp < 0 else '',
+    temp=temp,
+    **COLORS)
+
+
+def get_raw_sensor_data():
+  """Read sensor data and return dict."""
+  json_data = {}
+  cmd = ['sensors', '-j']
+
+  # Get raw data
+  try:
+    result = run_program(cmd)
+    result = result.stdout.decode('utf-8', errors='ignore').splitlines()
+  except subprocess.CalledProcessError:
+    # Assuming no sensors available, set to empty list
+    result = []
+
+  # Workaround for bad sensors
+  raw_data = []
+  for line in result:
+    if line.strip() == ',':
+      # Assuming malformatted line caused by missing data
+      continue
+    raw_data.append(line)
+
+  # Parse JSON data
+  try:
+    json_data = json.loads('\n'.join(raw_data))
+  except json.JSONDecodeError:
+    # Still broken, just return the empty dict
+    pass
+
+  # Done
+  return json_data
+
+
+def get_sensor_data():
+  """Parse raw sensor data and return new dict."""
+  json_data = get_raw_sensor_data()
+  sensor_data = {'CPUTemps': {}, 'Other': {}}
+  for _adapter, _sources in json_data.items():
+    if is_cpu_adapter(_adapter):
+      _section = 'CPUTemps'
+    else:
+      _section = 'Other'
+    sensor_data[_section][_adapter] = {}
+    _sources.pop('Adapter', None)
+
+    # Find current temp and add to dict
+    ## current temp is labeled xxxx_input
+    for _source, _labels in _sources.items():
+      for _label, _temp in _labels.items():
+        if _label.startswith('fan'):
+          # Skip fan RPMs
+          continue
+        if 'input' in _label:
+          sensor_data[_section][_adapter][_source] = {
+            'Current': _temp,
+            'Label': _label,
+            'Max': _temp,
+            'Temps': [_temp],
+            }
+
+  # Remove empty sections
+  for _k, _v in sensor_data.items():
+    _v = {_k2: _v2 for _k2, _v2 in _v.items() if _v2}
+
+  # Done
+  return sensor_data
+
+
+def get_temp_str(temp, colors=True):
+  """Get temp string, returns str."""
+  if colors:
+    return get_colored_temp_str(temp)
+  try:
+    temp = float(temp)
+  except ValueError:
+    return '{}'.format(temp)
+  else:
+    return '{}{:2.0f}°C'.format(
+      '-' if temp < 0 else '',
+      temp)
+
+
+def is_cpu_adapter(adapter):
+  """Checks if adapter is a known CPU adapter, returns bool."""
+  is_cpu = re.search(r'(core|k\d+)temp', adapter, re.IGNORECASE)
+  return bool(is_cpu)
+
+
+def monitor_sensors(monitor_pane, monitor_file):
+  """Continually update sensor data and report to screen."""
+  sensor_data = get_sensor_data()
+  while True:
+    update_sensor_data(sensor_data)
+    with open(monitor_file, 'w') as _f:
+      report = generate_sensor_report(sensor_data, 'Current', 'Max')
+      _f.write('\n'.join(report))
+    sleep(1)
+    if monitor_pane and not tmux_poll_pane(monitor_pane):
+      break
+
+
+def save_average_temp(sensor_data, temp_label, seconds=10):
+  """Save average temps under temp_label, returns dict."""
+  clear_temps(sensor_data)
+
+  # Get temps
+  for _i in range(seconds): # pylint: disable=unused-variable
+    update_sensor_data(sensor_data)
+    sleep(1)
+
+  # Calculate averages
+  for _section, _adapters in sensor_data.items():
+    for _adapter, _sources in _adapters.items():
+      for _source, _data in _sources.items():
+        _data[temp_label] = sum(_data['Temps']) / len(_data['Temps'])
+
+
+def update_sensor_data(sensor_data, thermal_limit=None):
+  """Read sensors and update existing sensor_data, returns dict."""
+  json_data = get_raw_sensor_data()
+  for _section, _adapters in sensor_data.items():
+    for _adapter, _sources in _adapters.items():
+      for _source, _data in _sources.items():
+        try:
+          _label = _data['Label']
+          _temp = json_data[_adapter][_source][_label]
+          _data['Current'] = _temp
+          _data['Max'] = max(_temp, _data['Max'])
+          _data['Temps'].append(_temp)
+        except Exception: # pylint: disable=broad-except
+          # Dumb workound for Dell sensors with changing source names
+          pass
+
+        # Check if thermal limit reached
+        if thermal_limit and _section == 'CPUTemps':
+          if max(_data['Current'], _data['Max']) >= thermal_limit:
+            raise ThermalLimitReachedError('CPU temps reached limit')
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")

.bin/Scripts/functions/setup.py

@@ -1,272 +1,359 @@
 # Wizard Kit: Functions - Setup
 
-from functions.common import *
+from functions.browsers import *
+from functions.json import *
+from functions.update import *
+from settings.setup import *
+from settings.sources import *
 
-# STATIC VARIABLES
-HKCU = winreg.HKEY_CURRENT_USER
-HKLM = winreg.HKEY_LOCAL_MACHINE
-SETTINGS_CLASSIC_START = {
-    r'Software\IvoSoft\ClassicShell\Settings': {},
-    r'Software\IvoSoft\ClassicStartMenu': {
-        'DWORD Items': {'ShowedStyle2': 1},
-        },
-    r'Software\IvoSoft\ClassicStartMenu\MRU': {},
-    r'Software\IvoSoft\ClassicStartMenu\Settings': {
-        'DWORD Items': {'SkipMetro': 1},
-        'SZ Items': {
-            'MenuStyle': 'Win7',
-            'RecentPrograms': 'Recent',
-            },
-        },
-    }
-SETTINGS_EXPLORER_SYSTEM = {
-    # Disable Telemetry
-    r'SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
-        'DWORD Items': {'AllowTelemetry': 0},
-        },
-    r'SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
-        'DWORD Items': {'AllowTelemetry': 0},
-        'WOW64_32': True,
-        },
-    r'SOFTWARE\Policies\Microsoft\Windows\DataCollection': {
-        'DWORD Items': {'AllowTelemetry': 0},
-        },
-    # Disable Wi-Fi Sense
-    r'Software\Microsoft\PolicyManager\default\WiFi\AllowWiFiHotSpotReporting': {
-        'DWORD Items': {'Value': 0},
-        },
-    r'Software\Microsoft\PolicyManager\default\WiFi\AllowAutoConnectToWiFiSenseHotspots': {
-        'DWORD Items': {'Value': 0},
-        },
-    # Disable Location Tracking
-    r'SOFTWARE\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': {
-        'DWORD Items': {'SensorPermissionState': 0},
-        },
-    r'System\CurrentControlSet\Services\lfsvc\Service\Configuration': {
-        'Status': {'Value': 0},
-        },
-    }
-SETTINGS_EXPLORER_USER = {
-    # Disable Cortana
-    r'Software\Microsoft\Personalization\Settings': {
-        'DWORD Items': {'AcceptedPrivacyPolicy': 0},
-        },
-    r'Software\Microsoft\InputPersonalization': {
-        'DWORD Items': {
-            'RestrictImplicitTextCollection': 1,
-            'RestrictImplicitInkCollection': 1
-            },
-        },
-    r'Software\Microsoft\InputPersonalization\TrainedDataStore': {
-        'DWORD Items': {'HarvestContacts': 1},
-        },
-    # Hide Search button / box
-    r'Software\Microsoft\Windows\CurrentVersion\Search': {
-        'DWORD Items': {'SearchboxTaskbarMode': 0},
-        },
-    # Change default Explorer view to "Computer"
-    r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced': {
-        'DWORD Items': {'LaunchTo': 1},
-        },
-    }
-SETTINGS_GOOGLE_CHROME = {
-    r'Software\Google\Chrome\Extensions': {
-        'WOW64_32': True,
-        },
-    r'Software\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm': {
-        'SZ Items': {
-            'update_url': 'https://clients2.google.com/service/update2/crx'},
-        'WOW64_32': True,
-        },
-    r'Software\Google\Chrome\Extensions\pgdnlhfefecpicbbihgmbmffkjpaplco': {
-        'SZ Items': {
-            'update_url': 'https://clients2.google.com/service/update2/crx'},
-        'WOW64_32': True,
-        },
-    }
-VCR_REDISTS = [
-    {'Name': 'Visual C++ 2008 SP1 x32...',
-        'Cmd': [r'2008sp1\x32\vcredist.exe', '/qb! /norestart']},
-    {'Name': 'Visual C++ 2008 SP1 x64...',
-        'Cmd': [r'2008sp1\x64\vcredist.exe', '/qb! /norestart']},
-    {'Name': 'Visual C++ 2010 x32...',
-        'Cmd': [r'2010sp1\x32\vcredist.exe', '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2010 x64...',
-        'Cmd': [r'2010sp1\x64\vcredist.exe', '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2012 Update 4 x32...',
-        'Cmd': [r'2012u4\x32\vcredist.exe', '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2012 Update 4 x64...',
-        'Cmd': [r'2012u4\x64\vcredist.exe', '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2013 x32...',
-        'Cmd': [r'2013\x32\vcredist.exe', '/install',
-            '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2013 x64...',
-        'Cmd': [r'2013\x64\vcredist.exe', '/install',
-            '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2017 x32...',
-        'Cmd': [r'2017\x32\vcredist.exe', '/install',
-            '/passive', '/norestart']},
-    {'Name': 'Visual C++ 2017 x64...',
-        'Cmd': [r'2017\x64\vcredist.exe', '/install',
-            '/passive', '/norestart']},
-    ]
 
+# Configuration
 def config_classicstart():
-    """Configure ClassicStart."""
-    # User level, not system level
-    cs_exe = r'{PROGRAMFILES}\Classic Shell\ClassicStartMenu.exe'.format(
-        **global_vars['Env'])
-    skin = r'{PROGRAMFILES}\Classic Shell\Skins\Metro-Win10-Black.skin7'.format(
-        **global_vars['Env'])
-    extract_item('ClassicStartSkin', silent=True)
+  """Configure ClassicStart."""
+  # User level, not system level
+  cs_exe = r'{PROGRAMFILES}\Classic Shell\ClassicStartMenu.exe'.format(
+    **global_vars['Env'])
+  skin = r'{PROGRAMFILES}\Classic Shell\Skins\Metro-Win10-Black.skin7'.format(
+    **global_vars['Env'])
+  extract_item('ClassicStartSkin', silent=True)
 
-    # Stop Classic Start
-    run_program([cs_exe, '-exit'], check=False)
-    sleep(1)
-    kill_process('ClassicStartMenu.exe')
+  # Stop Classic Start
+  run_program([cs_exe, '-exit'], check=False)
+  sleep(1)
+  kill_process('ClassicStartMenu.exe')
 
-    # Configure
-    write_registry_settings(SETTINGS_CLASSIC_START, all_users=False)
-    if global_vars['OS']['Version'] == '10' and os.path.exists(skin):
-        # Enable Win10 theme if on Win10
-        key_path = r'Software\IvoSoft\ClassicStartMenu\Settings'
-        with winreg.OpenKey(HKCU, key_path, access=winreg.KEY_WRITE) as key:
-            winreg.SetValueEx(
-                key, 'SkinW7', 0, winreg.REG_SZ, 'Metro-Win10-Black')
-            winreg.SetValueEx(key, 'SkinVariationW7', 0, winreg.REG_SZ, '')
+  # Configure
+  write_registry_settings(SETTINGS_CLASSIC_START, all_users=False)
+  if global_vars['OS']['Version'] == '10' and os.path.exists(skin):
+    # Enable Win10 theme if on Win10
+    key_path = r'Software\IvoSoft\ClassicStartMenu\Settings'
+    with winreg.OpenKey(HKCU, key_path, access=winreg.KEY_WRITE) as key:
+      winreg.SetValueEx(
+        key, 'SkinW7', 0, winreg.REG_SZ, 'Metro-Win10-Black')
+      winreg.SetValueEx(key, 'SkinVariationW7', 0, winreg.REG_SZ, '')
 
-    # Pin Browser to Start Menu (Classic)
-    firefox = r'{PROGRAMDATA}\Start Menu\Programs\Mozilla Firefox.lnk'.format(
-        **global_vars['Env'])
-    chrome = r'{PROGRAMDATA}\Start Menu\Programs\Google Chrome.lnk'.format(
-        **global_vars['Env'])
-    dest_path = r'{APPDATA}\ClassicShell\Pinned'.format(**global_vars['Env'])
-    source = None
-    dest = None
-    if os.path.exists(firefox):
-        source = firefox
-        dest = r'{}\Mozilla Firefox.lnk'.format(dest_path)
-    elif os.path.exists(chrome):
-        source = chrome
-        dest = r'{}\Google Chrome.lnk'.format(dest_path)
-    if source:
-        try:
-            os.makedirs(dest_path, exist_ok=True)
-            shutil.copy(source, dest)
-        except Exception:
-            pass # Meh, it's fine without
+  # Pin Browser to Start Menu (Classic)
+  firefox = r'{PROGRAMDATA}\Start Menu\Programs\Mozilla Firefox.lnk'.format(
+    **global_vars['Env'])
+  chrome = r'{PROGRAMDATA}\Start Menu\Programs\Google Chrome.lnk'.format(
+    **global_vars['Env'])
+  dest_path = r'{APPDATA}\ClassicShell\Pinned'.format(**global_vars['Env'])
+  source = None
+  dest = None
+  if os.path.exists(firefox):
+    source = firefox
+    dest = r'{}\Mozilla Firefox.lnk'.format(dest_path)
+  elif os.path.exists(chrome):
+    source = chrome
+    dest = r'{}\Google Chrome.lnk'.format(dest_path)
+  if source:
+    try:
+      os.makedirs(dest_path, exist_ok=True)
+      shutil.copy(source, dest)
+    except Exception:
+      pass # Meh, it's fine without
 
-    # (Re)start Classic Start
-    run_program([cs_exe, '-exit'], check=False)
-    sleep(1)
-    kill_process('ClassicStartMenu.exe')
-    sleep(1)
-    popen_program(cs_exe)
+  # (Re)start Classic Start
+  run_program([cs_exe, '-exit'], check=False)
+  sleep(1)
+  kill_process('ClassicStartMenu.exe')
+  sleep(1)
+  popen_program(cs_exe)
 
-def write_registry_settings(settings, all_users=False):
-    """Write registry values from custom dict of dicts."""
-    hive = HKCU
-    if all_users:
-        hive = HKLM
-    for k, v in settings.items():
-        # CreateKey
-        access = winreg.KEY_WRITE
-        if 'WOW64_32' in v:
-            access = access | winreg.KEY_WOW64_32KEY
-        winreg.CreateKeyEx(hive, k, 0, access)
-        
-        # Create values
-        with winreg.OpenKeyEx(hive, k, 0, access) as key:
-            for name, value in v.get('DWORD Items', {}).items():
-                winreg.SetValueEx(key, name, 0, winreg.REG_DWORD, value)
-            for name, value in v.get('SZ Items', {}).items():
-                winreg.SetValueEx(key, name, 0, winreg.REG_SZ, value)
 
 def config_explorer_system():
-    """Configure Windows Explorer for all users via Registry settings."""
-    write_registry_settings(SETTINGS_EXPLORER_SYSTEM, all_users=True)
+  """Configure Windows Explorer for all users."""
+  write_registry_settings(SETTINGS_EXPLORER_SYSTEM, all_users=True)
+
+
+def config_explorer_user(setup_mode='All'):
+  """Configure Windows Explorer for current user per setup_mode."""
+  settings_explorer_user = {
+    k: v for k, v in SETTINGS_EXPLORER_USER.items()
+    if setup_mode not in v.get('Invalid modes', [])
+    }
+  write_registry_settings(settings_explorer_user, all_users=False)
+
+
+def config_windows_updates():
+  """Configure Windows updates."""
+  write_registry_settings(SETTINGS_WINDOWS_UPDATES, all_users=True)
 
-def config_explorer_user():
-    """Configure Windows Explorer for current user via Registry settings."""
-    write_registry_settings(SETTINGS_EXPLORER_USER, all_users=False)
 
 def update_clock():
-    """Set Timezone and sync clock."""
-    run_program(['tzutil' ,'/s', WINDOWS_TIME_ZONE], check=False)
-    run_program(['net', 'stop', 'w32ime'], check=False)
-    run_program(
-        ['w32tm', '/config', '/syncfromflags:manual',
-            '/manualpeerlist:"us.pool.ntp.org time.nist.gov time.windows.com"',
-            ],
-        check=False)
-    run_program(['net', 'start', 'w32ime'], check=False)
-    run_program(['w32tm', '/resync', '/nowait'], check=False)
+  """Set Timezone and sync clock."""
+  run_program(['tzutil', '/s', WINDOWS_TIME_ZONE], check=False)
+  run_program(['net', 'stop', 'w32ime'], check=False)
+  run_program(
+    ['w32tm', '/config', '/syncfromflags:manual',
+      '/manualpeerlist:"us.pool.ntp.org time.nist.gov time.windows.com"',
+      ],
+    check=False)
+  run_program(['net', 'start', 'w32ime'], check=False)
+  run_program(['w32tm', '/resync', '/nowait'], check=False)
+
+
+def write_registry_settings(settings, all_users=False):
+  """Write registry values from custom dict of dicts."""
+  hive = HKCU
+  if all_users:
+    hive = HKLM
+  for k, v in settings.items():
+    # CreateKey
+    access = winreg.KEY_WRITE
+    if 'WOW64_32' in v:
+      access = access | winreg.KEY_WOW64_32KEY
+    winreg.CreateKeyEx(hive, k, 0, access)
+
+    # Create values
+    with winreg.OpenKeyEx(hive, k, 0, access) as key:
+      for name, value in v.get('DWORD Items', {}).items():
+        winreg.SetValueEx(key, name, 0, winreg.REG_DWORD, value)
+      for name, value in v.get('SZ Items', {}).items():
+        winreg.SetValueEx(key, name, 0, winreg.REG_SZ, value)
+
 
 # Installations
+def find_current_software():
+  """Find currently installed software, returns list."""
+  ninite_extras_path = r'{BaseDir}\Installers\Extras'.format(**global_vars)
+  installers = []
+
+  # Browsers
+  scan_for_browsers(silent=True)
+  for browser in ('Google Chrome', 'Mozilla Firefox', 'Opera Chromium'):
+    if is_installed(browser):
+      installers.append(
+        r'{}\Web Browsers\{}.exe'.format(ninite_extras_path, browser))
+
+  # TODO: Add more sections
+
+  return installers
+
+def find_missing_software():
+  """Find missing software based on dirs/files present, returns list."""
+  ninite_extras_path = r'{BaseDir}\Installers\Extras'.format(**global_vars)
+  installers = []
+
+  # Browsers
+  scan_for_browsers(silent=True)
+  for browser in ('Google Chrome', 'Mozilla Firefox', 'Opera Chromium'):
+    if profile_present(browser):
+      installers.append(
+        r'{}\Web Browsers\{}.exe'.format(ninite_extras_path, browser))
+
+  # TODO: Add more sections
+
+  return installers
+
+
 def install_adobe_reader():
-    """Install Adobe Reader."""
-    cmd = [
-        r'{BaseDir}\Installers\Extras\Office\Adobe Reader DC.exe'.format(
-            **global_vars),
-        '/sAll',
-        '/msi', '/norestart', '/quiet',
-        'ALLUSERS=1',
-        'EULA_ACCEPT=YES']
-    try_and_print(message='Adobe Reader DC...', function=run_program, cmd=cmd)
+  """Install Adobe Reader."""
+  cmd = [
+    r'{BaseDir}\Installers\Extras\Office\Adobe Reader DC.exe'.format(
+      **global_vars),
+    '/sAll',
+    '/msi', '/norestart', '/quiet',
+    'ALLUSERS=1',
+    'EULA_ACCEPT=YES']
+  run_program(cmd)
+
 
 def install_chrome_extensions():
-    """Update registry to 'install' Google Chrome extensions for all users."""
-    write_registry_settings(SETTINGS_GOOGLE_CHROME, all_users=True)
+  """Install Google Chrome extensions for all users."""
+  write_registry_settings(SETTINGS_GOOGLE_CHROME, all_users=True)
+
 
 def install_classicstart_skin():
-    """Extract ClassicStart skin to installation folder."""
-    if global_vars['OS']['Version'] not in ['8', '10']:
-        raise UnsupportedOSError
-    extract_item('ClassicStartSkin', silent=True)
-    source = r'{BinDir}\ClassicStartSkin\Metro-Win10-Black.skin7'.format(
-        **global_vars)
-    dest_path = r'{PROGRAMFILES}\Classic Shell\Skins'.format(
-        **global_vars['Env'])
-    dest = r'{}\Metro-Win10-Black.skin7'.format(dest_path)
-    os.makedirs(dest_path, exist_ok=True)
-    shutil.copy(source, dest)
+  """Extract ClassicStart skin to installation folder."""
+  if global_vars['OS']['Version'] not in ('8', '8.1', '10'):
+    raise UnsupportedOSError
+  extract_item('ClassicStartSkin', silent=True)
+  source = r'{BinDir}\ClassicStartSkin\Metro-Win10-Black.skin7'.format(
+    **global_vars)
+  dest_path = r'{PROGRAMFILES}\Classic Shell\Skins'.format(
+    **global_vars['Env'])
+  dest = r'{}\Metro-Win10-Black.skin7'.format(dest_path)
+  os.makedirs(dest_path, exist_ok=True)
+  shutil.copy(source, dest)
+
 
 def install_firefox_extensions():
-    """Extract Firefox extensions to installation folder."""
-    dist_path = r'{PROGRAMFILES}\Mozilla Firefox\distribution\extensions'.format(
-        **global_vars['Env'])
-    # Extract extension(s) to distribution folder
-    cmd = [
-        global_vars['Tools']['SevenZip'], 'x', '-aos', '-bso0', '-bse0',
-        '-p{ArchivePassword}'.format(**global_vars),
-        '-o{dist_path}'.format(dist_path=dist_path),
-        r'{CBinDir}\FirefoxExtensions.7z'.format(**global_vars)]
-    run_program(cmd)
+  """Install Firefox extensions for all users."""
+  dist_path = r'{PROGRAMFILES}\Mozilla Firefox\distribution\extensions'.format(
+    **global_vars['Env'])
+  source_path = r'{CBinDir}\FirefoxExtensions.7z'.format(**global_vars)
+  if not os.path.exists(source_path):
+    raise FileNotFoundError
 
-def install_ninite_bundle(mse=False):
-    """Run Ninite file(s) based on OS version."""
-    if global_vars['OS']['Version'] in ['8', '10']:
-        # Modern selection
-        popen_program(r'{BaseDir}\Installers\Extras\Bundles\Modern.exe'.format(
-            **global_vars))
+  # Update registry
+  write_registry_settings(SETTINGS_MOZILLA_FIREFOX_32, all_users=True)
+  write_registry_settings(SETTINGS_MOZILLA_FIREFOX_64, all_users=True)
+
+  # Extract extension(s) to distribution folder
+  cmd = [
+    global_vars['Tools']['SevenZip'], 'e', '-aos', '-bso0', '-bse0',
+    '-p{ArchivePassword}'.format(**global_vars),
+    '-o{dist_path}'.format(dist_path=dist_path),
+    source_path]
+  run_program(cmd)
+
+
+def install_libreoffice(
+    quickstart=True, register_mso_types=True,
+    use_mso_formats=False, vcredist=False):
+  """Install LibreOffice using specified settings."""
+  cmd = [
+    'msiexec', '/passive', '/norestart',
+    '/i', r'{}\Installers\Extras\Office\LibreOffice.msi'.format(
+      global_vars['BaseDir']),
+    'REBOOTYESNO=No',
+    'ISCHECKFORPRODUCTUPDATES=0',
+    'QUICKSTART={}'.format(1 if quickstart else 0),
+    'UI_LANGS=en_US',
+    'VC_REDIST={}'.format(1 if vcredist else 0),
+    ]
+  if register_mso_types:
+    cmd.append('REGISTER_ALL_MSO_TYPES=1')
+  else:
+    cmd.append('REGISTER_NO_MSO_TYPES=1')
+  xcu_dir = r'{APPDATA}\LibreOffice\4\user'.format(**global_vars['Env'])
+  xcu_file = r'{}\registrymodifications.xcu'.format(xcu_dir)
+
+  # Set default save format
+  if use_mso_formats and not os.path.exists(xcu_file):
+    os.makedirs(xcu_dir, exist_ok=True)
+    with open(xcu_file, 'w', encoding='utf-8', newline='\n') as f:
+      f.write(LIBREOFFICE_XCU_DATA)
+
+  # Install LibreOffice
+  run_program(cmd, check=True)
+
+def install_ninite_bundle(
+    # pylint: disable=too-many-arguments,too-many-branches
+    base=True,
+    browsers_only=False,
+    libreoffice=False,
+    missing=False,
+    mse=False,
+    standard=True,
+    ):
+  """Run Ninite installer(s), returns list of Popen objects."""
+  popen_objects = []
+  if browsers_only:
+    # This option is deprecated
+    installer_path = r'{BaseDir}\Installers\Extras\Web Browsers'.format(
+      **global_vars)
+    scan_for_browsers(silent=True)
+    for browser in ('Google Chrome', 'Mozilla Firefox', 'Opera Chromium'):
+      if is_installed(browser):
+        cmd = r'{}\{}.exe'.format(installer_path, browser)
+        popen_objects.append(popen_program(cmd))
+
+    # Bail
+    return popen_objects
+
+  # Main selections
+  main_selections = []
+  if base:
+    main_selections.append('base')
+  if standard:
+    if global_vars['OS']['Version'] in ('8', '8.1', '10'):
+      main_selections.append('standard')
     else:
-        # Legacy selection
-        if mse:
-            cmd = r'{BaseDir}\Installers\Extras\Security'.format(**global_vars)
-            cmd += r'\Microsoft Security Essentials.exe'
-            popen_program(cmd)
-        popen_program(r'{BaseDir}\Installers\Extras\Bundles\Legacy.exe'.format(
-            **global_vars))
+      main_selections.append('standard7')
+  if main_selections:
+    # Only run if base and/or standard are enabled
+    cmd = r'{}\Installers\Extras\Bundles\{}.exe'.format(
+      global_vars['BaseDir'],
+      '-'.join(main_selections),
+      )
+    popen_objects.append(popen_program([cmd]))
+
+  # Extra selections
+  extra_selections = {}
+  for cmd in find_current_software():
+    extra_selections[cmd] = True
+  if missing:
+    for cmd in find_missing_software():
+      extra_selections[cmd] = True
+
+  # Remove overlapping selections
+  regex = []
+  for n_name, n_group in NINITE_REGEX.items():
+    if n_name in main_selections:
+      regex.extend(n_group)
+  regex = '({})'.format('|'.join(regex))
+  extra_selections = {
+    cmd: True for cmd in extra_selections
+    if not re.search(regex, cmd, re.IGNORECASE)
+    }
+
+  # Start extra selections
+  for cmd in extra_selections:
+    popen_objects.append(popen_program([cmd]))
+
+  # Microsoft Security Essentials
+  if mse:
+    cmd = r'{}\Installers\Extras\Security\{}'.format(
+      global_vars['BaseDir'],
+      'Microsoft Security Essentials.exe',
+      )
+    popen_objects.append(popen_program([cmd]))
+
+  # LibreOffice
+  if libreoffice:
+    cmd = r'{}\Installers\Extras\Office\{}'.format(
+      global_vars['BaseDir'],
+      'LibreOffice.exe',
+      )
+    popen_objects.append(popen_program([cmd]))
+
+  # Done
+  return popen_objects
+
 
 def install_vcredists():
-    """Install all supported Visual C++ runtimes."""
-    extract_item('_vcredists', silent=True)
-    prev_dir = os.getcwd()
+  """Install all supported Visual C++ runtimes."""
+  extract_item('_vcredists', silent=True)
+  prev_dir = os.getcwd()
+  try:
     os.chdir(r'{BinDir}\_vcredists'.format(**global_vars))
-    for vcr in VCR_REDISTS:
-        try_and_print(message=vcr['Name'], function=run_program, cmd=vcr['Cmd'])
+  except FileNotFoundError:
+    # Ignored since the loop below will report the errors
+    pass
+  for vcr in VCR_REDISTS:
+    try_and_print(message=vcr['Name'], function=run_program,
+      cmd=vcr['Cmd'], other_results=OTHER_RESULTS)
+
+  os.chdir(prev_dir)
+
+
+# Misc
+def open_device_manager():
+  popen_program(['mmc', 'devmgmt.msc'])
+
+
+def open_speedtest():
+  popen_program(['start', '', 'https://fast.com'], shell=True)
+
+
+def open_windows_activation():
+  popen_program(['slui'])
+
+
+def open_windows_updates():
+  popen_program(['control', '/name', 'Microsoft.WindowsUpdate'])
+
+
+def restart_explorer():
+  """Restart Explorer."""
+  kill_process('explorer.exe')
+  sleep(2)
+  kill_process('explorer.exe')
 
-    os.chdir(prev_dir)
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/sw_diags.py

@@ -0,0 +1,244 @@
+# Wizard Kit: Functions - SW Diagnostics
+
+import ctypes
+
+from functions.common import *
+from settings.sw_diags import *
+
+
+def check_4k_alignment(show_alert=False):
+  """Check that all partitions are 4K aligned."""
+  aligned = True
+  cmd = ['WMIC', 'partition', 'get', 'StartingOffset']
+  offsets = []
+
+  # Get offsets
+  result = run_program(cmd, encoding='utf-8', errors='ignore', check=False)
+  offsets = result.stdout.splitlines()
+
+  # Check offsets
+  for off in offsets:
+    off = off.strip()
+    if not off.isnumeric():
+      # Skip
+      continue
+
+    try:
+      aligned = aligned and int(off) % 4096 == 0
+    except ValueError:
+      # Ignore, this check is low priority
+      pass
+
+  # Show alert
+  if show_alert:
+    show_alert_box('One or more partitions are not 4K aligned')
+    raise Not4KAlignedError
+
+
+def check_connection():
+  """Check if the system is online and optionally abort the script."""
+  while True:
+    result = try_and_print(message='Ping test...',  function=ping, cs='OK')
+    if result['CS']:
+      break
+    if not ask('ERROR: System appears offline, try again?'):
+      if ask('Continue anyway?'):
+        break
+      else:
+        abort()
+
+
+def check_os_support_status():
+  """Check if current OS is supported."""
+  msg = ''
+  outdated = False
+  unsupported = False
+
+  # Check OS version/notes
+  os_info = global_vars['OS'].copy()
+  if os_info['Notes'] == 'unsupported':
+    msg = 'The installed version of Windows is no longer supported'
+    unsupported = True
+  elif os_info['Notes'] == 'preview build':
+    msg = 'Preview builds are not officially supported'
+    unsupported = True
+  elif os_info['Version'] == '10' and os_info['Notes'] == 'outdated':
+    msg = 'The installed version of Windows is outdated'
+    outdated = True
+  if 'Preview' not in msg:
+    msg += '\n\nPlease consider upgrading before continuing setup.'
+
+  # Show alert
+  if outdated or unsupported:
+    show_alert_box(msg)
+
+  # Raise exception if necessary
+  if outdated:
+    raise WindowsOutdatedError
+  if unsupported:
+    raise WindowsUnsupportedError
+
+
+def check_secure_boot_status(show_alert=False):
+  """Checks UEFI Secure Boot status via PowerShell."""
+  boot_mode = get_boot_mode()
+  cmd = ['PowerShell', '-Command', 'Confirm-SecureBootUEFI']
+  result = run_program(cmd, check=False)
+
+  # Check results
+  if result.returncode == 0:
+    out = result.stdout.decode()
+    if 'True' in out:
+      # It's on, do nothing
+      return
+    elif 'False' in out:
+      if show_alert:
+        show_alert_box('Secure Boot DISABLED')
+      raise SecureBootDisabledError
+    else:
+      if show_alert:
+        show_alert_box('Secure Boot status UNKNOWN')
+      raise SecureBootUnknownError
+  else:
+    if boot_mode != 'UEFI':
+      if (show_alert and
+        global_vars['OS']['Version'] in ('8', '8.1', '10')):
+        # OS supports Secure Boot
+        show_alert_box('Secure Boot DISABLED\n\nOS installed LEGACY')
+      raise OSInstalledLegacyError
+    else:
+      # Check error message
+      err = result.stderr.decode()
+      if 'Cmdlet not supported' in err:
+        if show_alert:
+          show_alert_box('Secure Boot UNAVAILABLE?')
+        raise SecureBootNotAvailError
+      else:
+        if show_alert:
+          show_alert_box('Secure Boot ERROR')
+        raise GenericError
+
+
+def get_boot_mode():
+  """Check if Windows is booted in UEFI or Legacy mode, returns str."""
+  kernel = ctypes.windll.kernel32
+  firmware_type = ctypes.c_uint()
+
+  # Get value from kernel32 API
+  try:
+    kernel.GetFirmwareType(ctypes.byref(firmware_type))
+  except:
+    # Just set to zero
+    firmware_type = ctypes.c_uint(0)
+
+  # Set return value
+  type_str = 'Unknown'
+  if firmware_type.value == 1:
+    type_str = 'Legacy'
+  elif firmware_type.value == 2:
+    type_str = 'UEFI'
+
+  return type_str
+
+
+def run_autoruns():
+  """Run AutoRuns in the background with VirusTotal checks enabled."""
+  extract_item('Autoruns', filter='autoruns*', silent=True)
+  # Update AutoRuns settings before running
+  for path, settings in AUTORUNS_SETTINGS.items():
+    winreg.CreateKey(HKCU, path)
+    with winreg.OpenKey(HKCU, path, access=winreg.KEY_WRITE) as key:
+      for name, value in settings.items():
+        winreg.SetValueEx(key, name, 0, winreg.REG_DWORD, value)
+  popen_program(global_vars['Tools']['AutoRuns'], minimized=True)
+
+
+def run_hwinfo_sensors():
+  """Run HWiNFO sensors."""
+  path = r'{BinDir}\HWiNFO'.format(**global_vars)
+  for bit in [32, 64]:
+    # Configure
+    source = r'{}\general.ini'.format(path)
+    dest =   r'{}\HWiNFO{}.ini'.format(path, bit)
+    shutil.copy(source, dest)
+    with open(dest, 'a') as f:
+      f.write('SensorsOnly=1\n')
+      f.write('SummaryOnly=0\n')
+  popen_program(global_vars['Tools']['HWiNFO'])
+
+
+def run_nircmd(*cmd):
+  """Run custom NirCmd."""
+  extract_item('NirCmd', silent=True)
+  cmd = [global_vars['Tools']['NirCmd'], *cmd]
+  run_program(cmd, check=False)
+
+
+def run_xmplay():
+  """Run XMPlay to test audio."""
+  extract_item('XMPlay', silent=True)
+  cmd = [global_vars['Tools']['XMPlay'],
+    r'{BinDir}\XMPlay\music.7z'.format(**global_vars)]
+
+  # Unmute audio first
+  extract_item('NirCmd', silent=True)
+  run_nircmd('mutesysvolume', '0')
+
+  # Open XMPlay
+  popen_program(cmd)
+
+
+def run_hitmanpro():
+  """Run HitmanPro in the background."""
+  extract_item('HitmanPro', silent=True)
+  cmd = [
+    global_vars['Tools']['HitmanPro'],
+    '/quiet', '/noinstall', '/noupload',
+    r'/log={LogDir}\Tools\HitmanPro.txt'.format(**global_vars)]
+  popen_program(cmd)
+
+
+def run_process_killer():
+  """Kill most running processes skipping those in the whitelist.txt."""
+  # borrowed from TronScript (reddit.com/r/TronScript)
+  # credit to /u/cuddlychops06
+  prev_dir = os.getcwd()
+  extract_item('ProcessKiller', silent=True)
+  os.chdir(r'{BinDir}\ProcessKiller'.format(**global_vars))
+  run_program(['ProcessKiller.exe', '/silent'], check=False)
+  os.chdir(prev_dir)
+
+
+def run_rkill():
+  """Run RKill and cleanup afterwards."""
+  extract_item('RKill', silent=True)
+  cmd = [
+    global_vars['Tools']['RKill'],
+    '-s', '-l', r'{LogDir}\Tools\RKill.log'.format(**global_vars),
+    '-new_console:n', '-new_console:s33V']
+  run_program(cmd, check=False)
+  wait_for_process('RKill')
+
+  # RKill cleanup
+  desktop_path = r'{USERPROFILE}\Desktop'.format(**global_vars['Env'])
+  if os.path.exists(desktop_path):
+    for item in os.scandir(desktop_path):
+      if re.search(r'^RKill', item.name, re.IGNORECASE):
+        dest = r'{LogDir}\Tools\{name}'.format(
+          name=dest, **global_vars)
+        dest = non_clobber_rename(dest)
+        shutil.move(item.path, dest)
+
+
+def show_alert_box(message, title=None):
+  """Show Windows alert box with message."""
+  if not title:
+    title = '{} Warning'.format(KIT_NAME_FULL)
+  message_box = ctypes.windll.user32.MessageBoxW
+  message_box(None, message, title, 0x00001030)
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/threading.py

@@ -0,0 +1,47 @@
+# Wizard Kit: Functions - Threading
+
+from threading import Thread
+from queue import Queue, Empty
+
+# Classes
+class NonBlockingStreamReader():
+  """Class to allow non-blocking reads from a stream."""
+  # Credits:
+  ## https://gist.github.com/EyalAr/7915597
+  ## https://stackoverflow.com/a/4896288
+
+  def __init__(self, stream):
+    self.stream = stream
+    self.queue = Queue()
+
+    def populate_queue(stream, queue):
+      """Collect lines from stream and put them in queue."""
+      while True:
+        line = stream.read(1)
+        if line:
+          queue.put(line)
+
+    self.thread = start_thread(
+      populate_queue,
+      args=(self.stream, self.queue))
+
+  def read(self, timeout=None):
+    try:
+      return self.queue.get(block = timeout is not None,
+          timeout = timeout)
+    except Empty:
+      return None
+
+
+# Functions
+def start_thread(function, args=[], daemon=True):
+  """Run function as thread in background, returns Thread object."""
+  thread = Thread(target=function, args=args, daemon=daemon)
+  thread.start()
+  return thread
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/tmux.py

@@ -0,0 +1,187 @@
+# Wizard Kit: Functions - tmux
+
+from functions.common import *
+
+
+def create_file(filepath):
+  """Create file if it doesn't exist."""
+  if not os.path.exists(filepath):
+    with open(filepath, 'w') as f:
+      f.write('')
+
+
+def tmux_capture_pane(pane_id=None):
+  """Capture text from target, or current, pane, returns str."""
+  cmd = ['tmux', 'capture-pane', '-p']
+  if pane_id:
+    cmd.extend(['-t', pane_id])
+  text = ''
+
+  # Capture
+  result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
+  text = result.stdout
+
+  # Done
+  return str(text)
+
+
+def tmux_get_pane_size(pane_id=None):
+  """Get target, or current, pane size, returns tuple."""
+  x = -1
+  y = -1
+  cmd = ['tmux', 'display', '-p']
+  if pane_id:
+    cmd.extend(['-t', pane_id])
+  cmd.append('#{pane_width} #{pane_height}')
+
+  # Run cmd and set x & y
+  result = run_program(cmd, check=False)
+  try:
+    x, y = result.stdout.decode().strip().split()
+    x = int(x)
+    y = int(y)
+  except Exception:
+    # Ignore and return unrealistic values
+    pass
+
+  return (x, y)
+
+
+def tmux_kill_all_panes(pane_id=None):
+  """Kill all tmux panes except the active pane or pane_id if specified."""
+  cmd = ['tmux', 'kill-pane', '-a']
+  if pane_id:
+    cmd.extend(['-t', pane_id])
+  run_program(cmd, check=False)
+
+
+def tmux_kill_pane(*panes):
+  """Kill tmux pane by id."""
+  cmd = ['tmux', 'kill-pane', '-t']
+  for pane_id in panes:
+    if not pane_id:
+      # Skip empty strings, None values, etc
+      continue
+    run_program(cmd+[pane_id], check=False)
+
+
+def tmux_poll_pane(pane_id):
+  """Check if pane exists, returns bool."""
+  cmd = ['tmux', 'list-panes', '-F', '#D']
+  result = run_program(cmd, check=False)
+  panes = result.stdout.decode().splitlines()
+  return pane_id in panes
+
+
+def tmux_resize_pane(pane_id=None, x=None, y=None, **kwargs):
+  """Resize pane to specific hieght or width."""
+  if not x and not y:
+    raise Exception('Neither height nor width specified.')
+
+  cmd = ['tmux', 'resize-pane']
+  if pane_id:
+    # NOTE: If pane_id not specified then the current pane will be resized
+    cmd.extend(['-t', pane_id])
+  if x:
+    cmd.extend(['-x', str(x)])
+  elif y:
+    cmd.extend(['-y', str(y)])
+
+  run_program(cmd, check=False)
+
+
+def tmux_split_window(
+    lines=None, percent=None,
+    behind=False, vertical=False,
+    follow=False, target_pane=None,
+    command=None, working_dir=None,
+    text=None, watch=None, watch_cmd='cat'):
+  """Run tmux split-window command and return pane_id as str."""
+  # Bail early
+  if not lines and not percent:
+    raise Exception('Neither lines nor percent specified.')
+  if not command and not text and not watch:
+    raise Exception('No command, text, or watch file specified.')
+
+  # Build cmd
+  cmd = ['tmux', 'split-window', '-PF', '#D']
+  if behind:
+    cmd.append('-b')
+  if vertical:
+    cmd.append('-v')
+  else:
+    cmd.append('-h')
+  if not follow:
+    cmd.append('-d')
+  if lines is not None:
+    cmd.extend(['-l', str(lines)])
+  elif percent is not None:
+    cmd.extend(['-p', str(percent)])
+  if target_pane:
+    cmd.extend(['-t', str(target_pane)])
+
+  if working_dir:
+    cmd.extend(['-c', working_dir])
+  if command:
+    cmd.extend(command)
+  elif text:
+    cmd.extend(['echo-and-hold "{}"'.format(text)])
+  elif watch:
+    create_file(watch)
+    if watch_cmd == 'cat':
+      cmd.extend([
+        'watch', '--color', '--no-title',
+        '--interval', '1',
+        'cat', watch])
+    elif watch_cmd == 'tail':
+      cmd.extend(['tail', '-f', watch])
+
+  # Run and return pane_id
+  result = run_program(cmd)
+  return result.stdout.decode().strip()
+
+
+def tmux_switch_client(target_session=None):
+  """Switch to target tmux session, or previous if none specified."""
+  cmd = ['tmux', 'switch-client']
+  if target_session:
+    cmd.extend(['-t', target_session])
+  else:
+    # Switch to previous instead
+    cmd.append('-p')
+
+  run_program(cmd, check=False)
+
+
+def tmux_update_pane(
+    pane_id, command=None, working_dir=None,
+    text=None, watch=None, watch_cmd='cat'):
+  """Respawn with either a new command or new text."""
+  # Bail early
+  if not command and not text and not watch:
+    raise Exception('No command, text, or watch file specified.')
+
+  cmd = ['tmux', 'respawn-pane', '-k', '-t', pane_id]
+  if working_dir:
+    cmd.extend(['-c', working_dir])
+  if command:
+    cmd.extend(command)
+  elif text:
+    cmd.extend(['echo-and-hold "{}"'.format(text)])
+  elif watch:
+    create_file(watch)
+    if watch_cmd == 'cat':
+      cmd.extend([
+        'watch', '--color', '--no-title',
+        '--interval', '1',
+        'cat', watch])
+    elif watch_cmd == 'tail':
+      cmd.extend(['tail', '-f', watch])
+
+  run_program(cmd)
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/ufd.py

@@ -0,0 +1,471 @@
+"""Wizard Kit: Functions - UFD"""
+# pylint: disable=broad-except,wildcard-import
+# vim: sts=2 sw=2 ts=2
+
+import os
+import re
+import shutil
+import pathlib
+from collections import OrderedDict
+from functions.common import *
+
+
+def case_insensitive_search(path, item):
+  """Search path for item case insensitively, returns str."""
+  regex_match = '^{}$'.format(item)
+  real_path = ''
+
+  # Quick check first
+  if os.path.exists('{}/{}'.format(path, item)):
+    real_path = '{}{}{}'.format(
+      path,
+      '' if path == '/' else '/',
+      item,
+      )
+
+  # Check all items in dir
+  for entry in os.scandir(path):
+    if re.match(regex_match, entry.name, re.IGNORECASE):
+      real_path = '{}{}{}'.format(
+        path,
+        '' if path == '/' else '/',
+        entry.name,
+        )
+
+  # Done
+  if not real_path:
+    raise FileNotFoundError('{}/{}'.format(path, item))
+
+  return real_path
+
+
+def confirm_selections(args):
+  """Ask tech to confirm selections, twice if necessary."""
+  if not ask('Is the above information correct?'):
+    abort(False)
+  ## Safety check
+  if not args['--update']:
+    print_standard(' ')
+    print_warning('SAFETY CHECK')
+    print_standard(
+      'All data will be DELETED from the disk and partition(s) listed above.')
+    print_standard(
+      'This is irreversible and will lead to {RED}DATA LOSS.{CLEAR}'.format(
+        **COLORS))
+    if not ask('Asking again to confirm, is this correct?'):
+      abort(False)
+
+  print_standard(' ')
+
+
+def copy_source(source, items, overwrite=False):
+  """Copy source items to /mnt/UFD."""
+  is_image = source.is_file()
+
+  # Mount source if necessary
+  if is_image:
+    mount(source, '/mnt/Source')
+
+  # Copy items
+  for i_source, i_dest in items:
+    i_source = '{}{}'.format(
+      '/mnt/Source' if is_image else source,
+      i_source,
+      )
+    i_dest = '/mnt/UFD{}'.format(i_dest)
+    try:
+      recursive_copy(i_source, i_dest, overwrite=overwrite)
+    except FileNotFoundError:
+      # Going to assume (hope) that this is fine
+      pass
+
+  # Unmount source if necessary
+  if is_image:
+    unmount('/mnt/Source')
+
+
+def find_first_partition(dev_path):
+  """Find path to first partition of dev, returns str."""
+  cmd = [
+    'lsblk',
+    '--list',
+    '--noheadings',
+    '--output', 'name',
+    '--paths',
+    dev_path,
+    ]
+  result = run_program(cmd, encoding='utf-8', errors='ignore')
+  part_path = result.stdout.splitlines()[-1].strip()
+
+  return part_path
+
+
+def find_path(path):
+  """Find path case-insensitively, returns pathlib.Path obj."""
+  path_obj = pathlib.Path(path).resolve()
+
+  # Quick check first
+  if path_obj.exists():
+    return path_obj
+
+  # Fix case
+  parts = path_obj.relative_to('/').parts
+  real_path = '/'
+  for part in parts:
+    try:
+      real_path = case_insensitive_search(real_path, part)
+    except NotADirectoryError:
+      # Reclassify error
+      raise FileNotFoundError(path)
+
+  # Raise error if path doesn't exist
+  path_obj = pathlib.Path(real_path)
+  if not path_obj.exists():
+    raise FileNotFoundError(path_obj)
+
+  # Done
+  return path_obj
+
+
+def get_user_home(user):
+  """Get path to user's home dir, returns str."""
+  home_dir = None
+  cmd = ['getent', 'passwd', user]
+  result = run_program(cmd, encoding='utf-8', errors='ignore', check=False)
+  try:
+    home_dir = result.stdout.split(':')[5]
+  except Exception:
+    # Just use HOME from ENV (or '/root' if that fails)
+    home_dir = os.environ.get('HOME', '/root')
+
+  return home_dir
+
+
+def get_user_name():
+  """Get real user name, returns str."""
+  user = None
+  if 'SUDO_USER' in os.environ:
+    user = os.environ.get('SUDO_USER', 'Unknown')
+  else:
+    user = os.environ.get('USER', 'Unknown')
+
+  return user
+
+
+def hide_items(ufd_dev, items):
+  """Set FAT32 hidden flag for items."""
+  # pylint: disable=invalid-name
+  with open('/root/.mtoolsrc', 'w') as f:
+    f.write('drive U: file="{}"\n'.format(
+      find_first_partition(ufd_dev)))
+    f.write('mtools_skip_check=1\n')
+
+  # Hide items
+  for item in items:
+    cmd = ['yes | mattrib +h "U:/{}"'.format(item)]
+    run_program(cmd, check=False, shell=True)
+
+
+def install_syslinux_to_dev(ufd_dev, use_mbr):
+  """Install Syslinux to UFD (dev)."""
+  cmd = [
+    'dd',
+    'bs=440',
+    'count=1',
+    'if=/usr/lib/syslinux/bios/{}.bin'.format(
+      'mbr' if use_mbr else 'gptmbr',
+      ),
+    'of={}'.format(ufd_dev),
+    ]
+  run_program(cmd)
+
+
+def install_syslinux_to_partition(partition):
+  """Install Syslinux to UFD (partition)."""
+  cmd = [
+    'syslinux',
+    '--install',
+    '--directory',
+    '/arch/boot/syslinux/',
+    partition,
+    ]
+  run_program(cmd)
+
+
+def is_valid_path(path_obj, path_type):
+  """Verify path_obj is valid by type, returns bool."""
+  valid_path = False
+  if path_type == 'DIR':
+    valid_path = path_obj.is_dir()
+  elif path_type == 'KIT':
+    valid_path = path_obj.is_dir() and path_obj.joinpath('.bin').exists()
+  elif path_type == 'IMG':
+    valid_path = path_obj.is_file() and path_obj.suffix.lower() == '.img'
+  elif path_type == 'ISO':
+    valid_path = path_obj.is_file() and path_obj.suffix.lower() == '.iso'
+  elif path_type == 'UFD':
+    valid_path = path_obj.is_block_device()
+
+  return valid_path
+
+
+def mount(mount_source, mount_point, read_write=False):
+  """Mount mount_source on mount_point."""
+  os.makedirs(mount_point, exist_ok=True)
+  cmd = [
+    'mount',
+    mount_source,
+    mount_point,
+    '-o',
+    'rw' if read_write else 'ro',
+    ]
+  run_program(cmd)
+
+
+def prep_device(dev_path, label, use_mbr=False, indent=2):
+  """Format device in preparation for applying the WizardKit components
+
+  This is done is four steps:
+  1. Zero-out first 64MB (this deletes the partition table and/or bootloader)
+  2. Create a new partition table (GPT by default, optionally MBR)
+  3. Set boot flag
+  4. Format partition (FAT32, 4K aligned)
+  """
+  # Zero-out first 64MB
+  cmd = 'dd bs=4M count=16 if=/dev/zero of={}'.format(dev_path).split()
+  try_and_print(
+    indent=indent,
+    message='Zeroing first 64MB...',
+    function=run_program,
+    cmd=cmd,
+    )
+
+  # Create partition table
+  cmd = 'parted {} --script -- mklabel {} mkpart primary fat32 4MiB {}'.format(
+    dev_path,
+    'msdos' if use_mbr else 'gpt',
+    '-1s' if use_mbr else '-4MiB',
+    ).split()
+  try_and_print(
+    indent=indent,
+    message='Creating partition table...',
+    function=run_program,
+    cmd=cmd,
+    )
+
+  # Set boot flag
+  cmd = 'parted {} set 1 {} on'.format(
+    dev_path,
+    'boot' if use_mbr else 'legacy_boot',
+    ).split()
+  try_and_print(
+    indent=indent,
+    message='Setting boot flag...',
+    function=run_program,
+    cmd=cmd,
+    )
+
+  # Format partition
+  cmd = [
+    'mkfs.vfat', '-F', '32',
+    '-n', label,
+    find_first_partition(dev_path),
+    ]
+  try_and_print(
+    indent=indent,
+    message='Formatting partition...',
+    function=run_program,
+    cmd=cmd,
+    )
+
+
+def recursive_copy(source, dest, overwrite=False):
+  """Copy source to dest recursively.
+
+  NOTE: This uses rsync style source/dest syntax.
+  If the source has a trailing slash then it's contents are copied,
+  otherwise the source itself is copied.
+
+  Examples assuming "ExDir/ExFile.txt" exists:
+  recursive_copy("ExDir", "Dest/") results in "Dest/ExDir/ExFile.txt"
+  recursive_copy("ExDir/", "Dest/") results in "Dest/ExFile.txt"
+
+  NOTE 2: dest does not use find_path because it might not exist.
+  """
+  copy_contents = source.endswith('/')
+  source = find_path(source)
+  dest = pathlib.Path(dest).resolve().joinpath(source.name)
+  os.makedirs(dest.parent, exist_ok=True)
+
+  if source.is_dir():
+    if copy_contents:
+      # Trailing slash syntax
+      for item in os.scandir(source):
+        recursive_copy(item.path, dest.parent, overwrite=overwrite)
+    elif not dest.exists():
+      # No conflict, copying whole tree (no merging needed)
+      shutil.copytree(source, dest)
+    elif not dest.is_dir():
+      # Refusing to replace file with dir
+      raise FileExistsError('Refusing to replace file: {}'.format(dest))
+    else:
+      # Dest exists and is a dir, merge dirs
+      for item in os.scandir(source):
+        recursive_copy(item.path, dest, overwrite=overwrite)
+  elif source.is_file():
+    if not dest.exists():
+      # No conflict, copying file
+      shutil.copy2(source, dest)
+    elif not dest.is_file():
+      # Refusing to replace dir with file
+      raise FileExistsError('Refusing to replace dir: {}'.format(dest))
+    elif overwrite:
+      # Dest file exists, deleting and replacing file
+      os.remove(dest)
+      shutil.copy2(source, dest)
+    else:
+      # Refusing to delete file when overwrite=False
+      raise FileExistsError('Refusing to delete file: {}'.format(dest))
+
+
+def remove_arch():
+  """Remove arch dir from UFD.
+
+  This ensures a clean installation to the UFD and resets the boot files
+  """
+  shutil.rmtree(find_path('/mnt/UFD/arch'))
+
+
+def running_as_root():
+  """Check if running with effective UID of 0, returns bool."""
+  return os.geteuid() == 0
+
+
+def show_selections(args, sources, ufd_dev, ufd_sources):
+  """Show selections including non-specified options."""
+
+  # Sources
+  print_info('Sources')
+  for label in ufd_sources.keys():
+    if label in sources:
+      print_standard('  {label:<18} {path}'.format(
+        label=label+':',
+        path=sources[label],
+        ))
+    else:
+      print_standard('  {label:<18} {YELLOW}Not Specified{CLEAR}'.format(
+        label=label+':',
+        **COLORS,
+        ))
+  print_standard(' ')
+
+  # Destination
+  print_info('Destination')
+  cmd = [
+    'lsblk', '--nodeps', '--noheadings', '--paths',
+    '--output', 'NAME,FSTYPE,TRAN,SIZE,VENDOR,MODEL,SERIAL',
+    ufd_dev,
+    ]
+  result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
+  print_standard(result.stdout.strip())
+  cmd = [
+    'lsblk', '--noheadings', '--paths',
+    '--output', 'NAME,SIZE,FSTYPE,LABEL,MOUNTPOINT',
+    ufd_dev,
+    ]
+  result = run_program(cmd, check=False, encoding='utf-8', errors='ignore')
+  for line in result.stdout.splitlines()[1:]:
+    print_standard(line)
+
+  # Notes
+  if args['--update']:
+    print_warning('Updating kit in-place')
+  elif args['--use-mbr']:
+    print_warning('Formatting using legacy MBR')
+  print_standard(' ')
+
+
+def unmount(mount_point):
+  """Unmount mount_point."""
+  cmd = ['umount', mount_point]
+  run_program(cmd)
+
+
+def update_boot_entries(boot_entries, boot_files, iso_label, ufd_label):
+  """Update boot files for UFD usage"""
+  configs = []
+
+  # Find config files
+  for c_path, c_ext in boot_files.items():
+    c_path = find_path('/mnt/UFD{}'.format(c_path))
+    for item in os.scandir(c_path):
+      if item.name.lower().endswith(c_ext.lower()):
+        configs.append(item.path)
+
+  # Update Linux labels
+  cmd = [
+    'sed',
+    '--in-place',
+    '--regexp-extended',
+    's/{}/{}/'.format(iso_label, ufd_label),
+    *configs,
+    ]
+  run_program(cmd)
+
+  # Uncomment extra entries if present
+  for b_path, b_comment in boot_entries.items():
+    try:
+      find_path('/mnt/UFD{}'.format(b_path))
+    except (FileNotFoundError, NotADirectoryError):
+      # Entry not found, continue to next entry
+      continue
+
+    # Entry found, update config files
+    cmd = [
+      'sed',
+      '--in-place',
+      's/#{}#//'.format(b_comment),
+      *configs,
+      ]
+    run_program(cmd, check=False)
+
+
+def verify_sources(args, ufd_sources):
+  """Check all sources and abort if necessary, returns dict."""
+  sources = OrderedDict()
+
+  for label, data in ufd_sources.items():
+    s_path = args[data['Arg']]
+    if s_path:
+      try:
+        s_path_obj = find_path(s_path)
+      except FileNotFoundError:
+        print_error('ERROR: {} not found: {}'.format(label, s_path))
+        abort(False)
+      if not is_valid_path(s_path_obj, data['Type']):
+        print_error('ERROR: Invalid {} source: {}'.format(label, s_path))
+        abort(False)
+      sources[label] = s_path_obj
+
+  return sources
+
+
+def verify_ufd(dev_path):
+  """Check that dev_path is a valid UFD, returns pathlib.Path obj."""
+  ufd_dev = None
+
+  try:
+    ufd_dev = find_path(dev_path)
+  except FileNotFoundError:
+    print_error('ERROR: UFD device not found: {}'.format(dev_path))
+    abort(False)
+
+  if not is_valid_path(ufd_dev, 'UFD'):
+    print_error('ERROR: Invalid UFD device: {}'.format(ufd_dev))
+    abort(False)
+
+  return ufd_dev
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")

.bin/Scripts/functions/windows_setup.py

@@ -2,235 +2,219 @@
 
 from functions.data import *
 from functions.disk import *
+from settings.windows_setup 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.
+  """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']
+  Searches on local disks and then the WINDOWS_SERVER share."""
+  image = {}
+  imagefile = windows_version['Image File']
+  imagename = windows_version['Image Name']
 
-    # Search local source
-    set_thread_error_mode(silent=True) # Prevents "No disk" popups
-    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'] = d.mountpoint[:1]
-                if ext == 'swm':
-                    image['Glob'] = '--ref="{}*.swm"'.format(image['Path'][:-4])
-                break
-    set_thread_error_mode(silent=False) # Return to normal
+  # Search local source
+  set_thread_error_mode(silent=True) # Prevents "No disk" popups
+  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['Letter'] = d.mountpoint[:1].upper()
+        image['Local'] = True
+        if ext == 'swm':
+          image['Glob'] = '--ref="{}*.swm"'.format(image['Path'][:-4])
+        break
+  set_thread_error_mode(silent=False) # Return to normal
+
+  # Check for network source
+  if not image:
+    mount_windows_share()
+    if WINDOWS_SERVER['Mounted']:
+      for ext in ['esd', 'wim', 'swm']:
+        path = r'\\{}\{}\images\{}.{}'.format(
+          WINDOWS_SERVER['IP'],
+          WINDOWS_SERVER['Share'],
+          imagefile,
+          ext)
+        if os.path.isfile(path) and wim_contains_image(path, imagename):
+          image['Path'] = path
+          image['Letter'] = None
+          image['Local'] = False
+          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
 
-    # Check for network source
-    if not image:
-        mount_windows_share()
-        if WINDOWS_SERVER['Mounted']:
-            for ext in ['esd', 'wim', 'swm']:
-                path = r'\\{}\{}\images\{}.{}'.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)
+  """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."""
-    script = [
-        # Partition table
-        'select disk {}'.format(disk['Number']),
-        'clean',
-        'convert gpt',
+  """Format disk for use as a Windows OS disk using the GPT layout."""
+  script = [
+    # Partition table
+    'select disk {}'.format(disk['Number']),
+    'clean',
+    'convert gpt',
 
-        # System partition
-        # NOTE: ESP needs to be >= 260 for Advanced Format 4K disks
-        'create partition efi size=500',
-        'format quick fs=fat32 label="System"',
-        'assign letter="S"',
+    # System partition
+    # NOTE: ESP needs to be >= 260 for Advanced Format 4K disks
+    'create partition efi size=500',
+    'format quick fs=fat32 label="System"',
+    'assign letter="S"',
 
-        # Microsoft Reserved (MSR) partition
-        'create partition msr size=128',
+    # Microsoft Reserved (MSR) partition
+    'create partition msr size=128',
 
-        # Windows partition
-        'create partition primary',
-        'format quick fs=ntfs label="Windows"',
-        'assign letter="W"',
+    # Windows partition
+    'create partition primary',
+    'format quick fs=ntfs label="Windows"',
+    'assign letter="W"',
+
+    # Recovery Tools partition
+    'shrink minimum=500',
+    'create partition primary',
+    'format quick fs=ntfs label="Recovery Tools"',
+    'assign letter="T"',
+    'set id="de94bba4-06d1-4d40-a16a-bfd50179d6ac"',
+    'gpt attributes=0x8000000000000001',
+    ]
+
+  # Run
+  run_diskpart(script)
 
-        # Recovery Tools partition
-        'shrink minimum=500',
-        'create partition primary',
-        'format quick fs=ntfs label="Recovery Tools"',
-        'assign letter="T"',
-        'set id="de94bba4-06d1-4d40-a16a-bfd50179d6ac"',
-        'gpt attributes=0x8000000000000001',
-        ]
-    
-    # Run
-    run_diskpart(script)
 
 def format_mbr(disk):
-    """Format disk for use as a Windows OS disk using the MBR layout."""
-    script = [
-        # Partition table
-        'select disk {}'.format(disk['Number']),
-        'clean',
+  """Format disk for use as a Windows OS disk using the MBR layout."""
+  script = [
+    # Partition table
+    'select disk {}'.format(disk['Number']),
+    'clean',
 
-        # System partition
-        'create partition primary size=100',
-        'format fs=ntfs quick label="System Reserved"',
-        'active',
-        'assign letter="S"',
+    # System partition
+    'create partition primary size=100',
+    'format fs=ntfs quick label="System Reserved"',
+    'active',
+    'assign letter="S"',
 
-        # Windows partition
-        'create partition primary',
-        'format fs=ntfs quick label="Windows"',
-        'assign letter="W"',
+    # Windows partition
+    'create partition primary',
+    'format fs=ntfs quick label="Windows"',
+    'assign letter="W"',
+
+    # Recovery Tools partition
+    'shrink minimum=500',
+    'create partition primary',
+    'format quick fs=ntfs label="Recovery"',
+    'assign letter="T"',
+    'set id=27',
+    ]
+
+  # Run
+  run_diskpart(script)
 
-        # Recovery Tools partition
-        'shrink minimum=500',
-        'create partition primary',
-        'format quick fs=ntfs label="Recovery"',
-        'assign letter="T"',
-        'set id=27',
-        ]
-    
-    # Run
-    run_diskpart(script)
 
 def mount_windows_share():
-    """Mount the Windows images share unless labeled as already mounted."""
-    if not WINDOWS_SERVER['Mounted']:
-        # Mounting read-write in case a backup was done in the same session
-        # and the server was left mounted read-write. This avoids throwing an
-        # error by trying to mount the same server with multiple credentials.
-        mount_network_share(WINDOWS_SERVER, read_write=True)
+  """Mount the Windows images share unless already mounted."""
+  if not WINDOWS_SERVER['Mounted']:
+    # Mounting read-write in case a backup was done in the same session
+    # and the server was left mounted read-write. This avoids throwing an
+    # error by trying to mount the same server with multiple credentials.
+    mount_network_share(WINDOWS_SERVER, read_write=True)
+
 
 def select_windows_version():
-    """Select Windows version from a menu, returns dict."""
-    actions = [
-        {'Name': 'Main Menu', 'Letter': 'M'},
-        ]
+  """Select Windows version from a menu, returns dict."""
+  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)
+  # 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
 
-    if selection.isnumeric():
-        return WINDOWS_VERSIONS[int(selection)-1]
-    elif selection == 'M':
-        raise GenericAbort
 
 def setup_windows(windows_image, windows_version):
-    """Apply a Windows image to W:"""
-    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)
+  """Apply a Windows image to W:"""
+  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'):
-    """Setup the WinRE partition."""
-    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)
+  """Setup the WinRE partition."""
+  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'):
-    """Setup the Windows boot partition."""
-    cmd = [
-        r'{}\Windows\System32\bcdboot.exe'.format(
-            global_vars['Env']['SYSTEMDRIVE']),
-        r'{}:\Windows'.format(windows_letter),
-        '/s', '{}:'.format(system_letter),
-        '/f', mode]
-    run_program(cmd)
+  """Setup the Windows boot partition."""
+  cmd = [
+    r'{}\Windows\System32\bcdboot.exe'.format(
+      global_vars['Env']['SYSTEMDRIVE']),
+    r'{}:\Windows'.format(windows_letter),
+    '/s', '{}:'.format(system_letter),
+    '/f', mode]
+  run_program(cmd)
+
 
 def wim_contains_image(filename, imagename):
-    """Check if an ESD/WIM contains the specified image, returns bool."""
-    cmd = [
-        global_vars['Tools']['wimlib-imagex'],
-        'info',
-        filename,
-        imagename]
-    try:
-        run_program(cmd)
-    except subprocess.CalledProcessError:
-        return False
-    
-    return True
+  """Check if an ESD/WIM contains the specified image, returns bool."""
+  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.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/windows_updates.py

@@ -0,0 +1,143 @@
+# Wizard Kit: Functions - Windows updates
+
+from functions.common import *
+
+
+# Functions
+def delete_folder(folder_path):
+  """Near-useless wrapper for shutil.rmtree."""
+  shutil.rmtree(folder_path)
+
+
+def disable_service(service_name):
+  """Set service startup to disabled."""
+  run_program(['sc', 'config', service_name, 'start=', 'disabled'])
+
+  # Verify service was disabled
+  start_type = get_service_start_type(service_name)
+  if not start_type.lower().startswith('disabled'):
+    raise GenericError('Failed to disable service {}'.format(service_name))
+
+
+def disable_windows_updates():
+  """Disable windows updates and clear SoftwareDistribution folder."""
+  indent=2
+  width=52
+  update_folders = [
+    r'{WINDIR}\SoftwareDistribution'.format(**global_vars['Env']),
+    r'{SYSTEMDRIVE}\$WINDOWS.~BT'.format(**global_vars['Env']),
+  ]
+
+  for service in ('wuauserv', 'bits'):
+    # Stop service
+    result = try_and_print(
+      'Stopping service {}...'.format(service),
+      indent=indent, width=width,
+      function=stop_service, service_name=service)
+    if not result['CS']:
+      result = try_and_print(
+        'Stopping service {}...'.format(service),
+        indent=indent, width=width,
+        function=stop_service, service_name=service)
+      if not result['CS']:
+        raise GenericError('Service {} could not be stopped.'.format(service))
+
+    # Disable service
+    result = try_and_print(
+      'Disabling service {}...'.format(service),
+      indent=indent, width=width,
+      function=disable_service, service_name=service)
+    if not result['CS']:
+      result = try_and_print(
+        'Disabling service {}...'.format(service),
+        indent=indent, width=width,
+        function=disable_service, service_name=service)
+      if not result['CS']:
+        raise GenericError('Service {} could not be disabled.'.format(service))
+
+  # Delete update folders
+  for folder_path in update_folders:
+    if os.path.exists(folder_path):
+      result = try_and_print(
+        'Deleting folder {}...'.format(folder_path),
+        indent=indent, width=width,
+        function=delete_folder, folder_path=folder_path)
+      if not result['CS']:
+        raise GenericError('Failed to remove folder {}'.format(folder_path))
+
+
+def enable_service(service_name, start_type='auto'):
+  """Enable service by setting start type."""
+  run_program(['sc', 'config', service_name, 'start=', start_type])
+
+
+def enable_windows_updates(silent=False):
+  """Enable windows updates"""
+  indent=2
+  width=52
+
+  for service in ('bits', 'wuauserv'):
+    # Enable service
+    start_type = 'auto'
+    if service == 'wuauserv':
+      start_type = 'demand'
+    if silent:
+      try:
+        enable_service(service, start_type=start_type)
+      except Exception:
+        # Try again
+        enable_service(service, start_type=start_type)
+    else:
+      result = try_and_print(
+        'Enabling service {}...'.format(service),
+        indent=indent, width=width,
+        function=enable_service, service_name=service, start_type=start_type)
+      if not result['CS']:
+        result = try_and_print(
+          'Enabling service {}...'.format(service),
+          indent=indent, width=width,
+          function=enable_service, service_name=service, start_type=start_type)
+        if not result['CS']:
+          raise GenericError('Service {} could not be enabled.'.format(service))
+
+
+def get_service_status(service_name):
+  """Get service status using psutil, returns str."""
+  status = 'Unknown'
+  try:
+    service = psutil.win_service_get(service_name)
+    status = service.status()
+  except psutil.NoSuchProcess:
+    # Ignore and return 'Unknown' below
+    pass
+
+  return status
+
+
+def get_service_start_type(service_name):
+  """Get service startup type using psutil, returns str."""
+  start_type = 'Unknown'
+  try:
+    service = psutil.win_service_get(service_name)
+    start_type = service.start_type()
+  except psutil.NoSuchProcess:
+    # Ignore and return 'Unknown' below
+    pass
+
+  return start_type
+
+
+def stop_service(service_name):
+  """Stop service."""
+  run_program(['net', 'stop', service_name], check=False)
+
+  # Verify service was stopped
+  status = get_service_status(service_name)
+  if not status.lower().startswith('stopped'):
+    raise GenericError('Failed to stop service {}'.format(service_name))
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/functions/winpe_menus.py

@@ -3,442 +3,433 @@
 from functions.backup import *
 from functions.disk import *
 from functions.windows_setup import *
+from settings.winpe 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 check_pe_tools():
-    """Fix tool paths for WinPE layout."""
-    for k in PE_TOOLS.keys():
-        PE_TOOLS[k]['Path'] = r'{}\{}'.format(
-            global_vars['BinDir'], PE_TOOLS[k]['Path'])
-    global_vars['Tools']['wimlib-imagex'] = re.sub(
-        r'\\x(32|64)',
-        r'',
-        global_vars['Tools']['wimlib-imagex'],
-        re.IGNORECASE)
+  """Fix tool paths for WinPE layout."""
+  for k in PE_TOOLS.keys():
+    PE_TOOLS[k]['Path'] = r'{}\{}'.format(
+      global_vars['BinDir'], PE_TOOLS[k]['Path'])
+  global_vars['Tools']['wimlib-imagex'] = re.sub(
+    r'\\x(32|64)',
+    r'',
+    global_vars['Tools']['wimlib-imagex'],
+    re.IGNORECASE)
+
 
 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))
+  """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()
+  # Set backup prefix
+  clear_screen()
+  print_standard('{}\n'.format(global_vars['Title']))
+  ticket_number = get_ticket_number()
+  if ENABLED_TICKET_NUMBERS:
+    backup_prefix = ticket_number
+  else:
+    backup_prefix = get_simple_string(prompt='Enter backup name prefix')
+    backup_prefix = backup_prefix.replace(' ', '_')
 
-    # Mount backup shares
-    mount_backup_shares(read_write=True)
+  # Assign drive letters
+  try_and_print(
+    message = 'Assigning letters...',
+    function = assign_volume_letters,
+    other_results = other_results)
 
-    # Select destination
-    destination = select_backup_destination(auto_select=False)
+  # Mount backup shares
+  mount_backup_shares(read_write=True)
 
-    # 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)
+  # Select destination
+  destination = select_backup_destination(auto_select=False)
 
-    # Display details for backup task
-    clear_screen()
-    print_info('Create Backup - Details:\n')
+  # Scan disks
+  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, backup_prefix)
+
+  # Display details for backup task
+  clear_screen()
+  print_info('Create Backup - Details:\n')
+  if ENABLED_TICKET_NUMBERS:
     show_data(message='Ticket:', data=ticket_number)
-    show_data(
-        message = 'Source:',
-        data = '[{}] ({}) {} {}'.format(
-            disk.get('Table', ''),
-            disk.get('Type', ''),
-            disk.get('Name', 'Unknown'),
-            disk.get('Size', ''),
-            ),
-        )
-    show_data(
-        message = 'Destination:',
-        data = destination.get('Display Name', destination['Name']),
-        )
-    for par in disk['Partitions']:
-        message = 'Partition {}:'.format(par['Number'])
-        data = par['Display String']
-        if par['Number'] in disk['Bad Partitions']:
-            show_data(message=message, data=data, width=30, warning=True)
-            if 'Error' in par:
-                show_data(message='', data=par['Error'], error=True)
-        elif par['Image Exists']:
-            show_data(message=message, data=data, width=30, info=True)
-        else:
-            show_data(message=message, data=data, width=30)
-    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,
-            par = par)
-        if not result['CS'] and not isinstance(result['Error'], GenericAbort):
-            errors = True
-            par['Error'] = result['Error']
-    
-    # Verify backup(s)
-    if disk['Valid Partitions']:
-        print_info('\n\nVerifying 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
-            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]
-                for line in par['Error']:
-                    print_error('\t{}'.format(line))
-            except:
-                print_error('\t{}'.format(par['Error']))
+  show_data(
+    message = 'Source:',
+    data = '[{}] ({}) {} {}'.format(
+      disk.get('Table', ''),
+      disk.get('Type', ''),
+      disk.get('Name', 'Unknown'),
+      disk.get('Size', ''),
+      ),
+    )
+  show_data(
+    message = 'Destination:',
+    data = destination.get('Display Name', destination['Name']),
+    )
+  for par in disk['Partitions']:
+    message = 'Partition {}:'.format(par['Number'])
+    data = par['Display String']
+    if par['Number'] in disk['Bad Partitions']:
+      show_data(message=message, data=data, width=30, warning=True)
+      if 'Error' in par:
+        show_data(message='', data=par['Error'], error=True)
+    elif par['Image Exists']:
+      show_data(message=message, data=data, width=30, info=True)
     else:
-        print_success('\nNo errors were encountered during imaging.')
-    if 'LogFile' in global_vars and ask('\nReview log?'):
-        cmd = [
-            global_vars['Tools']['NotepadPlusPlus'],
-            global_vars['LogFile']]
+      show_data(message=message, data=data, width=30)
+  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,
+      par = par)
+    if not result['CS'] and not isinstance(result['Error'], GenericAbort):
+      errors = True
+      par['Error'] = result['Error']
+
+  # Verify backup(s)
+  if disk['Valid Partitions']:
+    print_info('\n\nVerifying 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:
-            popen_program(cmd)
-        except Exception:
-            print_error('ERROR: Failed to open log.')
-            sleep(30)
-    pause('\nPress Enter to return to main menu... ')
+          par['Error'] = par['Error'].stderr.decode()
+        except:
+          # Deal with badly formatted error message
+          pass
+      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]
+        for line in par['Error']:
+          print_error('\t{}'.format(line))
+      except:
+        print_error('\t{}'.format(par['Error']))
+  else:
+    print_success('\nNo errors were encountered during imaging.')
+  if 'LogFile' in global_vars and ask('\nReview log?'):
+    cmd = [
+      global_vars['Tools']['NotepadPlusPlus'],
+      global_vars['LogFile']]
+    try:
+      popen_program(cmd)
+    except Exception:
+      print_error('ERROR: Failed to open log.')
+      sleep(30)
+  pause('\nPress Enter to return to main menu... ')
+
 
 def menu_root():
-    """Main WinPE menu."""
-    check_pe_tools()
-    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 WinPE menu."""
+  check_pe_tools()
+  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)
+  # 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:
+      sys.exit()
 
-        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:
-            sys.exit()
 
 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))
+  """Format a disk, apply a Windows image, and create 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()
+  # 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)
+  # Select the version of Windows to apply
+  windows_version = select_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 dest_disk:
-        raise GenericAbort
-    
-    # "Prep" disk
-    prep_disk_for_formatting(dest_disk)
+  # Find Windows image
+  # NOTE: Reassign volume letters to ensure all devices are scanned
+  try_and_print(
+    message = 'Assigning volume letters...',
+    function = assign_volume_letters,
+    other_results = other_results)
+  windows_image = find_windows_image(windows_version)
 
-    # Display details for setup task
-    clear_screen()
-    print_info('Setup Windows - Details:\n')
+  # Scan disks
+  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 dest_disk:
+    raise GenericAbort
+
+  # "Prep" disk
+  prep_disk_for_formatting(dest_disk)
+
+  # Display details for setup task
+  clear_screen()
+  print_info('Setup Windows - Details:\n')
+  if ENABLED_TICKET_NUMBERS:
     show_data(message='Ticket:', data=ticket_number)
-    show_data(message='Installing:', data=windows_version['Name'])
+  show_data(message='Installing:', data=windows_version['Name'])
+  show_data(
+    message = 'Boot Method:',
+    data = 'UEFI (GPT)' if dest_disk['Use GPT'] else 'Legacy (MBR)')
+  show_data(message='Using Image:', data=windows_image['Path'])
+  show_data(
+    message = 'ERASING:',
+    data = '[{}] ({}) {} {}\n'.format(
+      dest_disk.get('Table', ''),
+      dest_disk.get('Type', ''),
+      dest_disk.get('Name', 'Unknown'),
+      dest_disk.get('Size', ''),
+      ),
+    warning = True)
+  for par in dest_disk['Partitions']:
     show_data(
-        message = 'Boot Method:',
-        data = 'UEFI (GPT)' if dest_disk['Use GPT'] else 'Legacy (MBR)')
-    show_data(message='Using Image:', data=windows_image['Path'])
-    show_data(
-        message = 'ERASING:',
-        data = '[{}] ({}) {} {}\n'.format(
-            dest_disk.get('Table', ''),
-            dest_disk.get('Type', ''),
-            dest_disk.get('Name', 'Unknown'),
-            dest_disk.get('Size', ''),
-            ),
-        warning = True)
-    for par in dest_disk['Partitions']:
-        show_data(
-            message = 'Partition {}:'.format(par['Number']),
-            data = par['Display String'],
-            warning = True)
-    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 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?')):
-        raise GenericAbort
+      message = 'Partition {}:'.format(par['Number']),
+      data = par['Display String'],
+      warning = True)
+  print_warning(dest_disk['Format Warnings'])
 
-    # 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
+  if (not ask('Is this correct?')):
+    raise GenericAbort
 
-    # 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
+  # Safety check
+  print_standard('\nSAFETY CHECK')
+  print_warning('All data will be DELETED from the '
+          'disk 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?')):
+    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)
+  # Remove volume letters so S, T, & W can be used below
+  try_and_print(
+    message = 'Removing volume letters...',
+    function = remove_volume_letters,
+    other_results = other_results,
+    keep=windows_image['Letter'])
+
+  # Assign new letter for local source if necessary
+  if windows_image['Local'] and windows_image['Letter'] in ['S', 'T', 'W']:
+    new_letter = try_and_print(
+      message = 'Reassigning source volume letter...',
+      function = reassign_volume_letter,
+      other_results = other_results,
+      letter=windows_image['Letter'])
+    windows_image['Path'] = '{}{}'.format(
+      new_letter, windows_image['Path'][1:])
+    windows_image['Letter'] = 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)
+
+  # Copy WinPE log(s)
+  source = r'{}\Logs'.format(global_vars['ClientDir'])
+  dest = r'W:\{}\Logs\WinPE'.format(KIT_NAME_SHORT)
+  shutil.copytree(source, dest)
+
+  # Print summary
+  print_standard('\nDone.')
+  if 'LogFile' in global_vars and ask('\nReview log?'):
+    cmd = [
+      global_vars['Tools']['NotepadPlusPlus'],
+      global_vars['LogFile']]
+    try:
+      popen_program(cmd)
+    except Exception:
+      print_error('ERROR: Failed to open log.')
+      sleep(30)
+  pause('\nPress Enter to return to main menu... ')
 
-    # Print summary
-    print_standard('\nDone.')
-    if 'LogFile' in global_vars and ask('\nReview log?'):
-        cmd = [
-            global_vars['Tools']['NotepadPlusPlus'],
-            global_vars['LogFile']]
-        try:
-            popen_program(cmd)
-        except Exception:
-            print_error('ERROR: Failed to open log.')
-            sleep(30)
-    pause('\nPress Enter to return to main menu... ')
 
 def menu_tools():
-    """Tool launcher menu."""
-    tools = [{'Name': k} for k in sorted(PE_TOOLS.keys())]
-    actions = [{'Name': 'Main Menu', 'Letter': 'M'},]
-    set_title(KIT_NAME_FULL)
+  """Tool launcher menu."""
+  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()):
+      name = tools[int(selection)-1]['Name']
+      cmd = [PE_TOOLS[name]['Path']] + PE_TOOLS[name].get('Args', [])
+      if name == '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 {}'.format(name))
+        sleep(2)
+        pause()
+    elif (selection == 'M'):
+      break
 
-    # Menu loop
-    while True:
-        selection = menu_select(
-            title = 'Tools Menu',
-            main_entries = tools,
-            action_entries = actions)
-        if (selection.isnumeric()):
-            name = tools[int(selection)-1]['Name']
-            cmd = [PE_TOOLS[name]['Path']] + PE_TOOLS[name].get('Args', [])
-            if name == '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 {}'.format(name))
-                sleep(2)
-                pause()
-        elif (selection == 'M'):
-            break
 
 def select_minidump_path():
-    """Select BSOD minidump path from a menu."""
-    dumps = []
+  """Select BSOD minidump path from a menu."""
+  dumps = []
 
-    # Assign volume letters first
-    assign_volume_letters()
+  # Assign volume letters first
+  assign_volume_letters()
 
-    # Search for minidumps
-    set_thread_error_mode(silent=True) # Prevents "No disk" popups
-    for d in psutil.disk_partitions():
-        if global_vars['Env']['SYSTEMDRIVE'].upper() in d.mountpoint:
-            # Skip RAMDisk
-            continue
-        if os.path.exists(r'{}Windows\MiniDump'.format(d.mountpoint)):
-            dumps.append({'Name': r'{}Windows\MiniDump'.format(d.mountpoint)})
-    set_thread_error_mode(silent=False) # Return to normal
+  # Search for minidumps
+  set_thread_error_mode(silent=True) # Prevents "No disk" popups
+  for d in psutil.disk_partitions():
+    if global_vars['Env']['SYSTEMDRIVE'].upper() in d.mountpoint:
+      # Skip RAMDisk
+      continue
+    if os.path.exists(r'{}Windows\MiniDump'.format(d.mountpoint)):
+      dumps.append({'Name': r'{}Windows\MiniDump'.format(d.mountpoint)})
+  set_thread_error_mode(silent=False) # Return to normal
 
-    # Check results before showing menu
-    if len(dumps) == 0:
-        print_error('ERROR: No BSoD / MiniDump paths found')
-        sleep(2)
-        return None
+  # Check results before showing menu
+  if len(dumps) == 0:
+    print_error('ERROR: No BSoD / MiniDump paths found')
+    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']
 
-    # 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.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/hw-diags

@@ -1,43 +1,11 @@
 #!/bin/bash
 #
-## Wizard Kit: HW Diagnostics - Menu Launcher
+## Wizard Kit: HW Diagnostics Launcher
+
+source launch-in-tmux
 
 SESSION_NAME="hw-diags"
 WINDOW_NAME="Hardware Diagnostics"
-MENU="hw-diags-menu"
-
-function ask() {
-    while :; do
-        read -p "$1 " -r answer
-        if echo "$answer" | egrep -iq '^(y|yes|sure)$'; then
-            return 0
-        elif echo "$answer" | egrep -iq '^(n|no|nope)$'; then
-            return 1
-        fi
-    done
-}
-
-die () {
-    echo "$0:" "$@" >&2
-    exit 1
-}
-
-# Check for running session
-if tmux list-session | grep -q "$SESSION_NAME"; then
-    echo "WARNING: hw-diags tmux session already exists."
-    echo ""
-    if ask "Kill current session?"; then
-        tmux kill-session -t "$SESSION_NAME" || \
-            die "Failed to kill session: $SESSION_NAME"
-    else
-        echo "Aborted."
-        echo ""
-        echo -n "Press Enter to exit... "
-        read -r
-        exit 0
-    fi
-fi
-
-# Start session
-tmux new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$MENU" $*
+TMUX_CMD="hw-diags-menu"
 
+launch_in_tmux "$@"

.bin/Scripts/hw-diags-audio

@@ -6,37 +6,37 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.common import *
 init_global_vars()
 
 if __name__ == '__main__':
+  try:
+    # Prep
+    clear_screen()
+    print_standard('Hardware Diagnostics: Audio\n')
+
+    # Set volume
     try:
-        # Prep
-        clear_screen()
-        print_standard('Hardware Diagnostics: Audio\n')
+      run_program('amixer -q set "Master" 80% unmute'.split())
+      run_program('amixer -q set "PCM" 90% unmute'.split())
+    except subprocess.CalledProcessError:
+      print_error('Failed to set volume')
 
-        # Set volume
-        try:
-            run_program('amixer -q set "Master" 80% unmute'.split())
-            run_program('amixer -q set "PCM" 90% unmute'.split())
-        except subprocess.CalledProcessError:
-            print_error('Failed to set volume')
-        
-        # Run tests
-        for mode in ['pink', 'wav']:
-            run_program(
-                cmd = 'speaker-test -c 2 -l 1 -t {}'.format(mode).split(),
-                check = False,
-                pipe = False)
-        
-        # Done
-        #print_standard('\nDone.')
-        #pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+    # Run tests
+    for mode in ['pink', 'wav']:
+      run_program(
+        cmd = 'speaker-test -c 2 -l 1 -t {}'.format(mode).split(),
+        check = False,
+        pipe = False)
 
+    # Done
+    #print_standard('\nDone.')
+    #pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/hw-diags-badblocks

@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-## Wizard Kit: HW Diagnostics - badblocks
-
-function usage {
-    echo "Usage: $0 device log-file"
-    echo "  e.g. $0 /dev/sda /tmp/tmp.XXXXXXX/badblocks.log"
-}
-
-# Bail early
-if [ ! -b "$1" ]; then
-    usage
-    exit 1
-fi
-
-# Run Badblocks
-sudo badblocks -sv -e 1 "$1" 2>&1 | tee -a "$2"
-

.bin/Scripts/hw-diags-iobenchmark

@@ -0,0 +1,18 @@
+#!/bin/bash
+#
+## Wizard Kit: HW Diagnostics - Benchmarks
+
+function usage {
+    echo "Usage: ${0} device log-file"
+    echo "  e.g. ${0} /dev/sda /tmp/tmp.XXXXXXX/benchmarks.log"
+}
+
+# Bail early
+if [ ! -b "${1}" ]; then
+    usage
+    exit 1
+fi
+
+# Run Benchmarks
+echo 3 | sudo tee -a /proc/sys/vm/drop_caches >/dev/null 2>&1
+sudo dd bs=4M if="${1}" of=/dev/null status=progress 2>&1 | tee -a "${2}"

.bin/Scripts/hw-diags-menu

@@ -6,25 +6,61 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.hw_diags import *
+from functions.tmux import *
 init_global_vars()
 
 if __name__ == '__main__':
-    try:
-        # Prep
-        clear_screen()
+  # Show menu
+  try:
+    state = State()
+    menu_diags(state, sys.argv)
+  except KeyboardInterrupt:
+    print_standard(' ')
+    print_warning('Aborted')
+    print_standard(' ')
+    sleep(1)
+    pause('Press Enter to exit...')
+  except SystemExit as sys_exit:
+    tmux_switch_client()
+    exit_script(sys_exit.code)
+  except:
+    # Cleanup
+    tmux_kill_all_panes()
 
-        # Show menu
-        menu_diags(*sys.argv)
-        
-        # Done
-        #print_standard('\nDone.')
-        #pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+    if DEBUG_MODE:
+      # Custom major exception
+      print_standard(' ')
+      print_error('Major exception')
+      print_warning(SUPPORT_MESSAGE)
+      print(traceback.format_exc())
+      print_log(traceback.format_exc())
 
+      # Save debug reports and upload data
+      try_and_print(
+        message='Saving debug reports...',
+        function=save_debug_reports,
+        state=state, global_vars=global_vars)
+      question = 'Upload crash details to {}?'.format(CRASH_SERVER['Name'])
+      if ENABLED_UPLOAD_DATA and ask(question):
+        try_and_print(
+          message='Uploading Data...',
+          function=upload_logdir,
+          global_vars=global_vars)
+
+      # Done
+      sleep(1)
+      pause('Press Enter to exit...')
+      exit_script(1)
+
+    else:
+      # "Normal" major exception
+      major_exception()
+
+  # Done
+  tmux_kill_all_panes()
+  tmux_switch_client()
+  exit_script()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/hw-diags-network

@@ -6,41 +6,43 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.network import *
 
+
 def check_connection():
-    if not is_connected():
-        # Raise to cause NS in try_and_print()
-        raise Exception
+  if not is_connected():
+    # Raise to cause NS in try_and_print()
+    raise Exception
+
 
 if __name__ == '__main__':
-    try:
-        # Prep
-        clear_screen()
-        print_standard('Hardware Diagnostics: Network\n')
+  try:
+    # Prep
+    clear_screen()
+    print_standard('Hardware Diagnostics: Network\n')
 
-        # Connect
-        print_standard('Initializing...')
-        connect_to_network()
+    # Connect
+    print_standard('Initializing...')
+    connect_to_network()
 
-        # Tests
-        try_and_print(
-            message='Network connection:', function=check_connection, cs='OK')
-        show_valid_addresses()
-        try_and_print(message='Internet connection:', function=ping,
-            addr='8.8.8.8', cs='OK')
-        try_and_print(message='DNS Resolution:', function=ping, cs='OK')
-        try_and_print(message='Speedtest:', function=speedtest,
-            print_return=True)
-        
-        # Done
-        print_standard('\nDone.')
-        #pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+    # Tests
+    try_and_print(
+      message='Network connection:', function=check_connection, cs='OK')
+    show_valid_addresses()
+    try_and_print(message='Internet connection:', function=ping,
+      addr='8.8.8.8', cs='OK')
+    try_and_print(message='DNS Resolution:', function=ping, cs='OK')
+    try_and_print(message='Speedtest:', function=speedtest,
+      print_return=True)
 
+    # Done
+    print_standard('\nDone.')
+    #pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/hw-diags-prime95

@@ -14,5 +14,6 @@ if [ ! -d "$1" ]; then
 fi
 
 # Run Prime95
-mprime -t | grep -iv --line-buffered 'stress.txt' | tee -a "$1/prime.log"
+cd "$1"
+mprime -t | grep -iv --line-buffered 'stress.txt' | tee -a "prime.log"
 

.bin/Scripts/hw-drive-info

@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+
+BLUE='\033[34m'
+CLEAR='\033[0m'
+IFS=$'\n'
+
+# List devices
+for line in $(lsblk -do NAME,TRAN,SIZE,VENDOR,MODEL,SERIAL); do
+    if [[ "${line:0:4}" == "NAME" ]]; then
+        echo -e "${BLUE}${line}${CLEAR}"
+    else
+        echo "${line}"
+    fi
+done
+echo ""
+
+# List loopback devices
+if [[ "$(losetup -l | wc -l)" > 0 ]]; then
+    for line in $(losetup -lO NAME,PARTSCAN,RO,BACK-FILE); do
+        if [[ "${line:0:4}" == "NAME" ]]; then
+            echo -e "${BLUE}${line}${CLEAR}"
+        else
+            echo "${line}" | sed -r 's#/dev/(loop[0-9]+)#\1     #'
+        fi
+    done
+    echo ""
+fi
+
+# List partitions
+for line in $(lsblk -o NAME,SIZE,FSTYPE,LABEL,MOUNTPOINT); do
+    if [[ "${line:0:4}" == "NAME" ]]; then
+        echo -e "${BLUE}${line}${CLEAR}"
+    else
+        echo "${line}"
+    fi
+done
+echo ""
+

.bin/Scripts/hw-info

@@ -0,0 +1,107 @@
+#!/bin/bash
+#
+
+# COLORS
+CLEAR="\e[0m"
+RED="\e[31m"
+GREEN="\e[32m"
+YELLOW="\e[33m"
+BLUE="\e[34m"
+
+function print_in_columns() {
+    string="$1"
+    label="$(echo "$string" | sed -r 's/^\s*(.*:).*/\1/')"
+    value="$(echo "$string" | sed -r 's/^\s*.*:\s*(.*)/\1/')"
+    printf '    %-18s%s\n' "$label" "$value"
+}
+
+function print_dmi_value() {
+    name="$1"
+    file="/sys/devices/virtual/dmi/id/$2"
+    value="UNKNOWN"
+    if [[ -e "$file" ]]; then
+        value="$(cat "$file")"
+    fi
+    print_in_columns "$name: $value"
+}
+
+# System
+echo -e "${BLUE}System Information${CLEAR}"
+print_dmi_value "Vendor" "sys_vendor"
+print_dmi_value "Name" "product_name"
+print_dmi_value "Serial" "product_serial"
+echo ""
+
+# Motherboard
+echo -e "${BLUE}Motherboard${CLEAR}"
+print_dmi_value "Vendor" "board_vendor"
+print_dmi_value "Name" "board_name"
+print_dmi_value "Version" "board_version"
+print_dmi_value "Serial" "board_serial"
+echo ""
+
+# BIOS
+echo -e "${BLUE}BIOS${CLEAR}"
+print_dmi_value "Vendor" "bios_vendor"
+print_dmi_value "Version" "bios_version"
+print_dmi_value "Release Date" "bios_date"
+echo ""
+
+# Processor
+echo -e "${BLUE}Processor${CLEAR}"
+lscpu | grep -E '^(Arch|CPU.s.|Core|Thread|Model name|Virt)' \
+    | sed -r 's/\(s\)(.*:)/s\1  /' \
+    | sed -r 's/CPUs:   /Threads:/' \
+    | sed -r 's/^(.*:)   /    \1/'
+echo ""
+
+# Memory
+echo -e "${BLUE}Memory${CLEAR}"
+first_device="True"
+while read -r line; do
+    if [[ "$line" == "Memory Device" ]]; then
+        if [[ "$first_device" == "True" ]]; then
+            first_device="False"
+        else
+            # Add space between devices
+            echo ""
+        fi
+    else
+        print_in_columns "$line"
+    fi
+done <<< $(sudo dmidecode -t memory \
+    | grep -E '^(Memory Device|\s+(Type|Size|Speed|Manuf.*|Locator|Part Number):)')
+echo ""
+
+# Graphics
+echo -e "${BLUE}Graphics${CLEAR}"
+lspci | grep 'VGA' | sed -r 's/^.*:/    Device:          /' \
+    | sed 's/Intel Corporation/Intel/' \
+    | sed 's/Generation Core Processor Family/Gen/' \
+    | sed 's/Integrated Graphics Controller.*/iGPU/'
+glxinfo 2>/dev/null | grep 'OpenGL renderer' | sed -r 's/^.*:/    OpenGL Renderer: /' \
+    | sed 's/Mesa DRI //'
+echo ""
+
+# Audio
+echo -e "${BLUE}Audio${CLEAR}"
+while read -r line; do
+    if [[ "$line" =~ .*no.soundcards.found.* ]]; then
+        echo "    No soundcards found"
+    else
+        print_in_columns "$line"
+    fi
+done <<< $(aplay -l 2>&1 | grep -Ei '(^card|no soundcards found)' | sed -r 's/.*\[(.*)\].*\[(.*)\].*/\1: \2/')
+echo ""
+
+# Network
+echo -e "${BLUE}Network${CLEAR}"
+lspci | grep -Ei '(ethernet|network|wireless|wifi)' \
+    | sed -r 's/.*: (.*)$/    \1/'
+echo ""
+
+# Drives
+echo -e "${BLUE}Drives${CLEAR}"
+hw-drive-info | sed 's/^/    /'
+echo ""
+

.bin/Scripts/hw-sensors

@@ -1,164 +1,10 @@
-#!/bin/python3
+#!/bin/bash
 #
 ## Wizard Kit: Sensor monitoring tool
 
-import itertools
-import os
-import shutil
-import sys
+WINDOW_NAME="Hardware Sensors"
+MONITOR="hw-sensors-monitor"
 
-# Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
-from functions.common import *
-from borrowed import sensors
-
-# STATIC VARIABLES
-COLORS = {
-    'CLEAR': '\033[0m',
-    'RED': '\033[31m',
-    'GREEN': '\033[32m',
-    'YELLOW': '\033[33m',
-    'ORANGE': '\033[31;1m',
-    'BLUE': '\033[34m'
-    }
-TEMP_LIMITS = {
-    'GREEN':  60,
-    'YELLOW': 70,
-    'ORANGE': 80,
-    'RED':    90,
-    }
-
-# REGEX
-REGEX_COLORS = re.compile(r'\033\[\d+;?1?m')
-
-def color_temp(temp):
-    try:
-        temp = float(temp)
-    except ValueError:
-        return '{YELLOW}{temp}{CLEAR}'.format(temp=temp, **COLORS)
-    if temp > TEMP_LIMITS['RED']:
-        color = COLORS['RED']
-    elif temp > TEMP_LIMITS['ORANGE']:
-        color = COLORS['ORANGE']
-    elif temp > TEMP_LIMITS['YELLOW']:
-        color = COLORS['YELLOW']
-    elif temp > TEMP_LIMITS['GREEN']:
-        color = COLORS['GREEN']
-    elif temp > 0:
-        color = COLORS['BLUE']
-    else:
-        color = COLORS['CLEAR']
-    return '{color}{prefix}{temp:2.0f}°C{CLEAR}'.format(
-        color = color,
-        prefix = '-' if temp < 0 else '',
-        temp = temp,
-        **COLORS)
-
-def get_feature_string(chip, feature):
-    sfs = list(sensors.SubFeatureIterator(chip, feature)) # get a list of all subfeatures
-    label = sensors.get_label(chip, feature)
-    skipname = len(feature.name)+1 # skip common prefix
-    data = {}
-
-    if feature.type != sensors.feature.TEMP:
-        # Skip non-temperature sensors
-        return None
-    
-    for sf in sfs:
-        name = sf.name[skipname:].decode("utf-8").strip()
-        val = sensors.get_value(chip, sf.number)
-        if 'alarm' in name:
-            # Skip
-            continue
-        if '--nocolor' in sys.argv:
-            try:
-                temp = float(val)
-            except ValueError:
-                data[name] = ' {}°C'.format(val)
-            else:
-                data[name] = '{}{:2.0f}°C'.format(
-                    '-' if temp < 0 else '',
-                    temp)
-        else:
-            data[name] = color_temp(val)
-    
-    main_temp = data.pop('input', None)
-    if main_temp:
-        list_data = []
-        for item in ['max', 'crit']:
-            if item in data:
-                list_data.append('{}: {}'.format(item, data.pop(item)))
-        list_data.extend(
-            ['{}: {}'.format(k, v) for k, v in sorted(data.items())])
-        data_str = '{:18}  {} {}'.format(
-            label, main_temp, ', '.join(list_data))
-    else:
-        list_data.extend(sorted(data.items()))
-        list_data = ['{}: {}'.format(item[0], item[1]) for item in list_data]
-        data_str = '{:18}  {}'.format(label, ', '.join(list_data))
-    return data_str
-
-def join_columns(column1, column2, width=55):
-    return '{:<{}}{}'.format(
-        column1,
-        55+len(column1)-len(REGEX_COLORS.sub('', column1)),
-        column2)
-
-if __name__ == '__main__':
-    try:
-        # Prep
-        sensors.init()
-
-        # Get sensor data
-        chip_temps = {}
-        for chip in sensors.ChipIterator():
-            chip_name = '{} ({})'.format(
-                sensors.chip_snprintf_name(chip),
-                sensors.get_adapter_name(chip.bus))
-            chip_feats = [get_feature_string(chip, feature)
-                for feature in sensors.FeatureIterator(chip)]
-            # Strip empty/None items
-            chip_feats = [f for f in chip_feats if f]
-        
-            if chip_feats:
-                chip_temps[chip_name] = [chip_name, *chip_feats, '']
-
-        # Sort chips
-        sensor_temps = []
-        for chip in [k for k in sorted(chip_temps.keys()) if 'coretemp' in k]:
-            sensor_temps.extend(chip_temps[chip])
-        for chip in  sorted(chip_temps.keys()):
-            if 'coretemp' not in chip:
-                sensor_temps.extend(chip_temps[chip])
-
-        # Wrap columns as needed
-        screen_size = shutil.get_terminal_size()
-        rows = screen_size.lines - 1
-        if len(sensor_temps) > rows and screen_size.columns > 55*2:
-            sensor_temps = list(itertools.zip_longest(
-            sensor_temps[:rows], sensor_temps[rows:], fillvalue=''))
-            sensor_temps = [join_columns(a, b) for a, b in sensor_temps]
-        
-        # Print data
-        if sensor_temps:
-            for line in sensor_temps:
-                print_standard(line)
-        else:
-            if '--nocolor' in sys.argv:
-                print_standard('WARNING: No sensors found')
-                print_standard('\nPlease monitor temps manually')
-            else:
-                print_warning('WARNING: No sensors found')
-                print_standard('\nPlease monitor temps manually')
-
-        # Done
-        sensors.cleanup()
-        exit_script()
-    except SystemExit:
-        sensors.cleanup()
-        pass
-    except:
-        sensors.cleanup()
-        major_exception()
+# Start session
+tmux new-session -n "$WINDOW_NAME" "$MONITOR"
 

.bin/Scripts/hw-sensors-monitor

@@ -0,0 +1,36 @@
+#!/bin/python3
+#
+## Wizard Kit: Sensor monitoring tool
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from functions.sensors import *
+from functions.tmux import *
+init_global_vars(silent=True)
+
+if __name__ == '__main__':
+  background = False
+  try:
+    if len(sys.argv) > 1 and os.path.exists(sys.argv[1]):
+      background = True
+      monitor_file = sys.argv[1]
+      monitor_pane = None
+    else:
+      result = run_program(['mktemp'])
+      monitor_file = result.stdout.decode().strip()
+    if not background:
+      monitor_pane = tmux_split_window(
+        percent=1, vertical=True, watch=monitor_file)
+      cmd = ['tmux', 'resize-pane', '-Z', '-t', monitor_pane]
+      run_program(cmd, check=False)
+    monitor_sensors(monitor_pane, monitor_file)
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/init_client_dir.cmd

@@ -27,13 +27,13 @@ set iso_date=%_yyyy%-%_mm%-%_dd%
 
 :SetVars
 set "SETTINGS=%bin%\Scripts\settings\main.py"
-for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_SHORT %SETTINGS%`) do (
+for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_SHORT "%SETTINGS%"`) do (
     set "_v=%%f"
     set "_v=!_v:*'=!"
     set "KIT_NAME_SHORT=!_v:~0,-1!"
 )
 set "client_dir=%systemdrive%\%KIT_NAME_SHORT%"
-set "log_dir=%client_dir%\Info\%iso_date%"
+set "log_dir=%client_dir%\Logs\%iso_date%"
 
 :Flags
 set _backups=
@@ -45,7 +45,7 @@ set _transfer=
 for %%f in (%*) do (
     if /i "%%f" == "/DEBUG" (@echo on)
     if /i "%%f" == "/Backups" set _backups=True
-    if /i "%%f" == "/Info" set _info=True
+    if /i "%%f" == "/Logs" set _logs=True
     if /i "%%f" == "/Office" set _office=True
     if /i "%%f" == "/Quarantine" set _quarantine=True
     if /i "%%f" == "/QuickBooks" set _quickbooks=True
@@ -54,7 +54,9 @@ for %%f in (%*) do (
 
 :CreateDirs
 if defined _backups mkdir "%client_dir%\Backups">nul 2>&1
-if defined _info mkdir "%client_dir%\Info">nul 2>&1
+if defined _logs (
+    mkdir "%log_dir%\%KIT_NAME_FULL%">nul 2>&1
+    mkdir "%log_dir%\Tools">nul 2>&1)
 if defined _office mkdir "%client_dir%\Office">nul 2>&1
 if defined _quarantine mkdir "%client_dir%\Quarantine">nul 2>&1
 if defined _quickbooks mkdir "%client_dir%\QuickBooks">nul 2>&1

.bin/Scripts/install_sw_bundle.py

@@ -4,57 +4,60 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.setup import *
 init_global_vars()
 os.system('title {}: SW Bundle Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\Install SW Bundle.log'.format(**global_vars)
+set_log_file('Install SW Bundle.log')
 
 if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: SW Bundle Tool\n'.format(KIT_NAME_FULL))
-        other_results = {
-            'Error': {
-                'CalledProcessError':   'Unknown Error',
-            },
-            'Warning': {
-                'GenericRepair':        'Repaired',
-                'UnsupportedOSError':   'Unsupported OS',
-            }}
-        answer_extensions = ask('Install Extensions?')
-        answer_adobe_reader = ask('Install Adobe Reader?')
-        answer_vcr = ask('Install Visual C++ Runtimes?')
-        answer_ninite = ask('Install Ninite Bundle?')
-        if answer_ninite and global_vars['OS']['Version'] in ['7']:
-            # Vista is dead, not going to check for it
-            answer_mse = ask('Install MSE?')
-        else:
-            answer_mse = False
-        
-        print_info('Installing Programs')
-        if answer_adobe_reader:
-            install_adobe_reader()
-        if answer_vcr:
-            install_vcredists()
-        if answer_ninite:
-            try_and_print(message='Ninite bundle...',
-                function=install_ninite_bundle, cs='Started', mse=answer_mse)
-        if answer_extensions:
-            wait_for_process('ninite.exe')
-            print_info('Installing Extensions')
-            try_and_print(message='Classic Shell skin...',
-                function=install_classicstart_skin,
-                other_results=other_results)
-            try_and_print(message='Google Chrome extensions...',
-                function=install_chrome_extensions)
-            try_and_print(message='Mozilla Firefox extensions...',
-                function=install_firefox_extensions)
-        print_standard('\nDone.')
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: SW Bundle Tool\n'.format(KIT_NAME_FULL))
+    other_results = {
+      'Error': {
+        'CalledProcessError':   'Unknown Error',
+        'FileNotFoundError':  'File not found',
+      },
+      'Warning': {
+        'GenericRepair':    'Repaired',
+        'UnsupportedOSError':   'Unsupported OS',
+      }}
+    answer_extensions = ask('Install Extensions?')
+    answer_vcr = ask('Install Visual C++ Runtimes?')
+    answer_ninite = ask('Install Ninite Bundle?')
+    if answer_ninite and global_vars['OS']['Version'] in ['7']:
+      # Vista is dead, not going to check for it
+      answer_mse = ask('Install MSE?')
+    else:
+      answer_mse = False
+
+    print_info('Installing Programs')
+    if answer_vcr:
+      install_vcredists()
+    if answer_ninite:
+      result = try_and_print(message='Ninite bundle...',
+        function=install_ninite_bundle, cs='Started',
+        mse=answer_mse, other_results=other_results)
+      for proc in result['Out']:
+        # Wait for all processes to finish
+        proc.wait()
+    if answer_extensions:
+      print_info('Installing Extensions')
+      try_and_print(message='Classic Shell skin...',
+        function=install_classicstart_skin,
+        other_results=other_results)
+      try_and_print(message='Google Chrome extensions...',
+        function=install_chrome_extensions)
+      try_and_print(message='Mozilla Firefox extensions...',
+        function=install_firefox_extensions,
+        other_results=other_results)
+    print_standard('\nDone.')
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/install_vcredists.py

@@ -4,31 +4,32 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.setup import *
 init_global_vars()
 os.system('title {}: Install Visual C++ Runtimes'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\Install Visual C++ Runtimes.log'.format(**global_vars)
+set_log_file('Install Visual C++ Runtimes.log')
 
 if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: Install Visual C++ Runtimes\n'.format(KIT_NAME_FULL))
-        other_results = {
-            'Error': {
-                'CalledProcessError':   'Unknown Error',
-            }}
-        
-        if ask('Install Visual C++ Runtimes?'):
-            install_vcredists()
-        else:
-            abort()
-        
-        print_standard('\nDone.')
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: Install Visual C++ Runtimes\n'.format(KIT_NAME_FULL))
+    other_results = {
+      'Error': {
+        'CalledProcessError':   'Unknown Error',
+      }}
+
+    if ask('Install Visual C++ Runtimes?'):
+      install_vcredists()
+    else:
+      abort()
+
+    print_standard('\nDone.')
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/launch-in-tmux

@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+## Wizard Kit: TMUX Launcher
+
+function ask() {
+    while :; do
+        read -p "$1 [Y/N] " -r answer
+        if echo "$answer" | grep -Eiq '^(y|yes|sure)$'; then
+            return 0
+        elif echo "$answer" | grep -Eiq '^(n|no|nope)$'; then
+            return 1
+        fi
+    done
+}
+
+die () {
+    echo "$0:" "$@" >&2
+    exit 1
+}
+
+function launch_in_tmux() {
+  # Check for required vars
+  [[ -n "${SESSION_NAME:-}" ]] || die "Required variable missing (SESSION_NAME)"
+  [[ -n "${WINDOW_NAME:-}" ]] || die "Required variable missing (WINDOW_NAME)"
+  [[ -n "${TMUX_CMD:-}" ]] || die "Required variable missing (TMUX_CMD)"
+
+  # Check for running session
+  if tmux list-session | grep -q "$SESSION_NAME"; then
+      echo "WARNING: tmux session $SESSION_NAME already exists."
+      echo ""
+      if ask "Connect to current session?"; then
+          if [[ -n "${TMUX:-}" ]]; then
+              # Running inside TMUX, switch to session
+              tmux switch-client -t "$SESSION_NAME"
+          else
+              # Running outside TMUX, attach to session
+              tmux attach-session -t "$SESSION_NAME"
+          fi
+          exit 0
+      elif ask "Kill current session and start new session?"; then
+          tmux kill-session -t "$SESSION_NAME" || \
+              die "Failed to kill session: $SESSION_NAME"
+      else
+          echo "Aborted."
+          echo ""
+          echo -n "Press Enter to exit... "
+          read -r
+          exit 0
+      fi
+  fi
+
+  # Start/Rename session
+  if [[ -n "${TMUX:-}" ]]; then
+      # Running inside TMUX, rename session/window and open the menu
+      tmux rename-session "$SESSION_NAME"
+      tmux rename-window "$WINDOW_NAME"
+      "$TMUX_CMD" "$@"
+      tmux rename-session "${SESSION_NAME}_DONE"
+      tmux rename-window "${WINDOW_NAME}_DONE"
+  else
+      # Running outside TMUX, start/attach to session
+      tmux new-session -s "$SESSION_NAME" -n "$WINDOW_NAME" "$TMUX_CMD" "$@"
+  fi
+}

.bin/Scripts/mount-all-volumes

@@ -6,33 +6,33 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.data import *
 init_global_vars()
 
 if __name__ == '__main__':
-    try:
-        # Prep
-        clear_screen()
-        print_standard('{}: Volume mount tool'.format(KIT_NAME_FULL))
+  try:
+    # Prep
+    clear_screen()
+    print_standard('{}: Volume mount tool'.format(KIT_NAME_FULL))
 
-        # Mount volumes
-        report = mount_all_volumes()
+    # Mount volumes
+    report = mount_volumes(all_devices=True)
 
-        # Print report
-        print_info('\nResults')
-        for line in report:
-            show_data(indent=4, width=16, **line[-1])
+    # Print report
+    print_info('\nResults')
+    for vol_name, vol_data in sorted(report.items()):
+      show_data(indent=4, width=20, **vol_data['show_data'])
 
-        # Done
-        print_standard('\nDone.')
-        if 'gui' in sys.argv:
-            pause("Press Enter to exit...")
-            popen_program(['nohup', 'thunar', '/media'])
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+    # Done
+    print_standard('\nDone.')
+    if 'gui' in sys.argv:
+      pause("Press Enter to exit...")
+      popen_program(['nohup', 'thunar', '/media'], pipe=True)
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
 
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/mount-backup-shares

@@ -6,33 +6,30 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.data import *
 from functions.network import *
 init_global_vars()
 
 if __name__ == '__main__':
-    try:
-        # Prep
-        clear_screen()
+  try:
+    # Prep
+    clear_screen()
 
-        # Connect
-        connect_to_network()
+    # Mount
+    if is_connected():
+      mount_backup_shares(read_write=True)
+    else:
+      # Couldn't connect
+      print_error('ERROR: No network connectivity.')
 
-        # Mount
-        if is_connected():
-            mount_backup_shares()
-        else:
-            # Couldn't connect
-            print_error('ERROR: No network connectivity.')
-        
-        # Done
-        print_standard('\nDone.')
-        #pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+    # Done
+    print_standard('\nDone.')
+    #pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
 
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/mount-raw-image

@@ -24,7 +24,7 @@ if [[ -f "${1:-}" ]]; then
         done
     else
         # losetup did not detect partitions, attempt whole image
-        udevil mount -o to "${LOOPDEV}" || true
+        udevil mount -o ro "${LOOPDEV}" || true
     fi
 else
     usage

.bin/Scripts/msword-search

@@ -9,73 +9,76 @@ import sys
 # STATIC VARIABLES
 SCANDIR = os.getcwd()
 USAGE = '''Usage: {script} <search-terms>...
-    e.g.  {script} "Book Title" "Keyword" "etc"
+  e.g.  {script} "Book Title" "Keyword" "etc"
 
-    This script will search all doc/docx files below the current directory for
-    the search-terms provided (case-insensitive).'''.format(script=__file__)
+  This script will search all doc/docx files below the current directory for
+  the search-terms provided (case-insensitive).'''.format(script=__file__)
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.network import *
 init_global_vars()
 
 REGEX_DOC_FILES = re.compile(r'\.docx?$', re.IGNORECASE)
 
+
 def scan_for_docs(path):
-    for entry in os.scandir(path):
-        if entry.is_dir(follow_symlinks=False):
-            yield from scantree(entry.path)
-        elif entry.is_file and REGEX_DOC_FILES.search(entry.name):
-            yield entry
+  for entry in os.scandir(path):
+    if entry.is_dir(follow_symlinks=False):
+      yield from scan_for_docs(entry.path)
+    elif entry.is_file and REGEX_DOC_FILES.search(entry.name):
+      yield entry
+
 
 def scan_file(file_path, search):
-    match = False
-    try:
-        if entry.name.lower().endswith('.docx'):
-            result = run_program(['unzip', '-p', entry.path])
-        else:
-            # Assuming .doc
-            result = run_program(['antiword', entry.path])
-        out = result.stdout.decode()
-        match = re.search(search, out, re.IGNORECASE)
-    except Exception:
-        # Ignore errors since files may be corrupted
-        pass
-    
-    return entry.path if match else None
+  match = False
+  try:
+    if entry.name.lower().endswith('.docx'):
+      result = run_program(['unzip', '-p', entry.path])
+    else:
+      # Assuming .doc
+      result = run_program(['antiword', entry.path])
+    out = result.stdout.decode()
+    match = re.search(search, out, re.IGNORECASE)
+  except Exception:
+    # Ignore errors since files may be corrupted
+    pass
+
+  return entry.path if match else None
+
 
 if __name__ == '__main__':
-    try:
-        # Prep
-        clear_screen()
-        terms = [re.sub(r'\s+', r'\s*', t) for t in sys.argv[1:]]
-        search = '({})'.format('|'.join(terms))
+  try:
+    # Prep
+    clear_screen()
+    terms = [re.sub(r'\s+', r'\s*', t) for t in sys.argv[1:]]
+    search = '({})'.format('|'.join(terms))
 
-        if len(sys.argv) == 1:
-            # Print usage
-            print_standard(USAGE)
-        else:
-            matches = []
-            for entry in scan_for_docs(SCANDIR):
-                matches.append(scan_file(entry.path, search))
-            # Strip None values (i.e. non-matching entries)
-            matches = [m for m in matches if m]
-            if matches:
-                print_success('Found {} {}:'.format(
-                    len(matches),
-                    'Matches' if len(matches) > 1 else 'Match'))
-                for match in matches:
-                    print_standard(match)
-            else:
-                print_error('No matches found.')
-        
-        # Done
-        print_standard('\nDone.')
-        #pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+    if len(sys.argv) == 1:
+      # Print usage
+      print_standard(USAGE)
+    else:
+      matches = []
+      for entry in scan_for_docs(SCANDIR):
+        matches.append(scan_file(entry.path, search))
+      # Strip None values (i.e. non-matching entries)
+      matches = [m for m in matches if m]
+      if matches:
+        print_success('Found {} {}:'.format(
+          len(matches),
+          'Matches' if len(matches) > 1 else 'Match'))
+        for match in matches:
+          print_standard(match)
+      else:
+        print_error('No matches found.')
 
+    # Done
+    print_standard('\nDone.')
+    #pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/pacinit

@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+## Wizard Kit: Update pacman settings to usage in live sessions
+
+# Disable custom repo (used at build-time)
+sudo sed -i -r "s/^(\[custom\])/#\1/" /etc/pacman.conf
+sudo sed -i -r "s/^(SigLevel = Optional TrustAll)/#\1/" /etc/pacman.conf
+sudo sed -i -r "s/^(Server = )/#\1/" /etc/pacman.conf
+
+# Disable signature checks
+sudo sed -i -r "s/^SigLevel.*/SigLevel = Never/" /etc/pacman.conf
+
+# Refresh package databases
+sudo pacman -Sy
+

.bin/Scripts/photorec-sort

@@ -0,0 +1,150 @@
+#!/bin/bash
+#
+## sort photorec results into something usefull
+
+## Set paths
+recup_dir="${1%/}"
+[ -n "$recup_dir" ] || recup_dir="."
+recup_dir="$(realpath "$recup_dir")"
+out_dir="$recup_dir/Recovered"
+bad_dir="$recup_dir/Corrupt"
+
+## Test path before starting (using current dir if not specified)
+for d in $recup_dir/recup*; do
+    ### Source: http://stackoverflow.com/a/6364244
+    ## Check if the glob gets expanded to existing files.
+    ## If not, f here will be exactly the pattern above
+    ## and the exists test will evaluate to false.
+    [ -e "$d" ] && echo "Found recup folder(s)" || {
+        echo "ERROR: No recup folders found"
+        echo "Usage: $0 recup_dir"
+        exit 1
+    }
+
+    ## This is all we needed to know, so we can break after the first iteration
+    break
+done
+
+# Hard link files into folders by type
+for d in $recup_dir/recup*; do
+    if [ -d "$d" ]; then
+        echo "Linking $d"
+        pushd $d >/dev/null
+        find -type f | while read k; do
+            file="$(basename "$k")"
+            src="$(realpath "$k")"
+            ext="$(echo "${file##*.}" | tr '[:upper:]' '[:lower:]')"
+            ext_dir="$out_dir/$ext"
+            if [ "${file##*.}" = "$file" ]; then
+                ext_dir="$out_dir/_MISC_"
+            elif [ "$ext" = "jpg" ] && [ "${file:0:1}" = "t" ]; then
+                ext_dir="$out_dir/jpg-thumbnail"
+            fi
+            #echo "  $file -> $ext_dir"
+            [ -d "$ext_dir" ] || mkdir -p "$ext_dir"
+            ln "$src" "$ext_dir"
+        done
+        popd >/dev/null
+    else
+        echo "ERROR: '$d' not a directory"
+    fi
+done
+
+## Check the files output by photorec for corruption
+pushd "$out_dir" >/dev/null
+
+# Check archives with 7-Zip
+#for d in 7z bz2 gz lzh lzo rar tar xz zip; do
+#    if [ -d "$d" ]; then
+#        echo "Checking $d files"
+#        pushd "$d" >/dev/null
+#        for f in *; do
+#            if ! 7z t "$f" >/dev/null 2>&1; then
+#                #echo "  BAD: $f"
+#                [ -d "$bad_dir/$d" ] || mkdir -p "$bad_dir/$d"
+#                mv -n "$f" "$bad_dir/$d/$f"
+#            fi
+#        done
+#        popd >/dev/null
+#    fi
+#done
+
+# Check Audio/Video files with ffprobe
+for d in avi flac flv m4a m4p m4v mkv mid mov mp2 mp3 mp4 mpg mpg2 ogg ts vob wav; do
+    if [ -d "$d" ]; then
+        echo "Checking $d files"
+        pushd "$d" >/dev/null
+        for f in *; do
+            if ! ffprobe "$f" >/dev/null 2>&1; then
+                #echo "  BAD: $f"
+                [ -d "$bad_dir/$d" ] || mkdir -p "$bad_dir/$d"
+                mv -n "$f" "$bad_dir/$d/$f"
+            fi
+        done
+        popd >/dev/null
+    fi
+done
+
+# Check .doc files with antiword
+if [ -d "doc" ]; then
+    echo "Checking doc files"
+    pushd "doc" >/dev/null
+    for f in *doc; do
+        if ! antiword "$f" >/dev/null 2>&1; then
+            #echo "  BAD: $f"
+            [ -d "$bad_dir/doc" ] || mkdir -p "$bad_dir/doc"
+            mv -n "$f" "$bad_dir/doc/$f"
+        fi
+    done
+    popd >/dev/null
+fi
+
+# Check .docx files with 7z and grep
+if [ -d "docx" ]; then
+    echo "Checking docx files"
+    pushd "docx" >/dev/null
+    for f in *docx; do
+        if ! 7z l "$f" | grep -q -s "word/document.xml"; then
+            #echo "  BAD: $f"
+            [ -d "$bad_dir/docx" ] || mkdir -p "$bad_dir/docx"
+            mv -n "$f" "$bad_dir/docx/$f"
+        fi
+    done
+    popd >/dev/null
+fi
+
+# Sort pictures by date (only for common camera formats)
+for d in jpg mrw orf raf raw rw2 tif x3f; do
+    if [ -d "$d" ]; then
+        echo "Sorting $d files by date"
+        pushd "$d" >/dev/null
+        for f in *; do
+            date_dir="$(date -d "$(stat -c %y "$f")" +"%F")"
+            [ -d "$date_dir" ] || mkdir "$date_dir"
+            mv -n "$f" "$date_dir/"
+        done
+        popd >/dev/null
+    fi
+done
+
+# Sort mov files by encoded date
+if [ -d "mov" ]; then
+    echo "Sorting mov files by date"
+    pushd "mov" >/dev/null
+    for f in *mov; do
+        enc_date="$(mediainfo "$f" | grep -i "Encoded date" | head -1 | sed -r 's/.*: //')"
+        date_dir="$(date -d "$enc_date" +"%F")"
+        echo "$date_dir" | grep -E -q -s '^[0-9]{4}-[0-9]{2}-[0-9]{2}$' || date_dir="Unknown Date"
+        [ -d "$date_dir" ] || mkdir "$date_dir"
+        mv -n "$f" "$date_dir/"
+    done
+    popd >/dev/null
+fi
+
+## sort audio files by tags
+
+## sort matroska files by metadata
+
+## return to original dir
+popd >/dev/null
+

.bin/Scripts/remount-rw

@@ -18,6 +18,4 @@ if udevil mount $DEVICE; then
 else
     echo "Failed"
 fi
-
-sleep 2s
 exit 0

.bin/Scripts/safemode_enter.py

@@ -3,42 +3,37 @@
 import os
 import sys
 
-# STATIC VARIABLES
-REG_MSISERVER = r'HKLM\SYSTEM\CurrentControlSet\Control\SafeBoot\Network\MSIServer'
-
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
-from functions.common import *
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from functions.safemode import *
 init_global_vars()
 os.system('title {}: SafeMode Tool'.format(KIT_NAME_FULL))
 
 if __name__ == '__main__':
-    try:
-        clear_screen()
-        print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL))
-        if not ask('Enable booting to SafeMode (with Networking)?'):
-            abort()
-        
-        # Edit BCD to set safeboot as default
-        cmd = ['bcdedit', '/set', '{default}', 'safeboot', 'network']
-        run_program(cmd, check=False)
-        
-        # Enable MSI access under safemode
-        cmd = ['reg', 'add', REG_MSISERVER, '/f']
-        run_program(cmd, check=False)
-        cmd = ['reg', 'add', REG_MSISERVER, '/ve',
-                '/t', 'REG_SZ', '/d', 'Service', '/f']
-        run_program(cmd, check=False)
-    
-        ## Done ##
-        pause('Press Enter to reboot...')
-        cmd = ['shutdown', '-r', '-t', '3']
-        run_program(cmd, check=False)
-        
-        # Done
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    clear_screen()
+    print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL))
+    other_results = {
+      'Error': {'CalledProcessError':   'Unknown Error'},
+      'Warning': {}}
+
+    if not ask('Enable booting to SafeMode (with Networking)?'):
+      abort()
+
+    # Configure SafeMode
+    try_and_print(message='Set BCD option...',
+      function=enable_safemode, other_results=other_results)
+    try_and_print(message='Enable MSI in SafeMode...',
+      function=enable_safemode_msi, other_results=other_results)
+
+    # Done
+    print_standard('\nDone.')
+    pause('Press Enter to reboot...')
+    reboot()
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/safemode_exit.py

@@ -3,40 +3,37 @@
 import os
 import sys
 
-# STATIC VARIABLES
-REG_MSISERVER = r'HKLM\SYSTEM\CurrentControlSet\Control\SafeBoot\Network\MSIServer'
-
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
-from functions.common import *
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from functions.safemode import *
 init_global_vars()
 os.system('title {}: SafeMode Tool'.format(KIT_NAME_FULL))
 
 if __name__ == '__main__':
-    try:
-        clear_screen()
-        print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL))
-        if not ask('Disable booting to SafeMode?'):
-            abort()
-        
-        # Edit BCD to remove safeboot value
-        for boot in ['{current}', '{default}']:
-            cmd = ['bcdedit', '/deletevalue', boot, 'safeboot']
-            run_program(cmd, check=False)
-        
-        # Disable MSI access under safemode
-        cmd = ['reg', 'delete', REG_MSISERVER, '/f']
-        run_program(cmd, check=False)
-        
-        ## Done ##
-        pause('Press Enter to reboot...')
-        cmd = ['shutdown', '-r', '-t', '3']
-        run_program(cmd, check=False)
-        
-        # Done
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    clear_screen()
+    print_info('{}: SafeMode Tool\n'.format(KIT_NAME_FULL))
+    other_results = {
+      'Error': {'CalledProcessError':   'Unknown Error'},
+      'Warning': {}}
+
+    if not ask('Disable booting to SafeMode?'):
+      abort()
+
+    # Configure SafeMode
+    try_and_print(message='Remove BCD option...',
+      function=disable_safemode, other_results=other_results)
+    try_and_print(message='Disable MSI in SafeMode...',
+      function=disable_safemode_msi, other_results=other_results)
+
+    # Done
+    print_standard('\nDone.')
+    pause('Press Enter to reboot...')
+    reboot()
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/browsers.py

@@ -0,0 +1,99 @@
+# Wizard Kit: Settings - Browsers
+
+import os
+import re
+
+# General
+DEFAULT_HOMEPAGE =      'https://www.google.com/'
+IE_GALLERY =            'https://www.microsoft.com/en-us/iegallery'
+MOZILLA_PREFS = {
+  'browser.search.defaultenginename': '"Google"',
+  'browser.search.defaultenginename.US': '"Google"',
+  'browser.search.geoSpecificDefaults': 'false',
+  'browser.startup.homepage': '"{}"'.format(DEFAULT_HOMEPAGE),
+  'extensions.ui.lastCategory': '"addons://list/extension"',
+  }
+SUPPORTED_BROWSERS = {
+  'Internet Explorer': {
+    'base':             'ie',
+    'exe_name':         'iexplore.exe',
+    'rel_install_path': 'Internet Explorer',
+    'user_data_path':   r'{USERPROFILE}\Favorites',
+    },
+  'Google Chrome': {
+    'base':             'chromium',
+    'exe_name':         'chrome.exe',
+    'rel_install_path': r'Google\Chrome\Application',
+    'user_data_path':   r'{LOCALAPPDATA}\Google\Chrome\User Data',
+    },
+  'Google Chrome Canary': {
+    'base':             'chromium',
+    'exe_name':         'chrome.exe',
+    'rel_install_path': r'Google\Chrome SxS\Application',
+    'user_data_path':   r'{LOCALAPPDATA}\Google\Chrome SxS\User Data',
+    },
+  'Mozilla Firefox': {
+    'base':             'mozilla',
+    'exe_name':         'firefox.exe',
+    'rel_install_path': 'Mozilla Firefox',
+    'user_data_path':   r'{APPDATA}\Mozilla\Firefox\Profiles',
+    },
+  'Mozilla Firefox Dev': {
+    'base':             'mozilla',
+    'exe_name':         'firefox.exe',
+    'rel_install_path': 'Firefox Developer Edition',
+    'user_data_path':   r'{APPDATA}\Mozilla\Firefox\Profiles',
+    },
+  'Opera': {
+    'base':             'chromium',
+    'exe_name':         'launcher.exe',
+    'rel_install_path': 'Opera',
+    'user_data_path':   r'{APPDATA}\Opera Software\Opera Stable',
+    },
+  'Opera Beta': {
+    'base':             'chromium',
+    'exe_name':         'launcher.exe',
+    'rel_install_path': 'Opera beta',
+    'user_data_path':   r'{APPDATA}\Opera Software\Opera Next',
+    },
+  'Opera Dev': {
+    'base':             'chromium',
+    'exe_name':         'launcher.exe',
+    'rel_install_path': 'Opera developer',
+    'user_data_path':   r'{APPDATA}\Opera Software\Opera Developer',
+    },
+  }
+
+# Regex
+REGEX_BACKUP = re.compile(
+  r'\.\w*bak.*',
+  re.IGNORECASE)
+REGEX_CHROMIUM_PROFILE = re.compile(
+  r'^(Default|Profile)',
+  re.IGNORECASE)
+REGEX_CHROMIUM_ITEMS = re.compile(
+  r'^(Bookmarks|Cookies|Favicons|Google Profile'
+  r'|History|Login Data|Top Sites|TransportSecurity'
+  r'|Visited Links|Web Data)',
+  re.IGNORECASE)
+REGEX_MOZILLA = re.compile(
+  r'^(bookmarkbackups|(cookies|formhistory|places).sqlite'
+  r'|key3.db|logins.json|persdict.dat)$',
+  re.IGNORECASE)
+
+# uBlock Origin
+UBO_CHROME =            'https://chrome.google.com/webstore/detail/ublock-origin/cjpalhdlnbpafiamejdnhcphjbkeiagm?hl=en'
+UBO_CHROME_REG =        r'Software\Wow6432Node\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm'
+UBO_EXTRA_CHROME =      'https://chrome.google.com/webstore/detail/ublock-origin-extra/pgdnlhfefecpicbbihgmbmffkjpaplco?hl=en'
+UBO_EXTRA_CHROME_REG =  r'Software\Wow6432Node\Google\Chrome\Extensions\pgdnlhfefecpicbbihgmbmffkjpaplco'
+UBO_MOZILLA =           'https://addons.mozilla.org/en-us/firefox/addon/ublock-origin/'
+UBO_MOZZILA_PATH =      r'{}\Mozilla Firefox\distribution\extensions\ublock_origin.xpi'.format(os.environ.get('PROGRAMFILES'))
+UBO_MOZILLA_REG =       r'Software\Mozilla\Firefox\Extensions'
+UBO_MOZILLA_REG_NAME =  'uBlock0@raymondhill.net'
+UBO_OPERA =             'https://addons.opera.com/en/extensions/details/ublock/?display=en'
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2 tw=0

.bin/Scripts/settings/cleanup.py

@@ -0,0 +1,37 @@
+'''Wizard Kit: Settings - Cleanup'''
+# vim: sts=2 sw=2 ts=2
+
+import re
+
+# Regex
+DESKTOP_ITEMS = re.compile(
+  r'^(JRT|RKill|sc-cleaner)',
+  re.IGNORECASE,
+  )
+
+# Registry
+UAC_DEFAULTS_WIN7 = {
+  r'Software\Microsoft\Windows\CurrentVersion\Policies\System': {
+    'DWORD Items': {
+      'ConsentPromptBehaviorAdmin': 5,
+      'EnableLUA': 1,
+      'PromptOnSecureDesktop': 1,
+      },
+    },
+  }
+UAC_DEFAULTS_WIN10 = {
+  r'Software\Microsoft\Windows\CurrentVersion\Policies\System': {
+    'DWORD Items': {
+      'ConsentPromptBehaviorAdmin': 5,
+      'ConsentPromptBehaviorUser': 3,
+      'EnableInstallerDetection': 1,
+      'EnableLUA': 1,
+      'EnableVirtualization': 1,
+      'PromptOnSecureDesktop': 1,
+      },
+    },
+  }
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")

.bin/Scripts/settings/data.py

@@ -0,0 +1,105 @@
+# Wizard Kit: Settings - Data
+
+import ctypes
+import re
+
+from settings.main import *
+
+# FastCopy
+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)),
+  ]
+
+# 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)
+
+# Thread error modes
+## 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
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/ddrescue.py

@@ -0,0 +1,61 @@
+# Wizard Kit: Settings - ddrescue-tui
+
+import re
+
+from collections import OrderedDict
+
+# General
+MAP_DIR = '/Backups/ddrescue-tui'
+RECOMMENDED_FSTYPES = ['ext3', 'ext4', 'xfs']
+RECOMMENDED_MAP_FSTYPES = ['cifs', 'ext2', 'ext3', 'ext4', 'vfat', 'xfs']
+USAGE = """  {script_name} clone [source [destination]]
+  {script_name} image [source [destination]]
+  (e.g. {script_name} clone /dev/sda /dev/sdb)
+"""
+
+# Layout
+SIDE_PANE_WIDTH = 21
+TMUX_LAYOUT = OrderedDict({
+  'Source':   {'y': 2,         'Check': True},
+  'Started':  {'x': SIDE_PANE_WIDTH, 'Check': True},
+  'Progress': {'x': SIDE_PANE_WIDTH, 'Check': True},
+})
+
+# ddrescue
+AUTO_PASS_1_THRESHOLD = 95
+AUTO_PASS_2_THRESHOLD = 98
+DDRESCUE_SETTINGS = {
+  '--binary-prefixes':  {'Enabled': True,                 'Hidden': True, },
+  '--data-preview':     {'Enabled': True,   'Value': '5', 'Hidden': True, },
+  '--idirect':          {'Enabled': True,                                 },
+  '--odirect':          {'Enabled': True,                                 },
+  '--max-read-rate':    {'Enabled': False,  'Value': '1MiB',              },
+  '--min-read-rate':    {'Enabled': True,   'Value': '64KiB',             },
+  '--reopen-on-error':  {'Enabled': True,                                 },
+  '--retry-passes':     {'Enabled': True,   'Value': '0',                 },
+  '--test-mode':        {'Enabled': False,  'Value': 'test.map',          },
+  '--timeout':          {'Enabled': True,   'Value': '5m',                },
+  '-vvvv':              {'Enabled': True,                 'Hidden': True, },
+  }
+ETOC_REFRESH_RATE = 30 # in seconds
+REGEX_DDRESCUE_LOG = re.compile(
+  r'^\s*(?P<key>\S+):\s+'
+  r'(?P<size>\d+)\s+'
+  r'(?P<unit>[PTGMKB])i?B?',
+  re.IGNORECASE,
+  )
+REGEX_REMAINING_TIME = re.compile(
+  r'remaining time:'
+  r'\s*((?P<days>\d+)d)?'
+  r'\s*((?P<hours>\d+)h)?'
+  r'\s*((?P<minutes>\d+)m)?'
+  r'\s*((?P<seconds>\d+)s)?'
+  r'\s*(?P<na>n/a)?',
+  re.IGNORECASE
+  )
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/hw_diags.py

@@ -0,0 +1,112 @@
+# Wizard Kit: Settings - HW Diagnostics
+
+from collections import OrderedDict
+
+# General
+DEBUG_MODE = False
+OVERRIDES_FORCED = False
+OVERRIDES_LIMITED = True # If True this disables OVERRIDE_FORCED
+STATUSES = {
+  'RED':    ['Denied', 'ERROR', 'NS', 'TimedOut'],
+  'YELLOW': ['Aborted', 'N/A', 'OVERRIDE', 'Unknown', 'Working'],
+  'GREEN':  ['CS'],
+}
+TESTS_CPU = ['Prime95']
+TESTS_DISK = [
+  'I/O Benchmark',
+  'NVMe / SMART',
+  'badblocks',
+  ]
+
+# Layout
+## NOTE: Colors will be applied in functions/hw_diags.py
+QUICK_LABEL = '{YELLOW}(Quick){CLEAR}'
+SIDE_PANE_WIDTH = 20
+TOP_PANE_TEXT = '{GREEN}Hardware Diagnostics{CLEAR}'
+TMUX_LAYOUT = OrderedDict({
+  'Top':            {'y': 2,                'Check': True},
+  'Started':        {'x': SIDE_PANE_WIDTH,  'Check': True},
+  'Progress':       {'x': SIDE_PANE_WIDTH,  'Check': True},
+  # Testing panes
+  'Prime95':        {'y': 11,               'Check': False},
+  'Temps':          {'y': 1000,             'Check': False},
+  'SMART':          {'y': 3,                'Check': True},
+  'badblocks':      {'y': 5,                'Check': True},
+  'I/O Benchmark':  {'y': 1000,             'Check': False},
+})
+
+# Tests: badblocks
+## NOTE: Force 4K read block size for disks >= to 3TB
+BADBLOCKS_LARGE_DISK = 3*1024**4
+
+# Tests: I/O Benchmark
+IO_VARS = {
+  'Block Size': 512*1024,
+  'Chunk Size': 32*1024**2,
+  'Minimum Test Size': 10*1024**3,
+  'Alt Test Size Factor': 0.01,
+  'Progress Refresh Rate': 5,
+  'Scale 8': [2**(0.56*(x+1))+(16*(x+1)) for x in range(8)],
+  'Scale 16': [2**(0.56*(x+1))+(16*(x+1)) for x in range(16)],
+  'Scale 32': [2**(0.56*(x+1)/2)+(16*(x+1)/2) for x in range(32)],
+  'Threshold Graph Fail': 65*1024**2,
+  'Threshold Graph Warn': 135*1024**2,
+  'Threshold Graph Great': 750*1024**2,
+  'Threshold HDD Min': 50*1024**2,
+  'Threshold HDD High Avg': 75*1024**2,
+  'Threshold HDD Low Avg': 65*1024**2,
+  'Threshold SSD Min': 90*1024**2,
+  'Threshold SSD High Avg': 135*1024**2,
+  'Threshold SSD Low Avg': 100*1024**2,
+  'Graph Horizontal': ('▁', '▂', '▃', '▄', '▅', '▆', '▇', '█'),
+  'Graph Horizontal Width': 40,
+  'Graph Vertical': (
+    '▏',    '▎',    '▍',    '▌',
+    '▋',    '▊',    '▉',    '█',
+    '█▏',   '█▎',   '█▍',   '█▌',
+    '█▋',   '█▊',   '█▉',   '██',
+    '██▏',  '██▎',  '██▍',  '██▌',
+    '██▋',  '██▊',  '██▉',  '███',
+    '███▏', '███▎', '███▍', '███▌',
+    '███▋', '███▊', '███▉', '████'),
+  }
+
+# Tests: NVMe/SMART
+ATTRIBUTES = {
+  'NVMe': {
+    'critical_warning': {'Critical': True,  'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
+    'media_errors':     {'Critical': True,  'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
+    'power_on_hours':   {'Critical': False, 'Ignore': True,   'Warning': 17532, 'Error': 26298, 'Maximum': None,  },
+    'unsafe_shutdowns': {'Critical': False, 'Ignore': True,   'Warning': 1,     'Error': None,  'Maximum': None,  },
+    },
+  'SMART': {
+    5:    {'Hex': '05', 'Critical': True,   'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
+    9:    {'Hex': '09', 'Critical': False,  'Ignore': True,   'Warning': 17532, 'Error': 26298, 'Maximum': None,  },
+    10:   {'Hex': '10', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
+    184:  {'Hex': 'B8', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
+    187:  {'Hex': 'BB', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
+    188:  {'Hex': 'BC', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
+    196:  {'Hex': 'C4', 'Critical': False,  'Ignore': False,  'Warning': 1,     'Error': 10,    'Maximum': 10000, },
+    197:  {'Hex': 'C5', 'Critical': True,   'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
+    198:  {'Hex': 'C6', 'Critical': True,   'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': None,  },
+    199:  {'Hex': 'C7', 'Critical': False,  'Ignore': True,   'Warning': None,  'Error': 1,     'Maximum': None,  },
+    201:  {'Hex': 'C9', 'Critical': False,  'Ignore': False,  'Warning': None,  'Error': 1,     'Maximum': 10000, },
+    },
+  }
+ATTRIBUTE_COLORS = (
+  ('Error', 'RED'),
+  ('Maximum', 'PURPLE'),
+  ('Warning', 'YELLOW'),
+  )
+KEY_NVME = 'nvme_smart_health_information_log'
+KEY_SMART = 'ata_smart_attributes'
+
+# Tests: Prime95
+MPRIME_LIMIT = 7    # of minutes to run Prime95
+THERMAL_LIMIT = 95  # Abort temperature in Celsius
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2 tw=0

.bin/Scripts/settings/info.py

@@ -0,0 +1,58 @@
+# Wizard Kit: Settings - Information
+
+import re
+
+# General
+REG_PROFILE_LIST = r'SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList'
+REG_SHELL_FOLDERS = r'Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
+TMP_HIVE_PATH = 'TEMP_HIVE_MOUNT'
+EXTRA_FOLDERS = [
+  'Dropbox',
+  'Google Drive',
+  'OneDrive',
+  'SkyDrive',
+]
+SHELL_FOLDERS = {
+  #GUIDs from: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378457(v=vs.85).aspx
+  'Desktop': (
+    '{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}',
+    ),
+  'Documents': (
+    'Personal',
+    '{FDD39AD0-238F-46AF-ADB4-6C85480369C7}',
+    ),
+  'Downloads': (
+    '{374DE290-123F-4565-9164-39C4925E467B}',
+    ),
+  'Favorites': (
+    '{1777F761-68AD-4D8A-87BD-30B759FA33DD}',
+    ),
+  'Music': (
+    'My Music',
+    '{4BD8D571-6D19-48D3-BE97-422220080E43}',
+    ),
+  'Pictures': (
+    'My Pictures',
+    '{33E28130-4E1E-4676-835A-98395C3BC3BB}',
+    ),
+  'Videos': (
+    'My Video',
+    '{18989B1D-99B5-455B-841C-AB7C74E4DDFC}',
+    ),
+}
+
+# Regex
+REGEX_OFFICE = re.compile(
+  r'(Microsoft (Office\s+'
+    r'(365|Enterprise|Home|Pro(\s|fessional)'
+    r'|Single|Small|Standard|Starter|Ultimate|system)'
+    r'|Works[-\s\d]+\d)'
+  r'|(Libre|Open|Star)\s*Office'
+  r'|WordPerfect|Gnumeric|Abiword)',
+  re.IGNORECASE)
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/main.py

@@ -1,89 +1,90 @@
 # Wizard Kit: Settings - Main / Branding
 
 # Features
+ENABLED_OPEN_LOGS = False
+ENABLED_TICKET_NUMBERS = False
 ENABLED_UPLOAD_DATA = False
 
 # STATIC VARIABLES (also used by BASH and BATCH files)
 ## NOTE: There are no spaces around the = for easier parsing in BASH and BATCH
 # Main Kit
 ARCHIVE_PASSWORD='Abracadabra'
-KIT_NAME_FULL='Wizard Kit'
+KIT_NAME_FULL='WizardKit'
 KIT_NAME_SHORT='WK'
 SUPPORT_MESSAGE='Please let 2Shirt know by opening an issue on GitHub'
 # Live Linux
-MPRIME_LIMIT='7'                          # of minutes to run Prime95 during hw-diags
 ROOT_PASSWORD='Abracadabra'
 TECH_PASSWORD='Abracadabra'
 # Server IP addresses
 OFFICE_SERVER_IP='10.0.0.10'
 QUICKBOOKS_SERVER_IP='10.0.0.10'
 # Time Zones
-LINUX_TIME_ZONE='America/Los_Angeles'     # See 'timedatectl list-timezones' for valid values
-WINDOWS_TIME_ZONE='Pacific Standard Time' # See 'tzutil /l' for valid values
-# WiFi
-WIFI_SSID='SomeWifi'
-WIFI_PASSWORD='Abracadabra'
+LINUX_TIME_ZONE='America/Denver'            # See 'timedatectl list-timezones' for valid values
+WINDOWS_TIME_ZONE='Mountain Standard Time'  # See 'tzutil /l' for valid values
 
 # 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',
-        'RW-User':  'backup',
-        'RW-Pass':  'Abracadabra',
+  { 'IP':      '10.0.0.10',
+    'Name':     'ServerOne',
+    'Mounted':  False,
+    'Share':    'Backups',
+    'User':     'restore',
+    'Pass':     'Abracadabra',
+    'RW-User':  'backup',
+    'RW-Pass':  'Abracadabra',
     },
-    {   'IP':       '10.0.0.11',
-        'Name':     'ServerTwo',
-        'Mounted':  False,
-        'Share':    'Backups',
-        'User':     'restore',
-        'Pass':     'Abracadabra',
-        'RW-User':  'backup',
-        'RW-Pass':  'Abracadabra',
+  { 'IP':       '10.0.0.11',
+    'Name':     'ServerTwo',
+    'Mounted':  False,
+    'Share':    'Backups',
+    'User':     'restore',
+    'Pass':     'Abracadabra',
+    'RW-User':  'backup',
+    'RW-Pass':  'Abracadabra',
     },
-]
+  ]
 CRASH_SERVER = {
-    'Name':         'CrashServer',
-    'Url':          '',
-    'User':         '',
-    'Pass':         '',
-}
+  'Name':       'CrashServer',
+  'Url':        '',
+  'User':       '',
+  'Pass':       '',
+  }
 OFFICE_SERVER = {
-    'IP':           OFFICE_SERVER_IP,
-    'Name':         'ServerOne',
-    'Mounted':      False,
-    'Share':        'Office',
-    'User':         'restore',
-    'Pass':         'Abracadabra',
-    'RW-User':      'backup',
-    'RW-Pass':      'Abracadabra',
-}
+  'IP':         OFFICE_SERVER_IP,
+  'Name':       'ServerOne',
+  'Mounted':    False,
+  'Share':      'Office',
+  'User':       'restore',
+  'Pass':       'Abracadabra',
+  'RW-User':    'backup',
+  'RW-Pass':    'Abracadabra',
+  }
 QUICKBOOKS_SERVER = {
-    'IP':           QUICKBOOKS_SERVER_IP,
-    'Name':         'ServerOne',
-    'Mounted':      False,
-    'Share':        'QuickBooks',
-    'User':         'restore',
-    'Pass':         'Abracadabra',
-    'RW-User':      'backup',
-    'RW-Pass':      'Abracadabra',
-}
+  'IP':         QUICKBOOKS_SERVER_IP,
+  'Name':       'ServerOne',
+  'Mounted':    False,
+  'Share':      'QuickBooks',
+  'User':       'restore',
+  'Pass':       'Abracadabra',
+  'RW-User':    'backup',
+  'RW-Pass':    'Abracadabra',
+  }
 WINDOWS_SERVER = {
-    'IP':           '10.0.0.10',
-    'Name':         'ServerOne',
-    'Mounted':      False,
-    'Share':        'Windows',
-    'User':         'restore',
-    'Pass':         'Abracadabra',
-    'RW-User':      'backup',
-    'RW-Pass':      'Abracadabra',
-}
+  'IP':         '10.0.0.10',
+  'Name':       'ServerOne',
+  'Mounted':    False,
+  'Share':      'Windows',
+  'User':       'restore',
+  'Pass':       'Abracadabra',
+  'RW-User':    'backup',
+  'RW-Pass':    'Abracadabra',
+  }
+
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/music.py

@@ -1,70 +1,73 @@
 # Wizard Kit: Settings - Music
 
 MUSIC_MOD = [
-    '104208#banana_boat.mod',
-    '114971#tilbury_fair.mod',
-    '132563#ufo_tune.mod',
-    '135906#magnetik_girl.xm',
-    '140628#autumn_in_budapest.xm',
-    '143198#summer_memories_3.xm',
-    '144405#hillbilly_billyboy.xm',
-    '154795#4mat_-_eternity.xm',
-    '155845#bookworm.mo3',
-    '155914#battleofsteel.xm',
-    '158975#1_channel_moog.it',
-    '165495#trans.s3m',
-    '168513#necros_-_introspection.s3m',
-    '169628#radix_-_feng_shui_schematics.xm',
-    '175238#unknown48_-_twilight.mod',
-    '33432#ambrozia.xm',
-    '33460#amigatre.mod',
-    '34594#CHARIOT.S3M',
-    '34596#BUTTERFL.XM',
-    '34654#CTGOBLIN.S3M',
-    '35151#bananasplit.mod',
-    '35280#DEADLOCK.XM',
-    '38591#compo_liam.xm',
-    '39987#crystald.s3m',
-    '40475#ELYSIUM.MOD',
-    '42146#enigma.mod',
-    '42519#GHOST2.MOD',
-    '42560#GSLINGER.MOD',
-    '42872#existing.xm',
-    '50427#nf-stven.xm',
-    '51549#overture.mod',
-    '54250#SATELL.S3M',
-    '54313#realmk.s3m',
-    '55789#scrambld.mod',
-    '57934#spacedeb.mod',
-    '59344#stardstm.mod',
-    '60395#2ND_PM.S3M',
-    '66187#external.xm',
-    '66343#beek-substitutionology.it',
-    '67561#radix-unreal_superhero.xm',
-    '70829#inside_out.s3m',
-    '83779#beyond_music.mod',
-    ]
+  '104208#banana_boat.mod',
+  '114971#tilbury_fair.mod',
+  '132563#ufo_tune.mod',
+  '135906#magnetik_girl.xm',
+  '140628#autumn_in_budapest.xm',
+  '143198#summer_memories_3.xm',
+  '144405#hillbilly_billyboy.xm',
+  '154795#4mat_-_eternity.xm',
+  '155845#bookworm.mo3',
+  '155914#battleofsteel.xm',
+  '158975#1_channel_moog.it',
+  '165495#trans.s3m',
+  '168513#necros_-_introspection.s3m',
+  '169628#radix_-_feng_shui_schematics.xm',
+  '175238#unknown48_-_twilight.mod',
+  '33432#ambrozia.xm',
+  '33460#amigatre.mod',
+  '34594#CHARIOT.S3M',
+  '34596#BUTTERFL.XM',
+  '34654#CTGOBLIN.S3M',
+  '35151#bananasplit.mod',
+  '35280#DEADLOCK.XM',
+  '38591#compo_liam.xm',
+  '39987#crystald.s3m',
+  '40475#ELYSIUM.MOD',
+  '42146#enigma.mod',
+  '42519#GHOST2.MOD',
+  '42560#GSLINGER.MOD',
+  '42872#existing.xm',
+  '50427#nf-stven.xm',
+  '51549#overture.mod',
+  '54250#SATELL.S3M',
+  '54313#realmk.s3m',
+  '55789#scrambld.mod',
+  '57934#spacedeb.mod',
+  '59344#stardstm.mod',
+  '60395#2ND_PM.S3M',
+  '66187#external.xm',
+  '66343#beek-substitutionology.it',
+  '67561#radix-unreal_superhero.xm',
+  '70829#inside_out.s3m',
+  '83779#beyond_music.mod',
+  ]
 
 MUSIC_SNES = [
-    'actr',
-    'crock',
-    'ct',
-    'dkc',
-    'dkq',
-    'ff6',
-    'fz',
-    'loz3',
-    'mmx',
-    'ptws',
-    'scv4',
-    'sf',
-    'sf2',
-    'sgng',
-    'smk',
-    'smw',
-    'yi',
-    'zamn'
-    ]
+  'actr',
+  'crock',
+  'ct',
+  'dkc',
+  'dkq',
+  'ff6',
+  'fz',
+  'loz3',
+  'mmx',
+  'ptws',
+  'scv4',
+  'sf',
+  'sf2',
+  'sgng',
+  'smk',
+  'smw',
+  'yi',
+  'zamn'
+  ]
+
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/partition_uids.py

@@ -0,0 +1,326 @@
+# Wizard Kit: Settings - Partition UIDs
+# sources:  https://en.wikipedia.org/wiki/GUID_Partition_Table
+#           https://en.wikipedia.org/wiki/Partition_type
+# NOTE: Info has been trimmed for brevity. As such, there may be some inaccuracy.
+
+PARTITION_UIDS = {
+  '00': {'OS': 'All','Description': 'Empty partition entry'},
+  '01': {'OS': 'DOS','Description': 'FAT12 as primary partition'},
+  '02': {'OS': 'XENIX','Description': 'XENIX root'},
+  '03': {'OS': 'XENIX','Description': 'XENIX usr'},
+  '04': {'OS': 'DOS','Description': 'FAT16 with less than 32 MB'},
+  '05': {'OS': 'DOS / SpeedStor','Description': 'Extended partition'},
+  '06': {'OS': 'DOS1+','Description': 'FAT16B [over 65K sectors]'},
+  '07': {'OS': 'Windows / OS/2 / QNX 2','Description': 'NTFS/exFAT/HPFS/IFS/QNX'},
+  '08': {'OS': 'CBM / DOS / OS/2 / AIX /QNX','Description': 'FAT12-16/AIX/QNY/SplitDrive'},
+  '09': {'OS': 'AIX / QNX / Coherent / OS-9','Description': 'AIX/QNZ/Coherent/RBF'},
+  '0A': {'OS': 'OS/2 / Coherent','Description': 'Boot Manager / Swap'},
+  '0B': {'OS': 'DOS','Description': 'FAT32 with CHS addressing'},
+  '0C': {'OS': 'DOS','Description': 'FAT32 with LBA'},
+  '0D': {'OS': 'Silicon Safe','Description': 'Reserved'},
+  '0E': {'OS': 'DOS','Description': 'FAT16B with LBA'},
+  '0F': {'OS': 'DOS','Description': 'Extended partition with LBA'},
+  '10': {'OS': 'OPUS','Description': 'Unknown'},
+  '11': {'OS': 'Leading Edge MS-DOS / OS/2','Description': 'FAT12/FAT16'},
+  '12': {'OS': 'Compaq Contura','Description': 'conf/diag/hiber/rescue/serv'},
+  '14': {'OS': 'AST DOS / OS/2 / MaverickOS','Description': 'FAT12/FAT16/Omega'},
+  '15': {'OS': 'OS/2 / Maverick OS','Description': 'Hidden extended / Swap'},
+  '16': {'OS': 'OS/2 Boot Manager','Description': 'Hidden FAT16B'},
+  '17': {'OS': 'OS/2 Boot Manager','Description': 'Hidden IFS/HPFS/NTFS/exFAT'},
+  '18': {'OS': 'AST Windows','Description': '0-Volt Suspend/SmartSleep'},
+  '19': {'OS': 'Willowtech Photon coS','Description': 'Willowtech Photon coS'},
+  '1B': {'OS': 'OS/2 Boot Manager','Description': 'Hidden FAT32'},
+  '1C': {'OS': 'OS/2 Boot Manager','Description': 'Hidden FAT32 with LBA'},
+  '1E': {'OS': 'OS/2 Boot Manager','Description': 'Hidden FAT16 with LBA'},
+  '1F': {'OS': 'OS/2 Boot Manager','Description': 'Hidden extended with LBA'},
+  '20': {'OS': 'Windows Mobile','Description': 'update XIP/Willowsoft OFS1'},
+  '21': {'OS': 'Oxygen','Description': 'SpeedStor / FSo2'},
+  '22': {'OS': 'Oxygen','Description': 'Oxygen Extended Partition'},
+  '23': {'OS': 'Windows Mobile','Description': 'Reserved / boot XIP'},
+  '24': {'OS': 'NEC MS-DOS0','Description': 'Logical FAT12 or FAT16'},
+  '25': {'OS': 'Windows Mobile','Description': 'IMGFS[citation needed]'},
+  '26': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
+  '27': {'OS': 'Win/PQserv/MirOS/RooterBOOT','Description': 'WinRE/Rescue/MirOS/RooterBOOT'},
+  '2A': {'OS': 'AtheOS','Description': 'AthFS/AFS/Reserved'},
+  '2B': {'OS': 'SyllableOS','Description': 'SyllableSecure (SylStor)'},
+  '31': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
+  '32': {'OS': 'NOS','Description': 'Unknown'},
+  '33': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
+  '34': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
+  '35': {'OS': 'OS/2 Server /eComStation','Description': 'JFS'},
+  '36': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
+  '38': {'OS': 'THEOS','Description': 'THEOS version 3.2, 2 GB'},
+  '39': {'OS': 'Plan 9 / THEOS','Description': 'Plan 9 edition 3 / THEOS v4'},
+  '3A': {'OS': 'THEOS','Description': 'THEOS v4, 4 GB'},
+  '3B': {'OS': 'THEOS','Description': 'THEOS v4 extended'},
+  '3C': {'OS': 'PartitionMagic','Description': 'PqRP (image in progress)'},
+  '3D': {'OS': 'PartitionMagic','Description': 'Hidden NetWare'},
+  '3F': {'OS': 'OS/32','Description': 'Unknown'},
+  '40': {'OS': 'PICK / Venix','Description': 'PICK R83 / Venix 80286'},
+  '41': {'OS': 'RISC / Linux / PowerPC','Description': 'Boot / Old Linux/Minix'},
+  '42': {'OS': 'SFS / Linux / Win2K/XP/etc','Description': 'SFS / Old Linux Swap'},
+  '43': {'OS': 'Linux','Description': 'Old Linux native'},
+  '44': {'OS': 'GoBack','Description': 'Norton/WildFire/Adaptec/Roxio'},
+  '45': {'OS': 'Boot-US / EUMEL/ELAN','Description': 'Priam/Boot/EUMEL/ELAN (L2)'},
+  '46': {'OS': 'EUMEL/ELAN','Description': 'EUMEL/ELAN (L2)'},
+  '47': {'OS': 'EUMEL/ELAN','Description': 'EUMEL/ELAN (L2)'},
+  '48': {'OS': 'EUMEL/ELAN','Description': 'EUMEL/ELAN (L2), ERGOS L3'},
+  '4A': {'OS': 'AdaOS / ALFS/THIN','Description': 'Aquila / ALFS/THIN'},
+  '4C': {'OS': 'ETH Oberon','Description': 'Aos (A2) file system (76)'},
+  '4D': {'OS': 'QNX Neutrino','Description': 'Primary QNX POSIX volume'},
+  '4E': {'OS': 'QNX Neutrino','Description': 'Secondary QNX POSIX volume'},
+  '4F': {'OS': 'QNX Neutrino / ETH Oberon','Description': '3rd QNX POSIX/Boot/Native'},
+  '50': {'OS': 'DiskMan4/ETH/LynxOS/Novell','Description': 'Alt FS/Read-only/Lynx RTOS'},
+  '51': {'OS': 'Disk Manager 4-6','Description': 'R/W partition (Aux 1)'},
+  '52': {'OS': 'CP/M-80/ System V/AT, V/386','Description': 'CP/M-80'},
+  '53': {'OS': 'Disk Manager 6','Description': 'Auxiliary 3 (WO)'},
+  '54': {'OS': 'Disk Manager 6','Description': 'Dynamic Drive Overlay (DDO)'},
+  '55': {'OS': 'EZ-Drive','Description': 'Maxtor/MaxBlast/DriveGuide'},
+  '56': {'OS': 'AT&T DOS/EZ-Drive/VFeature','Description': 'FAT12  16/EZ-BIOS/VFeature'},
+  '57': {'OS': 'DrivePro','Description': 'VNDI partition'},
+  '5C': {'OS': 'EDISK','Description': 'Priam EDisk Volume'},
+  '61': {'OS': 'SpeedStor','Description': 'Unknown'},
+  '63': {'OS': 'Unix','Description': 'Unix,ISC,SysV,ix,BSD,HURD'},
+  '64': {'OS': 'SpeedStor / NetWare','Description': 'NetWare FS 286/2,PC-ARMOUR'},
+  '65': {'OS': 'NetWare','Description': 'NetWare File System 386'},
+  '66': {'OS': 'NetWare / NetWare','Description': 'NetWare FS 386 / SMS'},
+  '67': {'OS': 'NetWare','Description': 'Wolf Mountain'},
+  '68': {'OS': 'NetWare','Description': 'Unknown'},
+  '69': {'OS': 'NetWare 5 / NetWare','Description': 'Novell Storage Services'},
+  '6E': {'Description': 'Unknown'},
+  '70': {'OS': 'DiskSecure','Description': 'DiskSecure multiboot'},
+  '71': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
+  '72': {'OS': 'APTI systems / Unix V7/x86','Description': 'APTI altFAT12 / V7 / x86'},
+  '73': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
+  '74': {'OS': 'Microsoft, IBM','Description': 'Reserved / Scramdisk'},
+  '75': {'OS': 'PC/IX','Description': 'Unknown'},
+  '76': {'OS': 'Microsoft, IBM','Description': 'Reserved'},
+  '77': {'OS': 'Novell','Description': 'VNDI, M2FS, M2CS'},
+  '78': {'OS': 'Geurt Vos','Description': 'XOSL bootloader file system'},
+  '79': {'OS': 'APTI conformant systems','Description': 'APTI altFAT16 (CHS, SFN)'},
+  '7A': {'OS': 'APTI conformant systems','Description': 'APTI altFAT16 (LBA, SFN)'},
+  '7B': {'OS': 'APTI conformant systems','Description': 'APTI altFAT16B (CHS, SFN)'},
+  '7C': {'OS': 'APTI conformant systems','Description': 'APTI altFAT32 (LBA, SFN)'},
+  '7D': {'OS': 'APTI conformant systems','Description': 'APTI altFAT32 (CHS, SFN)'},
+  '7E': {'OS': 'F.I.X. (claim) / PrimoCache','Description': 'Level 2 cache'},
+  '7F': {'OS': 'Varies','Description': 'AltOS DevPartition Standard'},
+  '80': {'OS': 'Minix 1.1-1.4a','Description': 'Minix file system (old)'},
+  '81': {'OS': 'Minix 1.4b+ / Linux','Description': 'MINIX FS/Mitac AdvDiskManager'},
+  '82': {'OS': 'Linux / Sun Microsystems','Description': 'Swap / Solaris x86 / Prime'},
+  '83': {'OS': 'GNU/Linux','Description': 'Any native Linux FS'},
+  '84': {'OS': 'OS/2 / Windows 7','Description': 'Hibernat/HiddenC/RapidStart'},
+  '85': {'OS': 'GNU/Linux','Description': 'Linux extended'},
+  '86': {'OS': 'Windows NT 4 Server / Linux','Description': 'FAT16B mirror/LinuxRAID-old'},
+  '87': {'OS': 'Windows NT 4 Server','Description': 'HPFS/NTFS mirrored volume'},
+  '88': {'OS': 'GNU/Linux','Description': 'Plaintext partition table'},
+  '8A': {'OS': 'AiR-BOOT','Description': 'Linux kernel image'},
+  '8B': {'OS': 'Windows NT 4 Server','Description': 'FAT32 mirrored volume set'},
+  '8C': {'OS': 'Windows NT 4 Server','Description': 'FAT32 mirrored volume set'},
+  '8D': {'OS': 'Free FDISK','Description': 'Hidden FAT12'},
+  '8E': {'OS': 'Linux','Description': 'Linux LVM'},
+  '90': {'OS': 'Free FDISK','Description': 'Hidden FAT16'},
+  '91': {'OS': 'Free FDISK','Description': 'Hidden extended partition'},
+  '92': {'OS': 'Free FDISK','Description': 'Hidden FAT16B'},
+  '93': {'OS': 'Amoeba / Linux','Description': 'Amoeba native/Hidden Linux'},
+  '94': {'OS': 'Amoeba','Description': 'Amoeba bad block table'},
+  '95': {'OS': 'EXOPC','Description': 'EXOPC native'},
+  '96': {'OS': 'CHRP','Description': 'ISO-9660 file system'},
+  '97': {'OS': 'Free FDISK','Description': 'Hidden FAT32'},
+  '98': {'OS': 'Free FDISK / ROM-DOS','Description': 'Hidden FAT32 / service part'},
+  '99': {'OS': 'early Unix','Description': 'Unknown'},
+  '9A': {'OS': 'Free FDISK','Description': 'Hidden FAT16'},
+  '9B': {'OS': 'Free FDISK','Description': 'Hidden extended partition'},
+  '9E': {'OS': 'VSTA / ForthOS','Description': 'ForthOS (eForth port)'},
+  '9F': {'OS': 'BSD/OS 3.0+, BSDI','Description': 'Unknown'},
+  'A0': {'OS': 'HP/Phoenix/IBM/Toshiba/Sony','Description': 'Diagnostic for HP/Hibernate'},
+  'A1': {'OS': 'HP / Phoenix, NEC','Description': 'HP Vol Expansion/Hibernate'},
+  'A2': {'OS': 'Cyclone V','Description': 'Hard Processor System (HPS)'},
+  'A3': {'OS': 'HP','Description': 'HP Vol Expansion(SpeedStor)'},
+  'A4': {'OS': 'HP','Description': 'HP Vol Expansion(SpeedStor)'},
+  'A5': {'OS': 'BSD','Description': 'BSD slice'},
+  'A6': {'OS': 'OpenBSD','Description': 'HP Vol Expansion/BSD slice'},
+  'A7': {'OS': 'NeXT','Description': 'NeXTSTEP'},
+  'A8': {'OS': 'Darwin, Mac OS X','Description': 'Apple Darwin, Mac OS X UFS'},
+  'A9': {'OS': 'NetBSD','Description': 'NetBSD slice'},
+  'AA': {'OS': 'MS-DOS','Description': 'Olivetti DOS FAT12(1.44 MB)'},
+  'AB': {'OS': 'Darwin, Mac OS X / GO! OS','Description': 'Apple Darwin/OS X boot/GO!'},
+  'AD': {'OS': 'RISC OS','Description': 'ADFS / FileCore format'},
+  'AE': {'OS': 'ShagOS','Description': 'ShagOS file system'},
+  'AF': {'OS': 'ShagOS','Description': 'OS X HFS & HFS+/ShagOS Swap'},
+  'B0': {'OS': 'Boot-Star','Description': 'Boot-Star dummy partition'},
+  'B1': {'OS': 'QNX 6.x','Description': 'HPVolExpansion/QNX Neutrino'},
+  'B2': {'OS': 'QNX 6.x','Description': 'QNX Neutrino power-safe FS'},
+  'B3': {'OS': 'QNX 6.x','Description': 'HPVolExpansion/QNX Neutrino'},
+  'B4': {'OS': 'HP','Description': 'HP Vol Expansion(SpeedStor)'},
+  'B6': {'OS': 'Windows NT 4 Server','Description': 'HPVolExpansion/FAT16Bmirror'},
+  'B7': {'OS': 'BSDI / Windows NT 4 Server','Description': 'BSDI,Swap,HPFS/NTFS mirror'},
+  'B8': {'OS': 'BSDI (before 3.0)','Description': 'BSDI Swap / native FS'},
+  'BB': {'OS': 'Acronis/BootWizard/WinNT 4','Description': 'BootWizard/OEM/FAT32 mirror'},
+  'BC': {'OS': 'Acronis/WinNT/BackupCapsule','Description': 'FAT32RAID/SecureZone/Backup'},
+  'BD': {'OS': 'BonnyDOS/286','Description': 'Unknown'},
+  'BE': {'OS': 'Solaris 8','Description': 'Solaris 8 boot'},
+  'BF': {'OS': 'Solaris','Description': 'Solaris x86'},
+  'C0': {'OS': 'DR-DOS,MultiuserDOS,REAL/32','Description': 'Secured FAT (under 32 MB)'},
+  'C1': {'OS': 'DR DOS','Description': 'Secured FAT12'},
+  'C2': {'OS': 'Power Boot','Description': 'Hidden Linux native FS'},
+  'C3': {'OS': 'Power Boot','Description': 'Hidden Linux Swap'},
+  'C4': {'OS': 'DR DOS','Description': 'Secured FAT16'},
+  'C5': {'OS': 'DR DOS','Description': 'Secured extended partition'},
+  'C6': {'OS': 'DR DOS / WinNT 4 Server','Description': 'Secured FAT16B/FAT16Bmirror'},
+  'C7': {'OS': 'Syrinx / WinNT 4 Server','Description': 'Syrinx boot/HPFS/NTFSmirror'},
+  'C8': {'Description': "DR-DOS Reserved (since '97)"},
+  'C9': {'Description': "DR-DOS Reserved (since '97)"},
+  'CA': {'Description': "DR-DOS Reserved (since '97)"},
+  'CB': {'OS': 'DR-DOSx / WinNT 4 Server','Description': 'Secured FAT32/FAT32 mirror'},
+  'CC': {'OS': 'DR-DOSx / WinNT 4 Server','Description': 'Secured FAT32/FAT32 mirror'},
+  'CD': {'OS': 'CTOS','Description': 'Memory dump'},
+  'CE': {'OS': 'DR-DOSx','Description': 'Secured FAT16B'},
+  'CF': {'OS': 'DR-DOSx','Description': 'Secured extended partition'},
+  'D0': {'OS': 'Multiuser DOS, REAL/32','Description': 'Secured FAT (over 32 MB)'},
+  'D1': {'OS': 'Multiuser DOS','Description': 'Secured FAT12'},
+  'D4': {'OS': 'Multiuser DOS','Description': 'Secured FAT16'},
+  'D5': {'OS': 'Multiuser DOS','Description': 'Secured extended partition'},
+  'D6': {'OS': 'Multiuser DOS','Description': 'Secured FAT16B'},
+  'D8': {'OS': 'Digital Research','Description': 'CP/M-86 [citation needed]'},
+  'DA': {'OS': 'Powercopy Backup','Description': 'Non-FS data / Shielded disk'},
+  'DB': {'OS': 'CP/M-86/CDOS/CTOS/D800/DRMK','Description': 'CP/M-86/ConcDOS/Boot/FAT32'},
+  'DD': {'OS': 'CTOS','Description': 'Hidden memory dump'},
+  'DE': {'OS': 'Dell','Description': 'FAT16 utility/diagnostic'},
+  'DF': {'OS': 'DG/UX / BootIt / Aviion','Description': 'DG/UX Virt DiskMan / EMBRM'},
+  'E0': {'OS': 'STMicroelectronics','Description': 'ST AVFS'},
+  'E1': {'OS': 'SpeedStor','Description': 'ExtendedFAT12 >1023cylinder'},
+  'E2': {'Description': 'DOS read-only (XFDISK)'},
+  'E3': {'OS': 'SpeedStor','Description': 'DOS read-only'},
+  'E4': {'OS': 'SpeedStor','Description': 'ExtendedFAT16 <1024cylinder'},
+  'E5': {'OS': 'Tandy MS-DOS','Description': 'Logical FAT12 or FAT16'},
+  'E6': {'OS': 'SpeedStor','Description': 'Unknown'},
+  'E8': {'OS': 'LUKS','Description': 'Linux Unified Key Setup'},
+  'EB': {'OS': 'BeOS, Haiku','Description': 'BFS'},
+  'EC': {'OS': 'SkyOS','Description': 'SkyFS'},
+  'ED': {'OS': 'Sprytix / EDD 4','Description': 'EDC loader / GPT hybrid MBR'},
+  'EE': {'OS': 'EFI','Description': 'GPT protective MBR'},
+  'EF': {'OS': 'EFI','Description': 'EFI system partition'},
+  'F0': {'OS': 'Linux / OS/32','Description': 'PA-RISC Linux boot loader.'},
+  'F1': {'OS': 'SpeedStor','Description': 'Unknown'},
+  'F2': {'OS': 'SperryIT DOS/Unisys DOS','Description': 'Logical FAT12/FAT16'},
+  'F3': {'OS': 'SpeedStor','Description': 'Unknown'},
+  'F4': {'OS': 'SpeedStor / Prologue','Description': '"large"DOS part/NGF/TwinFS'},
+  'F5': {'OS': 'Prologue','Description': 'MD0-MD9 part for NGF/TwinFS'},
+  'F6': {'OS': 'SpeedStor','Description': 'Unknown'},
+  'F7': {'OS': 'O.S.G. / X1','Description': 'EFAT / Solid State FS'},
+  'F9': {'OS': 'Linux','Description': 'pCache ext2/ext3 cache'},
+  'FA': {'OS': 'Bochs','Description': 'x86 emulator'},
+  'FB': {'OS': 'VMware','Description': 'VMware VMFS partition'},
+  'FC': {'OS': 'VMware','Description': 'Swap / VMKCORE kernel dump'},
+  'FD': {'OS': 'Linux / FreeDOS','Description': 'LinuxRAID/Reserved4FreeDOS'},
+  'FE': {'OS': 'SpeedStor/LANstep/NT/Linux','Description': 'PS/2/DiskAdmin/old LinuxLVM'},
+  'FF': {'OS': 'XENIX','Description': 'XENIX bad block table'},
+  '00000000-0000-0000-0000-000000000000': {'Description': 'Unused entry'},
+  '024DEE41-33E7-11D3-9D69-0008C781F39F': {'Description': 'MBR partition scheme'},
+  'C12A7328-F81F-11D2-BA4B-00A0C93EC93B': {'Description': 'EFI System partition'},
+  '21686148-6449-6E6F-744E-656564454649': {'Description': 'BIOS Boot partition'},
+  'D3BFE2DE-3DAF-11DF-BA40-E3A556D89593': {'Description': 'Intel Fast Flash (iFFS) partition (for Intel Rapid Start technology)'},
+  'F4019732-066E-4E12-8273-346C5641494F': {'Description': 'Sony boot partition'},
+  'BFBFAFE7-A34F-448A-9A5B-6213EB736C22': {'Description': 'Lenovo boot partition'},
+  'E3C9E316-0B5C-4DB8-817D-F92DF00215AE': {'OS': 'Windows', 'Description': 'Microsoft Reserved Partition (MSR)'},
+  'EBD0A0A2-B9E5-4433-87C0-68B6B72699C7': {'OS': 'Windows', 'Description': 'Basic data partition'},
+  '5808C8AA-7E8F-42E0-85D2-E1E90434CFB3': {'OS': 'Windows', 'Description': 'Logical Disk Manager (LDM) metadata partition'},
+  'AF9B60A0-1431-4F62-BC68-3311714A69AD': {'OS': 'Windows', 'Description': 'Logical Disk Manager data partition'},
+  'DE94BBA4-06D1-4D40-A16A-BFD50179D6AC': {'OS': 'Windows', 'Description': 'Windows Recovery Environment'},
+  '37AFFC90-EF7D-4E96-91C3-2D7AE055B174': {'OS': 'Windows', 'Description': 'IBM General Parallel File System (GPFS) partition'},
+  'E75CAF8F-F680-4CEE-AFA3-B001E56EFC2D': {'OS': 'Windows', 'Description': 'Storage Spaces partition'},
+  '75894C1E-3AEB-11D3-B7C1-7B03A0000000': {'OS': 'HP-UX', 'Description': 'Data partition'},
+  'E2A1E728-32E3-11D6-A682-7B03A0000000': {'OS': 'HP-UX', 'Description': 'Service Partition'},
+  '0FC63DAF-8483-4772-8E79-3D69D8477DE4': {'OS': 'Linux', 'Description': 'Linux filesystem data'},
+  'A19D880F-05FC-4D3B-A006-743F0F84911E': {'OS': 'Linux', 'Description': 'RAID partition'},
+  '44479540-F297-41B2-9AF7-D131D5F0458A': {'OS': 'Linux', 'Description': 'Root partition (x86)'},
+  '4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709': {'OS': 'Linux', 'Description': 'Root partition (x86-64)'},
+  '69DAD710-2CE4-4E3C-B16C-21A1D49ABED3': {'OS': 'Linux', 'Description': 'Root partition (32-bit ARM)'},
+  'B921B045-1DF0-41C3-AF44-4C6F280D3FAE': {'OS': 'Linux', 'Description': 'Root partition (64-bit ARM)/AArch64)'},
+  '0657FD6D-A4AB-43C4-84E5-0933C84B4F4F': {'OS': 'Linux', 'Description': 'Swap partition'},
+  'E6D6D379-F507-44C2-A23C-238F2A3DF928': {'OS': 'Linux', 'Description': 'Logical Volume Manager (LVM) partition'},
+  '933AC7E1-2EB4-4F13-B844-0E14E2AEF915': {'OS': 'Linux', 'Description': '/home partition'},
+  '3B8F8425-20E0-4F3B-907F-1A25A76F98E8': {'OS': 'Linux', 'Description': '/srv (server data) partition'},
+  '7FFEC5C9-2D00-49B7-8941-3EA10A5586B7': {'OS': 'Linux', 'Description': 'Plain dm-crypt partition'},
+  'CA7D7CCB-63ED-4C53-861C-1742536059CC': {'OS': 'Linux', 'Description': 'LUKS partition'},
+  '8DA63339-0007-60C0-C436-083AC8230908': {'OS': 'Linux', 'Description': 'Reserved'},
+  '83BD6B9D-7F41-11DC-BE0B-001560B84F0F': {'OS': 'FreeBSD', 'Description': 'Boot partition'},
+  '516E7CB4-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'Data partition'},
+  '516E7CB5-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'Swap partition'},
+  '516E7CB6-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'Unix File System (UFS) partition'},
+  '516E7CB8-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'Vinum volume manager partition'},
+  '516E7CBA-6ECF-11D6-8FF8-00022D09712B': {'OS': 'FreeBSD', 'Description': 'ZFS partition'},
+  '48465300-0000-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Hierarchical File System Plus (HFS+) partition'},
+  '55465300-0000-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple UFS'},
+  '6A898CC3-1DD2-11B2-99A6-080020736631': {'OS': 'OS X Darwin', 'Description': 'ZFS'},
+  '52414944-0000-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple RAID partition'},
+  '52414944-5F4F-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple RAID partition, offline'},
+  '426F6F74-0000-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple Boot partition (Recovery HD)'},
+  '4C616265-6C00-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple Label'},
+  '5265636F-7665-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple TV Recovery partition'},
+  '53746F72-6167-11AA-AA11-00306543ECAC': {'OS': 'OS X Darwin', 'Description': 'Apple Core Storage (i.e. Lion FileVault) partition'},
+  '6A82CB45-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Boot partition'},
+  '6A85CF4D-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Root partition'},
+  '6A87C46F-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Swap partition'},
+  '6A8B642B-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Backup partition'},
+  '6A898CC3-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': '/usr partition'},
+  '6A8EF2E9-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': '/var partition'},
+  '6A90BA39-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': '/home partition'},
+  '6A9283A5-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Alternate sector'},
+  '6A945A3B-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos', 'Description': 'Reserved partition'},
+  '6A9630D1-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos'},
+  '6A980767-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos'},
+  '6A96237F-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos'},
+  '6A8D2AC7-1DD2-11B2-99A6-080020736631': {'OS': 'Solaris illumos'},
+  '49F48D32-B10E-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'Swap partition'},
+  '49F48D5A-B10E-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'FFS partition'},
+  '49F48D82-B10E-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'LFS partition'},
+  '49F48DAA-B10E-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'RAID partition'},
+  '2DB519C4-B10F-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'Concatenated partition'},
+  '2DB519EC-B10F-11DC-B99B-0019D1879648': {'OS': 'NetBSD', 'Description': 'Encrypted partition'},
+  'FE3A2A5D-4F32-41A7-B725-ACCC3285A309': {'OS': 'ChromeOS', 'Description': 'ChromeOS kernel'},
+  '3CB8E202-3B7E-47DD-8A3C-7FF2A13CFCEC': {'OS': 'ChromeOS', 'Description': 'ChromeOS rootfs'},
+  '2E0A753D-9E48-43B0-8337-B15192CB1B5E': {'OS': 'ChromeOS', 'Description': 'ChromeOS future use'},
+  '42465331-3BA3-10F1-802A-4861696B7521': {'OS': 'Haiku', 'Description': 'Haiku BFS'},
+  '85D5E45E-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Boot partition'},
+  '85D5E45A-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Data partition'},
+  '85D5E45B-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Swap partition'},
+  '0394EF8B-237E-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Unix File System (UFS) partition'},
+  '85D5E45C-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'Vinum volume manager partition'},
+  '85D5E45D-237C-11E1-B4B3-E89A8F7FC3A7': {'OS': 'MidnightBSD', 'Description': 'ZFS partition'},
+  '45B0969E-9B03-4F30-B4C6-B4B80CEFF106': {'OS': 'Ceph', 'Description': 'Ceph Journal'},
+  '45B0969E-9B03-4F30-B4C6-5EC00CEFF106': {'OS': 'Ceph', 'Description': 'Ceph dm-crypt Encrypted Journal'},
+  '4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D': {'OS': 'Ceph', 'Description': 'Ceph OSD'},
+  '4FBD7E29-9D25-41B8-AFD0-5EC00CEFF05D': {'OS': 'Ceph', 'Description': 'Ceph dm-crypt OSD'},
+  '89C57F98-2FE5-4DC0-89C1-F3AD0CEFF2BE': {'OS': 'Ceph', 'Description': 'Ceph disk in creation'},
+  '89C57F98-2FE5-4DC0-89C1-5EC00CEFF2BE': {'OS': 'Ceph', 'Description': 'Ceph dm-crypt disk in creation'},
+  '824CC7A0-36A8-11E3-890A-952519AD3F61': {'OS': 'OpenBSD', 'Description': 'Data partition'},
+  'CEF5A9AD-73BC-4601-89F3-CDEEEEE321A1': {'OS': 'QNX', 'Description': 'Power-safe (QNX6) file system'},
+  'C91818F9-8025-47AF-89D2-F030D7000C2C': {'OS': 'Plan 9', 'Description': 'Plan 9 partition'},
+  '9D275380-40AD-11DB-BF97-000C2911D1B8': {'OS': 'VMware ESX', 'Description': 'vmkcore (coredump partition)'},
+  'AA31E02A-400F-11DB-9590-000C2911D1B8': {'OS': 'VMware ESX', 'Description': 'VMFS filesystem partition'},
+  '9198EFFC-31C0-11DB-8F78-000C2911D1B8': {'OS': 'VMware ESX', 'Description': 'VMware Reserved'},
+  '2568845D-2332-4675-BC39-8FA5A4748D15': {'OS': 'Android-IA', 'Description': 'Bootloader'},
+  '114EAFFE-1552-4022-B26E-9B053604CF84': {'OS': 'Android-IA', 'Description': 'Bootloader2'},
+  '49A4D17F-93A3-45C1-A0DE-F50B2EBE2599': {'OS': 'Android-IA', 'Description': 'Boot'},
+  '4177C722-9E92-4AAB-8644-43502BFD5506': {'OS': 'Android-IA', 'Description': 'Recovery'},
+  'EF32A33B-A409-486C-9141-9FFB711F6266': {'OS': 'Android-IA', 'Description': 'Misc'},
+  '20AC26BE-20B7-11E3-84C5-6CFDB94711E9': {'OS': 'Android-IA', 'Description': 'Metadata'},
+  '38F428E6-D326-425D-9140-6E0EA133647C': {'OS': 'Android-IA', 'Description': 'System'},
+  'A893EF21-E428-470A-9E55-0668FD91A2D9': {'OS': 'Android-IA', 'Description': 'Cache'},
+  'DC76DDA9-5AC1-491C-AF42-A82591580C0D': {'OS': 'Android-IA', 'Description': 'Data'},
+  'EBC597D0-2053-4B15-8B64-E0AAC75F4DB1': {'OS': 'Android-IA', 'Description': 'Persistent'},
+  '8F68CC74-C5E5-48DA-BE91-A0C8C15E9C80': {'OS': 'Android-IA', 'Description': 'Factory'},
+  '767941D0-2085-11E3-AD3B-6CFDB94711E9': {'OS': 'Android-IA', 'Description': 'Fastboot / Tertiary'},
+  'AC6D7924-EB71-4DF8-B48D-E267B27148FF': {'OS': 'Android-IA', 'Description': 'OEM'},
+  '7412F7D5-A156-4B13-81DC-867174929325': {'OS': 'ONIE', 'Description': 'Boot'},
+  'D4E6E2CD-4469-46F3-B5CB-1BFF57AFC149': {'OS': 'ONIE', 'Description': 'Config'},
+  '9E1A2D38-C612-4316-AA26-8B49521E5A8B': {'OS': 'PowerPC', 'Description': 'PReP boot'},
+  'BC13C2FF-59E6-4262-A352-B275FD6F7172': {'OS': 'Freedesktop', 'Description': 'Extended Boot Partition ($BOOT)'},
+}
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/sensors.py

@@ -0,0 +1,21 @@
+# Wizard Kit: Settings - Sensors
+
+import re
+
+# General
+TEMP_LIMITS = {
+  'GREEN':  60,
+  'YELLOW': 70,
+  'ORANGE': 80,
+  'RED':    90,
+  }
+
+
+# Regex
+REGEX_COLORS = re.compile(r'\033\[\d+;?1?m')
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/setup.py

@@ -0,0 +1,194 @@
+'''Wizard Kit: Settings - Setup'''
+# pylint: disable=bad-continuation,line-too-long
+# vim: sts=2 sw=2 ts=2
+
+import os
+try:
+  import winreg
+  HKU = winreg.HKEY_USERS
+  HKCR = winreg.HKEY_CLASSES_ROOT
+  HKCU = winreg.HKEY_CURRENT_USER
+  HKLM = winreg.HKEY_LOCAL_MACHINE
+except ImportError:
+  if os.name != 'posix':
+    raise
+
+# General
+OTHER_RESULTS = {
+  'Error': {
+    'CalledProcessError':   'Unknown Error',
+    'FileNotFoundError':  'File not found',
+    },
+  'Warning': {},
+  }
+
+# Browsers
+MOZILLA_FIREFOX_UBO_PATH = r'{}\{}\ublock_origin.xpi'.format(
+  os.environ.get('PROGRAMFILES'),
+  r'Mozilla Firefox\distribution\extensions')
+SETTINGS_GOOGLE_CHROME = {
+  r'Software\Google\Chrome\Extensions\cjpalhdlnbpafiamejdnhcphjbkeiagm': {
+    'SZ Items': {
+      'update_url': 'https://clients2.google.com/service/update2/crx'},
+    'WOW64_32': True,
+    },
+  r'Software\Google\Chrome\Extensions\pgdnlhfefecpicbbihgmbmffkjpaplco': {
+    'SZ Items': {
+      'update_url': 'https://clients2.google.com/service/update2/crx'},
+    'WOW64_32': True,
+    },
+  }
+SETTINGS_MOZILLA_FIREFOX_32 = {
+  r'Software\Mozilla\Firefox\Extensions': {
+    'SZ Items': {
+      'uBlock0@raymondhill.net': MOZILLA_FIREFOX_UBO_PATH},
+    'WOW64_32': True,
+    },
+  }
+SETTINGS_MOZILLA_FIREFOX_64 = {
+  r'Software\Mozilla\Firefox\Extensions': {
+    'SZ Items': {
+      'uBlock0@raymondhill.net': MOZILLA_FIREFOX_UBO_PATH},
+    },
+  }
+
+# Classic Start
+SETTINGS_CLASSIC_START = {
+  r'Software\IvoSoft\ClassicShell\Settings': {},
+  r'Software\IvoSoft\ClassicStartMenu': {
+    'DWORD Items': {'ShowedStyle2': 1},
+    },
+  r'Software\IvoSoft\ClassicStartMenu\MRU': {},
+  r'Software\IvoSoft\ClassicStartMenu\Settings': {
+    'DWORD Items': {'SkipMetro': 1},
+    'SZ Items': {
+      'MenuStyle': 'Win7',
+      'RecentPrograms': 'Recent',
+      },
+    },
+  }
+
+# Explorer
+SETTINGS_EXPLORER_SYSTEM = {
+  # Disable Location Tracking
+  r'Software\Microsoft\Windows NT\CurrentVersion\Sensor\Overrides\{BFA794E4-F964-4FDB-90F6-51056BFE4B44}': {
+    'DWORD Items': {'SensorPermissionState': 0},
+    },
+  r'System\CurrentControlSet\Services\lfsvc\Service\Configuration': {
+    'Status': {'Value': 0},
+    },
+  # Disable Telemetry
+  r'SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
+    # Using SOFTWARE in all caps to avoid collision with 32-bit setting below
+    'DWORD Items': {'AllowTelemetry': 0},
+    },
+  r'Software\Microsoft\Windows\CurrentVersion\Policies\DataCollection': {
+    'DWORD Items': {'AllowTelemetry': 0},
+    'WOW64_32': True,
+    },
+  r'Software\Policies\Microsoft\Windows\DataCollection': {
+    'DWORD Items': {'AllowTelemetry': 0},
+    },
+  # Disable Wi-Fi Sense
+  r'Software\Microsoft\PolicyManager\default\WiFi\AllowWiFiHotSpotReporting': {
+    'DWORD Items': {'Value': 0},
+    },
+  r'Software\Microsoft\PolicyManager\default\WiFi\AllowAutoConnectToWiFiSenseHotspots': {
+    'DWORD Items': {'Value': 0},
+    },
+  }
+SETTINGS_EXPLORER_USER = {
+  # Desktop theme
+  r'Software\Microsoft\Windows\CurrentVersion\Themes\Personalize': {
+    'Invalid modes': ['Cur'],
+    'DWORD Items': {
+      # <= v1809 default
+      'AppsUseLightTheme': 1,
+      'SystemUsesLightTheme': 0,
+      },
+    },
+  # Disable features
+  r'Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager': {
+    'DWORD Items': {
+      # Silently installed apps
+      'SilentInstalledAppsEnabled': 0,
+      # Tips and Tricks
+      'SoftLandingEnabled ': 0,
+      'SubscribedContent-338389Enabled': 0,
+      },
+    },
+  # File Explorer
+  r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced': {
+    'Invalid modes': ['Cur'],
+    'DWORD Items': {
+      # Change default Explorer view to "Computer"
+      'LaunchTo': 1,
+      },
+    },
+  r'SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced': {
+  # Dup path so it Will be applied to all modes
+    'DWORD Items': {
+      # Launch Folder Windows in a Separate Process
+      'SeparateProcess': 1,
+      },
+    },
+  # Hide People bar
+  r'Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced\People': {
+    'Invalid modes': ['Cur'],
+    'DWORD Items': {'PeopleBand': 0},
+    },
+  # Hide Search button / box
+  r'Software\Microsoft\Windows\CurrentVersion\Search': {
+    'Invalid modes': ['Cur'],
+    'DWORD Items': {'SearchboxTaskbarMode': 0},
+    },
+  }
+
+# LibreOffice
+LIBREOFFICE_XCU_DATA = '''<?xml version="1.0" encoding="UTF-8"?>
+<oor:items xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.presentation.PresentationDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Impress MS PowerPoint 2007 XML</value></prop></item>
+<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.sheet.SpreadsheetDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>Calc MS Excel 2007 XML</value></prop></item>
+<item oor:path="/org.openoffice.Setup/Office/Factories/org.openoffice.Setup:Factory['com.sun.star.text.TextDocument']"><prop oor:name="ooSetupFactoryDefaultFilter" oor:op="fuse"><value>MS Word 2007 XML</value></prop></item>
+<item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="WarnAlienFormat" oor:op="fuse"><value>false</value></prop></item>
+</oor:items>
+'''
+
+# Visual C++ Runtimes
+VCR_REDISTS = [
+  {'Name': 'Visual C++ 2010 x32...',
+    'Cmd': [r'2010sp1\x32\vcredist.exe', '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2010 x64...',
+    'Cmd': [r'2010sp1\x64\vcredist.exe', '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2012 Update 4 x32...',
+    'Cmd': [r'2012u4\x32\vcredist.exe', '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2012 Update 4 x64...',
+    'Cmd': [r'2012u4\x64\vcredist.exe', '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2013 x32...',
+    'Cmd': [r'2013\x32\vcredist.exe', '/install',
+      '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2013 x64...',
+    'Cmd': [r'2013\x64\vcredist.exe', '/install',
+      '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2017 x32...',
+    'Cmd': [r'2017\x32\vcredist.exe', '/install',
+      '/passive', '/norestart']},
+  {'Name': 'Visual C++ 2017 x64...',
+    'Cmd': [r'2017\x64\vcredist.exe', '/install',
+      '/passive', '/norestart']},
+  ]
+
+# Windows Updates
+SETTINGS_WINDOWS_UPDATES = {
+  r'Software\Microsoft\WindowsUpdate\UX\Settings': {
+    'DWORD Items': {
+      # Set to non-targeted readiness level
+      'BranchReadinessLevel': 32,
+      'DeferFeatureUpdatesPeriodInDays': 60,
+      },
+    }
+  }
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")

.bin/Scripts/settings/sources.py

@@ -1,203 +1,229 @@
-# Wizard Kit: Settings - Sources
+'''Wizard Kit: Settings - Sources'''
+# pylint: disable=line-too-long
+# vim: sts=2 sw=2 ts=2 tw=0
 
 SOURCE_URLS = {
-    'AIDA64': 'http://download.aida64.com/aida64engineer595.zip',
-    'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1801120035/AcroRdrDC1801120035_en_US.exe',
-    'AdwCleaner': 'https://toolslib.net/downloads/finish/1-adwcleaner/',
-    'Autoruns': 'https://download.sysinternals.com/files/Autoruns.zip',
-    'BleachBit': 'https://download.bleachbit.org/BleachBit-2.0-portable.zip',
-    'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip',
-    'BlueScreenView64': 'http://www.nirsoft.net/utils/bluescreenview-x64.zip',
-    'Caffeine': 'http://www.zhornsoftware.co.uk/caffeine/caffeine.zip',
-    'ClassicStartSkin': 'http://www.classicshell.net/forum/download/file.php?id=3001&sid=9a195960d98fd754867dcb63d9315335',
-    'Du': 'https://download.sysinternals.com/files/DU.zip',
-    'ERUNT': 'http://www.aumha.org/downloads/erunt.zip',
-    'Everything32': 'https://www.voidtools.com/Everything-1.4.1.895.x86.zip',
-    'Everything64': 'https://www.voidtools.com/Everything-1.4.1.895.x64.zip',
-    'FastCopy32': 'http://ftp.vector.co.jp/69/93/2323/FastCopy341.zip',
-    'FastCopy64': 'http://ftp.vector.co.jp/69/93/2323/FastCopy341_x64.zip',
-    'Firefox uBO': 'https://addons.cdn.mozilla.net/user-media/addons/607454/ublock_origin-1.15.10-an+fx.xpi?filehash=sha256%3A30b258803fd6cd988c5ba479f2f6ff5b4e9b40110c81e3421a6867b20ec718a6',
-    'HWiNFO': 'http://app.oldfoss.com:81/download/HWiNFO/hwi_574.zip',
-    'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
-    'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
-    'IOBit_Uninstaller': 'https://portableapps.com/redirect/?a=IObitUninstallerPortable&t=http%3A%2F%2Fdownloads.portableapps.com%2Fportableapps%2Fiobituninstallerportable%2FIObitUninstallerPortable_7.3.0.13.paf.exe',
-    'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27527/eng/Intel%20SSD%20Toolbox%20-%20v3.5.1.exe',
-    'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
-    'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.5.5/npp.7.5.5.bin.minimalist.7z',
-    'Office Deployment Tool 2013': 'https://download.microsoft.com/download/6/2/3/6230F7A2-D8A9-478B-AC5C-57091B632FCF/officedeploymenttool_x86_4827-1000.exe',
-    'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_8529.3600.exe',
-    'ProduKey32': 'http://www.nirsoft.net/utils/produkey.zip',
-    'ProduKey64': 'http://www.nirsoft.net/utils/produkey-x64.zip',
-    'PuTTY': 'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip',
-    'RKill': 'https://www.bleepingcomputer.com/download/rkill/dl/10/',
-    'SDIO Themes': 'http://snappy-driver-installer.org/downloads/SDIO_Themes.zip',
-    'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent',
-    'Samsung Magician': 'http://downloadcenter.samsung.com/content/SW/201801/20180123130636806/Samsung_Magician_Installer.exe',
-    'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
-    'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip',
-    'TreeSizeFree': 'https://www.jam-software.com/treesize_free/TreeSizeFree-Portable.zip',
-    'wimlib32': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-i686-bin.zip',
-    'wimlib64': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip',
-    'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
-    'XMPlay 7z': 'http://support.xmplay.com/files/16/xmp-7z.zip?v=800962',
-    'XMPlay Game': 'http://support.xmplay.com/files/12/xmp-gme.zip?v=515637',
-    'XMPlay RAR': 'http://support.xmplay.com/files/16/xmp-rar.zip?v=409646',
-    'XMPlay WAModern': 'http://support.xmplay.com/files/10/WAModern.zip?v=207099',
-    'XMPlay': 'http://support.xmplay.com/files/20/xmplay383.zip?v=298195',
-    'XYplorerFree': 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip',
-    'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.33.1/aria2-1.33.1-win-32bit-build1.zip',
-    }
+  'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1901020098/AcroRdrDC1901020098_en_US.exe',
+  'AdwCleaner': 'https://downloads.malwarebytes.com/file/adwcleaner',
+  'AIDA64': 'http://download.aida64.com/aida64engineer599.zip',
+  'aria2': 'https://github.com/aria2/aria2/releases/download/release-1.34.0/aria2-1.34.0-win-32bit-build1.zip',
+  'Autoruns': 'https://download.sysinternals.com/files/Autoruns.zip',
+  'BleachBit': 'https://download.bleachbit.org/BleachBit-2.0-portable.zip',
+  'BlueScreenView32': 'http://www.nirsoft.net/utils/bluescreenview.zip',
+  'BlueScreenView64': 'http://www.nirsoft.net/utils/bluescreenview-x64.zip',
+  'Caffeine': 'http://www.zhornsoftware.co.uk/caffeine/caffeine.zip',
+  'ClassicStartSkin': 'http://www.classicshell.net/forum/download/file.php?id=3001&sid=9a195960d98fd754867dcb63d9315335',
+  'Du': 'https://download.sysinternals.com/files/DU.zip',
+  'ERUNT': 'http://www.aumha.org/downloads/erunt.zip',
+  'Everything32': 'https://www.voidtools.com/Everything-1.4.1.935.x86.en-US.zip',
+  'Everything64': 'https://www.voidtools.com/Everything-1.4.1.935.x64.en-US.zip',
+  'FastCopy': 'https://fastcopy.jp/archive/FastCopy380_installer.exe',
+  'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/1709472/ublock_origin-1.18.6-an+fx.xpi',
+  'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
+  'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
+  'HWiNFO': 'http://files2.majorgeeks.com/377527622c5325acc1cb937fb149d0de922320c0/systeminfo/hwi_602.zip',
+  'Intel SSD Toolbox': r'https://downloadmirror.intel.com/28593/eng/Intel%20SSD%20Toolbox%20-%20v3.5.9.exe',
+  'IOBit_Uninstaller': r'https://portableapps.com/redirect/?a=IObitUninstallerPortable&s=s&d=pa&f=IObitUninstallerPortable_7.5.0.7.paf.exe',
+  'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
+  'LibreOffice': 'https://download.documentfoundation.org/libreoffice/stable/6.2.4/win/x86_64/LibreOffice_6.2.4_Win_x64.msi',
+  'Macs Fan Control': 'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe',
+  'NirCmd32': 'https://www.nirsoft.net/utils/nircmd.zip',
+  'NirCmd64': 'https://www.nirsoft.net/utils/nircmd-x64.zip',
+  'NotepadPlusPlus': 'https://notepad-plus-plus.org/repository/7.x/7.6.4/npp.7.6.4.bin.minimalist.7z',
+  'Office Deployment Tool': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_11509-33604.exe',
+  'ProduKey32': 'http://www.nirsoft.net/utils/produkey.zip',
+  'ProduKey64': 'http://www.nirsoft.net/utils/produkey-x64.zip',
+  'PuTTY': 'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip',
+  'RKill': 'https://www.bleepingcomputer.com/download/rkill/dl/10/',
+  'Samsung Magician': 'https://s3.ap-northeast-2.amazonaws.com/global.semi.static/SAMSUNG_SSD_v5_3_0_181121/CD0C7CC1BE00525FAC4675B9E502899B41D5C3909ECE3AA2FB6B74A766B2A1EA/Samsung_Magician_Installer.zip',
+  'SDIO Themes': 'http://snappy-driver-installer.org/downloads/SDIO_Themes.zip',
+  'SDIO Torrent': 'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent',
+  'TDSSKiller': 'https://media.kaspersky.com/utilities/VirusUtilities/EN/tdsskiller.exe',
+  'TestDisk': 'https://www.cgsecurity.org/testdisk-7.1-WIP.win.zip',
+  'wimlib32': 'https://wimlib.net/downloads/wimlib-1.13.1-windows-i686-bin.zip',
+  'wimlib64': 'https://wimlib.net/downloads/wimlib-1.13.1-windows-x86_64-bin.zip',
+  'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
+  'WizTree': 'https://antibody-software.com/files/wiztree_3_28_portable.zip',
+  'XMPlay 7z': 'https://support.xmplay.com/files/16/xmp-7z.zip?v=800962',
+  'XMPlay Game': 'https://support.xmplay.com/files/12/xmp-gme.zip?v=515637',
+  'XMPlay RAR': 'https://support.xmplay.com/files/16/xmp-rar.zip?v=409646',
+  'XMPlay WAModern': 'https://support.xmplay.com/files/10/WAModern.zip?v=207099',
+  'XMPlay': 'https://support.xmplay.com/files/20/xmplay383.zip?v=298195',
+  'XYplorerFree': 'https://www.xyplorer.com/download/xyplorer_free_noinstall.zip',
+  }
 VCREDIST_SOURCES = {
-    '2008sp1': {
-        '32': 'https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x86.exe',
-        '64': 'https://download.microsoft.com/download/5/D/8/5D8C65CB-C849-4025-8E95-C3966CAFD8AE/vcredist_x64.exe',
-        },
-    '2010sp1': {
-        '32': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe',
-        '64': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe',
-        },
-    '2012u4': {
-        '32': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe',
-        '64': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe',
-        },
-    '2013': {
-        '32': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe',
-        '64': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe',
-        },
-    '2017': {
-        '32': 'https://download.visualstudio.microsoft.com/download/pr/100349138/88b50ce70017bf10f2d56d60fcba6ab1/VC_redist.x86.exe',
-        '64': 'https://download.visualstudio.microsoft.com/download/pr/100349091/2cd2dba5748dc95950a5c42c2d2d78e4/VC_redist.x64.exe',
-        },
-    }
+  '2010sp1': {
+    '32': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x86.exe',
+    '64': 'https://download.microsoft.com/download/1/6/5/165255E7-1014-4D0A-B094-B6A430A6BFFC/vcredist_x64.exe',
+    },
+  '2012u4': {
+    '32': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x86.exe',
+    '64': 'https://download.microsoft.com/download/1/6/B/16B06F60-3B20-4FF2-B699-5E9B7962F9AE/VSU_4/vcredist_x64.exe',
+    },
+  '2013': {
+    '32': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x86.exe',
+    '64': 'https://download.microsoft.com/download/0/5/6/056dcda9-d667-4e27-8001-8a0c6971d6b1/vcredist_x64.exe',
+    },
+  '2017': {
+    '32': 'https://aka.ms/vs/15/release/vc_redist.x86.exe',
+    '64': 'https://aka.ms/vs/15/release/vc_redist.x64.exe',
+    },
+  }
+NINITE_REGEX = {
+  'base': ['7-Zip', 'VLC'],
+  'standard': ['Google Chrome', 'Mozilla Firefox', 'SumatraPDF'],
+  'standard7': ['Google Chrome', 'Mozilla Firefox', 'SumatraPDF'],
+  }
 NINITE_SOURCES = {
-    'Bundles': {
-        'Runtimes.exe': '.net4.7.1-air-java8-silverlight',
-        'Legacy.exe': '.net4.7.1-7zip-air-chrome-firefox-java8-silverlight-vlc',
-        'Modern.exe': '.net4.7.1-7zip-air-chrome-classicstart-firefox-java8-silverlight-vlc',
-        },
-    'Audio-Video': {
-        'AIMP.exe': 'aimp',
-        'Audacity.exe': 'audacity',
-        'CCCP.exe': 'cccp',
-        'Foobar2000.exe': 'foobar',
-        'GOM.exe': 'gom',
-        'HandBrake.exe': 'handbrake',
-        'iTunes.exe': 'itunes',
-        'K-Lite Codecs.exe': 'klitecodecs',
-        'MediaMonkey.exe': 'mediamonkey',
-        'MusicBee.exe': 'musicbee',
-        'Spotify.exe': 'spotify',
-        'VLC.exe': 'vlc',
-        'Winamp.exe': 'winamp',
-        },
-    'Cloud Storage': {
-        'Dropbox.exe': 'dropbox',
-        'Google Backup & Sync.exe': 'googlebackupandsync',
-        'Mozy.exe': 'mozy',
-        'OneDrive.exe': 'onedrive',
-        'SugarSync.exe': 'sugarsync',
-        },
-    'Communication': {
-        'Pidgin.exe': 'pidgin',
-        'Skype.exe': 'skype',
-        'Trillian.exe': 'trillian',
-        },
-    'Compression': {
-        '7-Zip.exe': '7zip',
-        'PeaZip.exe': 'peazip',
-        'WinRAR.exe': 'winrar',
-        },
-    'Developer': {
-        'Eclipse.exe': 'eclipse',
-        'FileZilla.exe': 'filezilla',
-        'JDK 8.exe': 'jdk8',
-        'JDK 8 (x64).exe': 'jdkx8',
-        'Notepad++.exe': 'notepadplusplus',
-        'PuTTY.exe': 'putty',
-        'Python 2.exe': 'python',
-        'Visual Studio Code.exe': 'vscode',
-        'WinMerge.exe': 'winmerge',
-        'WinSCP.exe': 'winscp',
-        },
-    'File Sharing': {
-        'qBittorrent.exe': 'qbittorrent',
-        },
-    'Image-Photo': {
-        'Blender.exe': 'blender',
-        'FastStone.exe': 'faststone',
-        'GIMP.exe': 'gimp',
-        'Greenshot.exe': 'greenshot',
-        'Inkscape.exe': 'inkscape',
-        'IrfanView.exe': 'irfanview',
-        'Krita.exe': 'krita',
-        'Paint.NET.exe': 'paint.net',
-        'ShareX.exe': 'sharex',
-        'XnView.exe': 'xnview',
-        },
-    'Misc': {
-        'Evernote.exe': 'evernote',
-        'Everything.exe': 'everything',
-        'KeePass 2.exe': 'keepass2',
-        'Google Earth.exe': 'googleearth',
-        'NV Access.exe': 'nvda',
-        'Steam.exe': 'steam',
-        },
-    'Office': {
-        'CutePDF.exe': 'cutepdf',
-        'Foxit Reader.exe': 'foxit',
-        'LibreOffice.exe': 'libreoffice',
-        'OpenOffice.exe': 'openoffice',
-        'PDFCreator.exe': 'pdfcreator',
-        'SumatraPDF.exe': 'sumatrapdf',
-        'Thunderbird.exe': 'thunderbird',
-        },
-    'Runtimes': {
-        'Adobe Air.exe': 'air',
-        'dotNET.exe': '.net4.7.1',
-        'Java 8.exe': 'java8',
-        'Shockwave.exe': 'shockwave',
-        'Silverlight.exe': 'silverlight',
-        },
-    'Security': {
-        'Avast.exe': 'avast',
-        'AVG.exe': 'avg',
-        'Avira.exe': 'avira',
-        'Microsoft Security Essentials.exe': 'essentials',
-        'Malwarebytes Anti-Malware.exe': 'malwarebytes',
-        'Spybot 2.exe': 'spybot2',
-        'SUPERAntiSpyware.exe': 'super',
-        },
-    'Utilities': {
-        'CDBurnerXP.exe': 'cdburnerxp',
-        'Classic Start.exe': 'classicstart',
-        'Glary Utilities.exe': 'glary',
-        'ImgBurn.exe': 'imgburn',
-        'InfraRecorder.exe': 'infrarecorder',
-        'Launchy.exe': 'launchy',
-        'RealVNC.exe': 'realvnc',
-        'Revo Uninstaller.exe': 'revo',
-        'TeamViewer 12.exe': 'teamviewer12',
-        'TeraCopy.exe': 'teracopy',
-        'WinDirStat.exe': 'windirstat',
-        },
-    'Web Browsers': {
-        'Google Chrome.exe': 'chrome',
-        'Mozilla Firefox.exe': 'firefox',
-        'Opera Chromium.exe': 'operaChromium',
-        },
-    }
+  'Bundles': {
+    'base.exe': '.net4.7.2-7zip-vlc',
+    'base-standard.exe': '.net4.7.2-7zip-chrome-classicstart-firefox-sumatrapdf-vlc',
+    'base-standard7.exe': '.net4.7.2-7zip-chrome-firefox-sumatrapdf-vlc',
+    'standard.exe': 'chrome-classicstart-firefox-sumatrapdf',
+    'standard7.exe': 'chrome-firefox-sumatrapdf',
+    },
+  'Audio-Video': {
+    'AIMP.exe': 'aimp',
+    'Audacity.exe': 'audacity',
+    'CCCP.exe': 'cccp',
+    'Foobar2000.exe': 'foobar',
+    'GOM.exe': 'gom',
+    'HandBrake.exe': 'handbrake',
+    'iTunes.exe': 'itunes',
+    'K-Lite Codecs.exe': 'klitecodecs',
+    'MediaMonkey.exe': 'mediamonkey',
+    'MusicBee.exe': 'musicbee',
+    'Spotify.exe': 'spotify',
+    'VLC.exe': 'vlc',
+    'Winamp.exe': 'winamp',
+    },
+  'Cloud Storage': {
+    'Dropbox.exe': 'dropbox',
+    'Google Backup & Sync.exe': 'googlebackupandsync',
+    'Mozy.exe': 'mozy',
+    'OneDrive.exe': 'onedrive',
+    'SugarSync.exe': 'sugarsync',
+    },
+  'Communication': {
+    'Discord.exe': 'discord',
+    'Pidgin.exe': 'pidgin',
+    'Skype.exe': 'skype',
+    'Trillian.exe': 'trillian',
+    },
+  'Compression': {
+    '7-Zip.exe': '7zip',
+    'PeaZip.exe': 'peazip',
+    'WinRAR.exe': 'winrar',
+    },
+  'Developer': {
+    'Eclipse.exe': 'eclipse',
+    'Notepad++.exe': 'notepadplusplus',
+    'PuTTY.exe': 'putty',
+    'Python 2.exe': 'python',
+    'Visual Studio Code.exe': 'vscode',
+    'WinMerge.exe': 'winmerge',
+    'WinSCP.exe': 'winscp',
+    },
+  'File Sharing': {
+    'qBittorrent.exe': 'qbittorrent',
+    },
+  'Image-Photo': {
+    'Blender.exe': 'blender',
+    'FastStone.exe': 'faststone',
+    'GIMP.exe': 'gimp',
+    'Greenshot.exe': 'greenshot',
+    'Inkscape.exe': 'inkscape',
+    'IrfanView.exe': 'irfanview',
+    'Krita.exe': 'krita',
+    'Paint.NET.exe': 'paint.net',
+    'ShareX.exe': 'sharex',
+    'XnView.exe': 'xnview',
+    },
+  'Misc': {
+    'Evernote.exe': 'evernote',
+    'Everything.exe': 'everything',
+    'KeePass 2.exe': 'keepass2',
+    'Google Earth.exe': 'googleearth',
+    'NV Access.exe': 'nvda',
+    'Steam.exe': 'steam',
+    },
+  'Office': {
+    'CutePDF.exe': 'cutepdf',
+    'Foxit Reader.exe': 'foxit',
+    'LibreOffice.exe': 'libreoffice',
+    'OpenOffice.exe': 'openoffice',
+    'PDFCreator.exe': 'pdfcreator',
+    'SumatraPDF.exe': 'sumatrapdf',
+    'Thunderbird.exe': 'thunderbird',
+    },
+  'Runtimes': {
+    'Adobe Air.exe': 'air',
+    'dotNET.exe': '.net4.7.2',
+    'Shockwave.exe': 'shockwave',
+    'Silverlight.exe': 'silverlight',
+    },
+  'Security': {
+    'Avast.exe': 'avast',
+    'AVG.exe': 'avg',
+    'Avira.exe': 'avira',
+    'Microsoft Security Essentials.exe': 'essentials',
+    'Malwarebytes Anti-Malware.exe': 'malwarebytes',
+    'Spybot 2.exe': 'spybot2',
+    'SUPERAntiSpyware.exe': 'super',
+    },
+  'Utilities': {
+    'CDBurnerXP.exe': 'cdburnerxp',
+    'Classic Start.exe': 'classicstart',
+    'Glary Utilities.exe': 'glary',
+    'ImgBurn.exe': 'imgburn',
+    'InfraRecorder.exe': 'infrarecorder',
+    'Launchy.exe': 'launchy',
+    'RealVNC.exe': 'realvnc',
+    'Revo Uninstaller.exe': 'revo',
+    'TeamViewer 14.exe': 'teamviewer14',
+    'TeraCopy.exe': 'teracopy',
+    'WinDirStat.exe': 'windirstat',
+    },
+  'Web Browsers': {
+    'Google Chrome.exe': 'chrome',
+    'Mozilla Firefox.exe': 'firefox',
+    'Opera Chromium.exe': 'operaChromium',
+    },
+  }
 RST_SOURCES = {
-    #SetupRST_12.0.exe :  Removed from download center?
-    #SetupRST_12.5.exe :  Removed from download center?
-    #SetupRST_12.8.exe :  Removed from download center?
-    'SetupRST_12.9.exe': 'https://downloadmirror.intel.com/23496/eng/SetupRST.exe',
-    #SetupRST_13.x.exe :  Broken, doesn't support > .NET 4.5
-    'SetupRST_14.0.exe': 'https://downloadmirror.intel.com/25091/eng/SetupRST.exe',
-    'SetupRST_14.8.exe': 'https://downloadmirror.intel.com/26759/eng/setuprst.exe',
-    'SetupRST_15.8.exe': 'https://downloadmirror.intel.com/27442/eng/SetupRST.exe',
-    'SetupRST_15.9.exe': 'https://downloadmirror.intel.com/27400/eng/SetupRST.exe',
-    }
+  #SetupRST_12.0.exe :  Removed from download center?
+  #SetupRST_12.5.exe :  Removed from download center?
+  #SetupRST_12.8.exe :  Removed from download center?
+  'SetupRST_12.9.exe': 'https://downloadmirror.intel.com/23496/eng/SetupRST.exe',
+  #SetupRST_13.x.exe :  Broken, doesn't support > .NET 4.5
+  'SetupRST_14.0.exe': 'https://downloadmirror.intel.com/25091/eng/SetupRST.exe',
+  'SetupRST_14.8.exe': 'https://downloadmirror.intel.com/26759/eng/setuprst.exe',
+  'SetupRST_15.8.exe': 'https://downloadmirror.intel.com/27442/eng/SetupRST.exe',
+  'SetupRST_15.9.exe': 'https://downloadmirror.intel.com/28656/eng/SetupRST.exe',
+  #SetupRST_16.0.exe :  Deprecated by Intel
+  #SetupRST_16.5.exe :  Deprecated by Intel
+  #SetupRST_16.7.exe :  Deprecated by Intel
+  'SetupRST_16.8.exe': 'https://downloadmirror.intel.com/28653/eng/SetupRST.exe',
+  'SetupRST_17.2.exe': 'https://downloadmirror.intel.com/28650/eng/SetupRST.exe',
+  }
+WINDOWS_UPDATE_SOURCES = {
+  '2999226': {
+    # https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows
+    '7': {
+      '32': 'https://download.microsoft.com/download/4/F/E/4FE73868-5EDD-4B47-8B33-CE1BB7B2B16A/Windows6.1-KB2999226-x86.msu',
+      '64': 'https://download.microsoft.com/download/1/1/5/11565A9A-EA09-4F0A-A57E-520D5D138140/Windows6.1-KB2999226-x64.msu',
+      },
+    '8': {
+      '32': 'https://download.microsoft.com/download/1/E/8/1E8AFE90-5217-464D-9292-7D0B95A56CE4/Windows8-RT-KB2999226-x86.msu',
+      '64': 'https://download.microsoft.com/download/A/C/1/AC15393F-A6E6-469B-B222-C44B3BB6ECCC/Windows8-RT-KB2999226-x64.msu',
+      },
+    '8.1': {
+      '32': 'https://download.microsoft.com/download/E/4/6/E4694323-8290-4A08-82DB-81F2EB9452C2/Windows8.1-KB2999226-x86.msu',
+      '64': 'https://download.microsoft.com/download/9/6/F/96FD0525-3DDF-423D-8845-5F92F4A6883E/Windows8.1-KB2999226-x64.msu',
+      },
+    },
+  }
 
 
 if __name__ == '__main__':
-    print("This file is not meant to be called directly.")
+  print("This file is not meant to be called directly.")

.bin/Scripts/settings/sw_diags.py

@@ -0,0 +1,29 @@
+# Wizard Kit: Settings - SW Diagnostics
+
+# General
+AUTORUNS_SETTINGS = {
+  r'Software\Sysinternals\AutoRuns': {
+    'checkvirustotal': 1,
+    'EulaAccepted': 1,
+    'shownomicrosoft': 1,
+    'shownowindows': 1,
+    'showonlyvirustotal': 1,
+    'submitvirustotal': 0,
+    'verifysignatures': 1,
+    },
+  r'Software\Sysinternals\AutoRuns\SigCheck': {
+    'EulaAccepted': 1,
+    },
+  r'Software\Sysinternals\AutoRuns\Streams': {
+    'EulaAccepted': 1,
+    },
+  r'Software\Sysinternals\AutoRuns\VirusTotal': {
+    'VirusTotalTermsAccepted': 1,
+    },
+  }
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/tools.py

@@ -1,53 +1,59 @@
 # Wizard Kit: 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'},
-    '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'},
-    }
+  # 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'},
+  'NirCmd': {
+    '32': r'NirCmd\nircmdc.exe',
+    '64': r'NirCmd\nircmdc64.exe'},
+  'NotepadPlusPlus': {
+    '32': r'NotepadPlusPlus\notepadplusplus.exe'},
+  'ProduKey': {
+    '32': r'ProduKey\ProduKey.exe',
+    '64': r'ProduKey\ProduKey64.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.")
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/ufd.py

@@ -0,0 +1,118 @@
+'''Wizard Kit: Settings - UFD'''
+# pylint: disable=C0326,E0611
+# vim: sts=2 sw=2 ts=2
+
+from collections import OrderedDict
+from settings.main import KIT_NAME_FULL,KIT_NAME_SHORT
+
+# General
+DOCSTRING = '''WizardKit: Build UFD
+
+Usage:
+  build-ufd [options] --ufd-device PATH --linux PATH
+            [--linux-minimal PATH]
+            [--main-kit PATH]
+            [--winpe PATH]
+            [--extra-dir PATH]
+  build-ufd (-h | --help)
+
+Options:
+  -d PATH, --linux-dgpu PATH
+  -e PATH, --extra-dir PATH
+  -k PATH, --main-kit PATH
+  -l PATH, --linux PATH
+  -m PATH, --linux-minimal PATH
+  -u PATH, --ufd-device PATH
+  -w PATH, --winpe PATH
+
+  -h --help             Show this page
+  -M --use-mbr          Use real MBR instead of GPT w/ Protective MBR
+  -F --force            Bypass all confirmation messages. USE WITH EXTREME CAUTION!
+  -U --update           Don't format device, just update
+'''
+ISO_LABEL = '{}_LINUX'.format(KIT_NAME_SHORT)
+UFD_LABEL = '{}_UFD'.format(KIT_NAME_SHORT)
+UFD_SOURCES = OrderedDict({
+  'Linux':            {'Arg': '--linux',          'Type': 'ISO'},
+  'Linux (dGPU)':     {'Arg': '--linux-dgpu',     'Type': 'ISO'},
+  'Linux (Minimal)':  {'Arg': '--linux-minimal',  'Type': 'ISO'},
+  'WinPE':            {'Arg': '--winpe',          'Type': 'ISO'},
+  'Main Kit':         {'Arg': '--main-kit',       'Type': 'KIT'},
+  'Extra Dir':        {'Arg': '--extra-dir',      'Type': 'DIR'},
+  })
+
+# Definitions: Boot entries
+BOOT_ENTRIES = {
+  # Path to check:      Comment to remove
+  '/arch_minimal':      'UFD-MINIMAL',
+  '/dgpu':              'UFD-DGPU',
+  '/sources/boot.wim':  'UFD-WINPE',
+  }
+BOOT_FILES = {
+  # Directory:            extension
+  '/arch/boot/syslinux':  'cfg',
+  '/EFI/boot':            'conf',
+  }
+
+# Definitions: Sources and Destinations
+## NOTES: Paths are relative to the root of the ISO/UFD
+##        Sources use rsync's trailing slash syntax
+ITEMS = {
+  'Extra Dir': (
+    ('/',                             '/'),
+    ),
+  'Linux': (
+    ('/arch',                         '/'),
+    ('/isolinux',                     '/'),
+    ('/EFI/boot',                     '/EFI/'),
+    ('/EFI/memtest86',                '/EFI/'),
+    ),
+  'Linux (dGPU)': (
+    ('/arch/boot/x86_64/archiso.img', '/dgpu/'),
+    ('/arch/boot/x86_64/vmlinuz',     '/dgpu/'),
+    ('/arch/pkglist.x86_64.txt',      '/dgpu/'),
+    ('/arch/x86_64',                  '/dgpu/'),
+    ),
+  'Linux (Minimal)': (
+    ('/arch/boot/x86_64/archiso.img', '/arch_minimal/'),
+    ('/arch/boot/x86_64/vmlinuz',     '/arch_minimal/'),
+    ('/arch/pkglist.x86_64.txt',      '/arch_minimal/'),
+    ('/arch/x86_64',                  '/arch_minimal/'),
+    ),
+  'Main Kit': (
+    ('/',                             '/{}/'.format(KIT_NAME_FULL)),
+    ),
+  'WinPE': (
+    ('/bootmgr',                      '/'),
+    ('/bootmgr.efi',                  '/'),
+    ('/en_us',                        '/'),
+    ('/Boot/',                        '/boot/'),
+    ('/EFI/Boot/',                    '/EFI/Microsoft/'),
+    ('/EFI/Microsoft/',               '/EFI/Microsoft/'),
+    ('/Boot/BCD',                     '/sources/'),
+    ('/Boot/boot.sdi',                '/sources/'),
+    ('/bootmgr',                      '/sources/'),
+    ('/sources/boot.wim',             '/sources/'),
+    ),
+  }
+ITEMS_HIDDEN = (
+  # Linux (all versions)
+  'arch',
+  'arch_minimal',
+  'dgpu',
+  'EFI',
+  'isolinux',
+  # Main Kit
+  '{}/.bin'.format(KIT_NAME_FULL),
+  '{}/.cbin'.format(KIT_NAME_FULL),
+  # WinPE
+  'boot',
+  'bootmgr',
+  'bootmgr.efi',
+  'en-us',
+  'images',
+  'sources',
+  )
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")

.bin/Scripts/settings/windows_builds.py

@@ -0,0 +1,225 @@
+'''Wizard Kit: Settings - Windows Builds'''
+# pylint: disable=bad-continuation,bad-whitespace
+# vim: sts=2 sw=2 ts=2
+## NOTE: Data from here: https://en.wikipedia.org/wiki/Windows_10_version_history
+
+WINDOWS_BUILDS = {
+  # Build, Version, Release, Codename, Marketing Name, Notes
+   '6000': ('Vista',  'RTM',    'Longhorn',     None,   'unsupported'),
+   '6001': ('Vista',  'SP1',    'Longhorn',     None,   'unsupported'),
+   '6002': ('Vista',  'SP2',    'Longhorn',     None,   'unsupported'),
+
+   '7600': ('7',      'RTM',    'Vienna',       None,   'unsupported'),
+   '7601': ('7',      'SP1',    'Vienna',       None,   'outdated'),
+
+   #9199 is a fake build since Win 8 is 6.2.9200 but that collides with Win 8.1 (6.3.9200)
+   '9199': ('8',      'RTM',    None,           None,   'unsupported'),
+
+   '9200': ('8.1',    None,     'Blue',         None,   'outdated'),
+   '9600': ('8.1',    None,     'Update',       None,   None),
+
+   '9841': ('10',     None,     'Threshold 1',  None,   'preview build'),
+   '9860': ('10',     None,     'Threshold 1',  None,   'preview build'),
+   '9879': ('10',     None,     'Threshold 1',  None,   'preview build'),
+   '9926': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10041': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10049': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10061': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10074': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10122': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10130': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10158': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10159': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10162': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10166': ('10',     None,     'Threshold 1',  None,   'preview build'),
+  '10240': ('10',     'v1507',  'Threshold 1',  None,   'unsupported'),
+  '10525': ('10',     None,     'Threshold 2',  None,   'preview build'),
+  '10532': ('10',     None,     'Threshold 2',  None,   'preview build'),
+  '10547': ('10',     None,     'Threshold 2',  None,   'preview build'),
+  '10565': ('10',     None,     'Threshold 2',  None,   'preview build'),
+  '10576': ('10',     None,     'Threshold 2',  None,   'preview build'),
+  '10586': ('10',     'v1511',  'Threshold 2',  'November Update', 'unsupported'),
+  '11082': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '11099': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '11102': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14251': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14257': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14271': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14279': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14291': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14295': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14316': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14328': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14332': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14342': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14352': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14361': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14366': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14367': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14371': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14372': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14376': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14379': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14383': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14385': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14388': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14390': ('10',     None,     'Redstone 1',   None,   'preview build'),
+  '14393': ('10',     'v1607',  'Redstone 1',   'Anniversary Update', 'unsupported'),
+  '14901': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14905': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14915': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14926': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14931': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14936': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14942': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14946': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14951': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14955': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14959': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14965': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14971': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '14986': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15002': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15007': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15014': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15019': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15025': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15031': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15042': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15046': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15048': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15055': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15058': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15060': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15061': ('10',     None,     'Redstone 2',   None,   'preview build'),
+  '15063': ('10',     'v1703',  'Redstone 2',   'Creators Update', 'unsupported'),
+  '16170': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16176': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16179': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16184': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16188': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16193': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16199': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16212': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16215': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16226': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16232': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16237': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16241': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16251': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16257': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16273': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16275': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16278': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16281': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16288': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16291': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16294': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16296': ('10',     None,     'Redstone 3',   None,   'preview build'),
+  '16299': ('10',     'v1709',  'Redstone 3',   'Fall Creators Update', 'outdated'),
+  '16353': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '16362': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17004': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17017': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17025': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17035': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17040': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17046': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17063': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17074': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17083': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17093': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17101': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17107': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17110': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17112': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17115': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17120': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17123': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17127': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17128': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17133': ('10',     None,     'Redstone 4',   None,   'preview build'),
+  '17134': ('10',     'v1803',  'Redstone 4',   'April 2018 Update', 'outdated'),
+  '17604': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17618': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17623': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17627': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17634': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17639': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17643': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17650': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17655': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17661': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17666': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17677': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17682': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17686': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17692': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17704': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17711': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17713': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17723': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17728': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17730': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17733': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17735': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17738': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17741': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17744': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17746': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17751': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17754': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17755': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17758': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17760': ('10',     None,     'Redstone 5',   None,   'preview build'),
+  '17763': ('10',     'v1809',  'Redstone 5',   'October 2018 Update', None),
+  '18204': ('10',     None,     '19H1',         None,   'preview build'),
+  '18214': ('10',     None,     '19H1',         None,   'preview build'),
+  '18219': ('10',     None,     '19H1',         None,   'preview build'),
+  '18234': ('10',     None,     '19H1',         None,   'preview build'),
+  '18237': ('10',     None,     '19H1',         None,   'preview build'),
+  '18242': ('10',     None,     '19H1',         None,   'preview build'),
+  '18247': ('10',     None,     '19H1',         None,   'preview build'),
+  '18252': ('10',     None,     '19H1',         None,   'preview build'),
+  '18262': ('10',     None,     '19H1',         None,   'preview build'),
+  '18267': ('10',     None,     '19H1',         None,   'preview build'),
+  '18272': ('10',     None,     '19H1',         None,   'preview build'),
+  '18277': ('10',     None,     '19H1',         None,   'preview build'),
+  '18282': ('10',     None,     '19H1',         None,   'preview build'),
+  '18290': ('10',     None,     '19H1',         None,   'preview build'),
+  '18298': ('10',     None,     '19H1',         None,   'preview build'),
+  '18305': ('10',     None,     '19H1',         None,   'preview build'),
+  '18309': ('10',     None,     '19H1',         None,   'preview build'),
+  '18312': ('10',     None,     '19H1',         None,   'preview build'),
+  '18317': ('10',     None,     '19H1',         None,   'preview build'),
+  '18323': ('10',     None,     '19H1',         None,   'preview build'),
+  '18329': ('10',     None,     '19H1',         None,   'preview build'),
+  '18334': ('10',     None,     '19H1',         None,   'preview build'),
+  '18342': ('10',     None,     '19H1',         None,   'preview build'),
+  '18343': ('10',     None,     '19H1',         None,   'preview build'),
+  '18346': ('10',     None,     '19H1',         None,   'preview build'),
+  '18348': ('10',     None,     '19H1',         None,   'preview build'),
+  '18351': ('10',     None,     '19H1',         None,   'preview build'),
+  '18353': ('10',     None,     '19H1',         None,   'preview build'),
+  '18356': ('10',     None,     '19H1',         None,   'preview build'),
+  '18358': ('10',     None,     '19H1',         None,   'preview build'),
+  '18361': ('10',     None,     '19H1',         None,   'preview build'),
+  '18362': ('10',     'v1903',  '19H1',         'May 2019 Update', None),
+  '18836': ('10',     None,     '20H1',         None,   'preview build'),
+  '18841': ('10',     None,     '20H1',         None,   'preview build'),
+  '18845': ('10',     None,     '20H1',         None,   'preview build'),
+  '18850': ('10',     None,     '20H1',         None,   'preview build'),
+  '18855': ('10',     None,     '20H1',         None,   'preview build'),
+  '18860': ('10',     None,     '20H1',         None,   'preview build'),
+  '18865': ('10',     None,     '20H1',         None,   'preview build'),
+  '18875': ('10',     None,     '20H1',         None,   'preview build'),
+  '18885': ('10',     None,     '20H1',         None,   'preview build'),
+  '18890': ('10',     None,     '20H1',         None,   'preview build'),
+  '18894': ('10',     None,     '20H1',         None,   'preview build'),
+  '18895': ('10',     None,     '20H1',         None,   'preview build'),
+  '18898': ('10',     None,     '20H1',         None,   'preview build'),
+}
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")

.bin/Scripts/settings/windows_setup.py

@@ -0,0 +1,39 @@
+# Wizard Kit: Settings - Windows Setup
+
+# General
+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'},
+  ]
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/settings/winpe.py

@@ -0,0 +1,57 @@
+# Wizard Kit: Settings - WinPE
+
+from settings.data import *
+
+# FastCopy
+FAST_COPY_PE_ARGS = [
+  '/cmd=noexist_only',
+  '/utf8',
+  '/skip_empty_dir',
+  '/linkdest',
+  '/no_ui',
+  '/auto_close',
+  '/exclude={}'.format(';'.join(FAST_COPY_EXCLUDES)),
+  ]
+
+# General
+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'],
+    },
+  }
+
+
+if __name__ == '__main__':
+  print("This file is not meant to be called directly.")
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/sfc_scan.py

@@ -4,36 +4,37 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: SFC Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\SFC Tool.log'.format(**global_vars)
+set_log_file('SFC Tool.log')
 
 if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: SFC Tool\n'.format(KIT_NAME_FULL))
-        other_results = {
-            'Error': {
-                'CalledProcessError':   'Unknown Error',
-            },
-            'Warning': {
-                'GenericRepair':        'Repaired',
-            }}
-        if ask('Run a SFC scan now?'):
-            try_and_print(message='SFC scan...',
-                function=run_sfc_scan, other_results=other_results)
-        else:
-            abort()
-        
-        # Done
-        print_standard('\nDone.')
-        pause('Press Enter to exit...')
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: SFC Tool\n'.format(KIT_NAME_FULL))
+    other_results = {
+      'Error': {
+        'CalledProcessError':   'Unknown Error',
+      },
+      'Warning': {
+        'GenericRepair':    'Repaired',
+      }}
+    if ask('Run a SFC scan now?'):
+      try_and_print(message='SFC scan...',
+        function=run_sfc_scan, other_results=other_results)
+    else:
+      abort()
+
+    # Done
+    print_standard('\nDone.')
+    pause('Press Enter to exit...')
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/system_checklist.py

@@ -1,99 +0,0 @@
-# Wizard Kit: System Checklist
-
-import os
-import sys
-
-# Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
-from functions.activation import *
-from functions.cleanup import *
-from functions.diags import *
-from functions.info import *
-from functions.product_keys import *
-from functions.setup import *
-init_global_vars()
-os.system('title {}: System Checklist Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\System Checklist.log'.format(**global_vars)
-
-if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: System Checklist Tool\n'.format(KIT_NAME_FULL))
-        ticket_number = get_ticket_number()
-        other_results = {
-            'Error': {
-                'CalledProcessError':   'Unknown Error',
-                'BIOSKeyNotFoundError': 'BIOS key not found',
-            },
-            'Warning': {}}
-        print_info('Starting System Checklist for Ticket #{}\n'.format(
-            ticket_number))
-
-        # Configure
-        print_info('Configure')
-        if global_vars['OS']['Version'] == '10':
-            try_and_print(message='Explorer...',
-                function=config_explorer_system, cs='Done')
-        try_and_print(message='Updating Clock...',
-            function=update_clock, cs='Done')
-
-        # Cleanup
-        print_info('Cleanup')
-        try_and_print(message='Desktop...',
-            function=cleanup_desktop, cs='Done')
-        try_and_print(message='AdwCleaner...',
-            function=cleanup_adwcleaner, cs='Done')
-
-        # Export system info
-        print_info('Backup System Information')
-        try_and_print(message='AIDA64 reports...',
-            function=run_aida64, cs='Done')
-        try_and_print(message='File listing...',
-            function=backup_file_list, cs='Done')
-        try_and_print(message='Power plans...',
-            function=backup_power_plans, cs='Done')
-        try_and_print(message='Product Keys...',
-            function=run_produkey, cs='Done')
-        try_and_print(message='Registry...',
-            function=backup_registry, cs='Done')
-
-        # User data
-        print_info('User Data')
-        show_user_data_summary()
-
-        # Summary
-        print_info('Summary')
-        try_and_print(message='Operating System:',
-            function=show_os_name, ns='Unknown', silent_function=False)
-        try_and_print(message='Activation:',
-            function=show_os_activation, ns='Unknown', silent_function=False)
-        if (not windows_is_activated()
-            and global_vars['OS']['Version'] in ('8', '10')):
-            try_and_print(message='BIOS Activation:',
-                function=activate_with_bios,
-                other_results=other_results)
-        try_and_print(message='Installed Office:',
-            function=get_installed_office, ns='Unknown', print_return=True)
-        show_free_space()
-        try_and_print(message='Installed RAM:',
-            function=show_installed_ram, ns='Unknown', silent_function=False)
-
-        # Play audio, show devices, open Windows updates, and open Activation
-        popen_program(['mmc', 'devmgmt.msc'])
-        run_hwinfo_sensors()
-        popen_program(['control', '/name', 'Microsoft.WindowsUpdate'])
-        if not windows_is_activated():
-            popen_program('slui')
-        sleep(3)
-        run_xmplay()
-
-        # Done
-        print_standard('\nDone.')
-        pause('Press Enter exit...')
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()

.bin/Scripts/system_diagnostics.py

@@ -4,113 +4,170 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.browsers import *
-from functions.diags import *
 from functions.info import *
 from functions.product_keys import *
 from functions.repairs import *
+from functions.sw_diags import *
 init_global_vars()
 os.system('title {}: System Diagnostics Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\System Diagnostics.log'.format(
-    **global_vars)
+set_log_file('System Diagnostics.log')
+
+# Static Variables
+BLEACH_BIT_CLEANERS = {
+  'Applications': (
+    'adobe_reader.cache',
+    'adobe_reader.tmp',
+    'amule.tmp',
+    'flash.cache',
+    'gimp.tmp',
+    'hippo_opensim_viewer.cache',
+    'java.cache',
+    'libreoffice.cache',
+    'liferea.cache',
+    'miro.cache',
+    'openofficeorg.cache',
+    'pidgin.cache',
+    'secondlife_viewer.Cache',
+    'thunderbird.cache',
+    'vuze.backup_files',
+    'vuze.cache',
+    'vuze.tmp',
+    'yahoo_messenger.cache',
+  ),
+  'Browsers': (
+    'chromium.cache',
+    'chromium.current_session',
+    'firefox.cache',
+    'firefox.session_restore',
+    'google_chrome.cache',
+    'google_chrome.session',
+    'google_earth.temporary_files',
+    'internet_explorer.temporary_files',
+    'opera.cache',
+    'opera.current_session',
+    'safari.cache',
+    'seamonkey.cache',
+  ),
+  'System': (
+    'system.clipboard',
+    'system.tmp',
+    'winapp2_windows.jump_lists',
+    'winapp2_windows.ms_search',
+    'windows_explorer.run',
+    'windows_explorer.search_history',
+    'windows_explorer.thumbnails',
+  ),
+}
 
 if __name__ == '__main__':
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: System Diagnostics Tool\n'.format(KIT_NAME_FULL))
+    ticket_number = get_ticket_number()
+    other_results = {
+      'Error': {
+        'CalledProcessError':   'Unknown Error',
+        'FileNotFoundError':  'File not found',
+      },
+      'Warning': {
+        'GenericRepair':    'Repaired',
+        'UnsupportedOSError':   'Unsupported OS',
+      }}
+    if ENABLED_TICKET_NUMBERS:
+      print_info('Starting System Diagnostics for Ticket #{}\n'.format(
+        ticket_number))
+
+    # Sanitize Environment
+    print_info('Sanitizing Environment')
+    try_and_print(message='Running RKill...',
+      function=run_rkill, cs='Done', other_results=other_results)
+    try_and_print(message='Running TDSSKiller...',
+      function=run_tdsskiller, cs='Done', other_results=other_results)
+
+    # Re-run if earlier process was stopped.
+    stay_awake()
+
+    # Start diags
+    print_info('Starting Background Scans')
+    check_connection()
+    try_and_print(message='Running HitmanPro...',
+      function=run_hitmanpro, cs='Started', other_results=other_results)
+    try_and_print(message='Running Autoruns...',
+      function=run_autoruns, cs='Started', other_results=other_results)
+
+    # OS Health Checks
+    print_info('OS Health Checks')
+    try_and_print(
+      message='CHKDSK ({SYSTEMDRIVE})...'.format(**global_vars['Env']),
+      function=run_chkdsk, other_results=other_results)
+    try_and_print(message='SFC scan...',
+      function=run_sfc_scan, other_results=other_results)
+    try_and_print(message='DISM CheckHealth...',
+      function=run_dism, other_results=other_results, repair=False)
+
+    # Scan for supported browsers
+    print_info('Scanning for browsers')
+    scan_for_browsers()
+
+    # Run BleachBit cleaners
+    print_info('BleachBit Cleanup')
+    for k, v in sorted(BLEACH_BIT_CLEANERS.items()):
+      try_and_print(message='  {}...'.format(k),
+        function=run_bleachbit,
+        cs='Done', other_results=other_results,
+        cleaners=v, preview=True)
+
+    # Export system info
+    print_info('Backup System Information')
+    try_and_print(message='AIDA64 reports...',
+      function=run_aida64, cs='Done', other_results=other_results)
+    backup_browsers()
+    try_and_print(message='File listing...',
+      function=backup_file_list, cs='Done', other_results=other_results)
+    try_and_print(message='Power plans...',
+      function=backup_power_plans, cs='Done')
+    try_and_print(message='Product Keys...',
+      function=run_produkey, cs='Done', other_results=other_results)
+    try_and_print(message='Registry...',
+      function=backup_registry, cs='Done', other_results=other_results)
+
+    # Summary
+    print_info('Summary')
+    try_and_print(message='Operating System:',
+      function=show_os_name, ns='Unknown', silent_function=False)
+    try_and_print(message='Activation:',
+      function=show_os_activation, ns='Unknown', silent_function=False)
+    try_and_print(message='Installed RAM:',
+      function=show_installed_ram, ns='Unknown', silent_function=False)
+    show_free_space()
+    try_and_print(message='Temp Size:',
+      function=show_temp_files_size, silent_function=False)
+    try_and_print(message='Installed Antivirus:',
+      function=get_installed_antivirus, ns='Unknown',
+      other_results=other_results, print_return=True)
+    try_and_print(message='Installed Office:',
+      function=get_installed_office, ns='Unknown',
+      other_results=other_results, print_return=True)
+    try_and_print(message='Product Keys:',
+      function=get_product_keys, ns='Unknown', print_return=True)
+
+    # User data
+    print_info('User Data')
     try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: System Diagnostics Tool\n'.format(KIT_NAME_FULL))
-        ticket_number = get_ticket_number()
-        other_results = {
-            'Error': {
-                'CalledProcessError':   'Unknown Error',
-            },
-            'Warning': {
-                'GenericRepair':        'Repaired',
-                'UnsupportedOSError':   'Unsupported OS',
-            }}
-        print_info('Starting System Diagnostics for Ticket #{}\n'.format(
-            ticket_number))
-        
-        # Sanitize Environment
-        print_info('Sanitizing Environment')
-        # try_and_print(message='Killing processes...',
-        #     function=run_process_killer, cs='Done')
-        try_and_print(message='Running RKill...',
-            function=run_rkill, cs='Done')
-        try_and_print(message='Running TDSSKiller...',
-            function=run_tdsskiller, cs='Done')
-        
-        # Re-run if earlier process was stopped.
-        stay_awake()
-        
-        # Start diags
-        print_info('Starting Background Scans')
-        check_connection()
-        try_and_print(message='Running HitmanPro...',
-            function=run_hitmanpro, cs='Started')
-        try_and_print(message='Running Autoruns...',
-            function=run_autoruns, cs='Started')
-        
-        # OS Health Checks
-        print_info('OS Health Checks')
-        try_and_print(
-            message='CHKDSK ({SYSTEMDRIVE})...'.format(**global_vars['Env']),
-            function=run_chkdsk, other_results=other_results)
-        try_and_print(message='SFC scan...',
-            function=run_sfc_scan, other_results=other_results)
-        try_and_print(message='DISM CheckHealth...',
-            function=run_dism, other_results=other_results, repair=False)
-        
-        # Scan for supported browsers
-        print_info('Scanning for browsers')
-        scan_for_browsers()
-        
-        # Export system info
-        print_info('Backup System Information')
-        try_and_print(message='AIDA64 reports...',
-            function=run_aida64, cs='Done')
-        try_and_print(message='BleachBit report...',
-            function=run_bleachbit, cs='Done')
-        backup_browsers()
-        try_and_print(message='File listing...',
-            function=backup_file_list, cs='Done')
-        try_and_print(message='Power plans...',
-            function=backup_power_plans, cs='Done')
-        try_and_print(message='Product Keys...',
-            function=run_produkey, cs='Done')
-        try_and_print(message='Registry...',
-            function=backup_registry, cs='Done')
-        
-        # Summary
-        print_info('Summary')
-        try_and_print(message='Temp Size:',
-            function=show_temp_files_size, silent_function=False)
-        show_free_space()
-        try_and_print(message='Installed RAM:',
-            function=show_installed_ram, ns='Unknown', silent_function=False)
-        try_and_print(message='Installed Office:',
-            function=get_installed_office, ns='Unknown', print_return=True)
-        try_and_print(message='Product Keys:',
-            function=get_product_keys, ns='Unknown', print_return=True)
-        try_and_print(message='Operating System:',
-            function=show_os_name, ns='Unknown', silent_function=False)
-        try_and_print(message='',
-            function=show_os_activation, ns='Unknown', silent_function=False)
-        
-        # User data
-        print_info('User Data')
-        try:
-            show_user_data_summary()
-        except Exception:
-            print_error('    Unknown error.')
-        
-        # Done
-        print_standard('\nDone.')
-        pause('Press Enter to exit...')
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+      show_user_data_summary()
+    except Exception:
+      print_error('  Unknown error.')
+
+    # Done
+    print_standard('\nDone.')
+    pause('Press Enter to exit...')
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/system_setup.py

@@ -0,0 +1,355 @@
+'''Wizard Kit: System Setup'''
+# pylint: disable=wildcard-import,wrong-import-position
+# vim: sts=2 sw=2 ts=2
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from collections import OrderedDict
+from functions.activation import *
+from functions.browsers import *
+from functions.cleanup import *
+from functions.info import *
+from functions.product_keys import *
+from functions.setup import *
+from functions.sw_diags import *
+from functions.windows_updates import *
+init_global_vars()
+os.system('title {}: System Setup'.format(KIT_NAME_FULL))
+set_log_file('System Setup.log')
+
+
+# STATIC VARIABLES
+# pylint: disable=bad-whitespace,line-too-long
+OTHER_RESULTS = {
+  'Error': {
+    'BIOSKeyNotFoundError':     'BIOS KEY NOT FOUND',
+    'CalledProcessError':       'UNKNOWN ERROR',
+    'FileNotFoundError':        'FILE NOT FOUND',
+    'GenericError':             'UNKNOWN ERROR',
+    'Not4KAlignedError':        'FALSE',
+    'SecureBootDisabledError':  'DISABLED',
+    'WindowsUnsupportedError':  'UNSUPPORTED',
+  },
+  'Warning': {
+    'GenericRepair':            'REPAIRED',
+    'NoProfilesError':          'NO PROFILES FOUND',
+    'NotInstalledError':        'NOT INSTALLED',
+    'OSInstalledLegacyError':   'OS INSTALLED LEGACY',
+    'SecureBootNotAvailError':  'NOT AVAILABLE',
+    'SecureBootUnknownError':   'UNKNOWN',
+    'UnsupportedOSError':       'UNSUPPORTED OS',
+    'WindowsOutdatedError':     'OUTDATED',
+    },
+  }
+SETUP_ACTIONS = OrderedDict({
+  # Install software
+  'Installing Programs':    {'Info': True},
+  'VCR':                    {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_vcredists, 'Just run': True,},
+  'LibreOffice':            {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_libreoffice,
+                             'If answer': 'LibreOffice', 'KWArgs': {'quickstart': False, 'register_mso_types': True, 'use_mso_formats': False, 'vcredist': False},
+                             },
+  'Ninite bundle':          {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_ninite_bundle, 'KWArgs': {'cs': 'STARTED'},},
+
+  # Browsers
+  'Scanning for browsers':  {'Info': True},
+  'Scan':                   {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': scan_for_browsers, 'Just run': True, 'KWArgs': {'skip_ie': True},},
+  'Backing up browsers':    {'Info': True},
+  'Backup browsers':        {'New': False,  'Dat': True,  'Cur': True,  'HW': False, 'Function': backup_browsers, 'Just run': True,},
+
+  # Install extensions
+  'Installing Extensions':  {'Info': True},
+  'Classic Shell skin':     {'New': True,   'Dat': True,  'Cur': False, 'HW': False, 'Function': install_classicstart_skin, 'Win10 only': True,},
+  'Chrome extensions':      {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_chrome_extensions,},
+  'Firefox extensions':     {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_firefox_extensions,},
+
+  # Configure software'
+  'Configuring Programs':   {'Info': True},
+  'Browser add-ons':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': install_adblock, 'Just run': True,
+                             'Pause': 'Please enable uBlock Origin for all browsers',
+                             },
+  'Classic Start':          {'New': True,   'Dat': True,  'Cur': False, 'HW': False, 'Function': config_classicstart, 'Win10 only': True,},
+  'Config Windows Updates': {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': config_windows_updates, 'Win10 only': True,},
+  'Enable Windows Updates': {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': enable_windows_updates, 'KWArgs': {'silent': True},},
+  'Explorer (system)':      {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': config_explorer_system, 'Win10 only': True,},
+  'Explorer (user)':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': config_explorer_user, 'Win10 only': True,},
+  'Restart Explorer':       {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': restart_explorer,},
+  'Restore default UAC':    {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': restore_default_uac,},
+  'Update Clock':           {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': update_clock,},
+
+  # Cleanup
+  'Cleaning up':            {'Info': True},
+  'AdwCleaner':             {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': cleanup_adwcleaner,},
+  'Desktop':                {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': cleanup_desktop,},
+  'KIT_NAME_FULL':          {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': delete_empty_folders,},
+
+  # System Info
+  'Exporting system info':  {'Info': True},
+  'AIDA64 Report':          {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': run_aida64,},
+  'File listing':           {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': backup_file_list,},
+  'Power plans':            {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': backup_power_plans,},
+  'Product Keys':           {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': run_produkey,},
+  'Registry':               {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': backup_registry,},
+
+  # Show Summary
+  'Summary':                {'Info': True},
+  'Operating System':       {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': show_os_name, 'KWArgs': {'ns': 'UNKNOWN', 'silent_function': False},},
+  'Activation':             {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': show_os_activation, 'KWArgs': {'ns': 'UNKNOWN', 'silent_function': False},},
+  'BIOS Activation':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': activate_with_bios, 'If not activated': True,},
+  'Secure Boot':            {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': check_secure_boot_status, 'KWArgs': {'show_alert': False},},
+  'Installed RAM':          {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': show_installed_ram, 'KWArgs': {'ns': 'UNKNOWN', 'silent_function': False},},
+  'Temp size':              {'New': False,  'Dat': False, 'Cur': True,  'HW': False, 'Function': show_temp_files_size, 'KWArgs': {'ns': 'UNKNOWN', 'silent_function': False},},
+  'Show free space':        {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': show_free_space, 'Just run': True,},
+  'Installed AV':           {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': get_installed_antivirus, 'KWArgs': {'ns': 'UNKNOWN', 'print_return': True},},
+  'Installed Office':       {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': get_installed_office, 'KWArgs': {'ns': 'UNKNOWN', 'print_return': True},},
+  'Partitions 4K aligned':  {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': check_4k_alignment, 'KWArgs': {'cs': 'TRUE', 'ns': 'FALSE'},},
+
+  # Open things
+  'Opening Programs':       {'Info': True},
+  'Device Manager':         {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': open_device_manager, 'KWArgs': {'cs': 'STARTED'},},
+  'HWiNFO sensors':         {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': run_hwinfo_sensors, 'KWArgs': {'cs': 'STARTED'},},
+  'Speed test':             {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': open_speedtest, 'KWArgs': {'cs': 'STARTED'},},
+  'Windows Updates':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': open_windows_updates, 'KWArgs': {'cs': 'STARTED'},},
+  'Windows Activation':     {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Function': open_windows_activation, 'If not activated': True, 'KWArgs': {'cs': 'STARTED'},},
+  'Sleep':                  {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': sleep, 'Just run': True, 'KWArgs': {'seconds': 3},},
+  'XMPlay':                 {'New': True,   'Dat': True,  'Cur': True,  'HW': True,  'Function': run_xmplay, 'KWArgs': {'cs': 'STARTED'},},
+  })
+SETUP_ACTION_KEYS = (
+  'Function',
+  'If not activated',
+  'Info',
+  'Just run',
+  'KWArgs',
+  'Pause',
+  )
+SETUP_QUESTIONS = {
+  # AV
+  'MSE':          {'New': None,   'Dat': None,  'Cur': None,  'HW': False, 'Ninite': True},
+
+  # LibreOffice
+  'LibreOffice':  {'New': None,   'Dat': None,  'Cur': None,  'HW': False, 'Ninite': True},
+
+  # Ninite
+  'Base':         {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Ninite': True},
+  'Missing':      {'New': False,  'Dat': True,  'Cur': False, 'HW': False, 'Ninite': True},
+  'Standard':     {'New': True,   'Dat': True,  'Cur': False, 'HW': False, 'Ninite': True},
+  }
+# pylint: enable=bad-whitespace,line-too-long
+
+
+# Functions
+def check_os_and_abort():
+  """Check OS and prompt to abort if not supported."""
+  result = try_and_print(
+    message='OS support status...',
+    function=check_os_support_status,
+    cs='GOOD',
+    )
+  if not result['CS'] and 'Unsupported' in result['Error']:
+    print_warning('OS version not supported by this script')
+    if not ask('Continue anyway? (NOT RECOMMENDED)'):
+      abort()
+
+
+def get_actions(setup_mode, answers):
+  """Get actions to perform based on setup_mode, returns OrderedDict."""
+  actions = OrderedDict({})
+  for _key, _val in SETUP_ACTIONS.items():
+    _action = {}
+    _if_answer = _val.get('If answer', False)
+    _win10_only = _val.get('Win10 only', False)
+
+    # Set enabled status
+    _enabled = _val.get(setup_mode, False)
+    if _if_answer:
+      _enabled = _enabled and answers[_if_answer]
+    if _win10_only:
+      _enabled = _enabled and global_vars['OS']['Version'] == '10'
+    _action['Enabled'] = _enabled
+
+    # Set other keys
+    for _sub_key in SETUP_ACTION_KEYS:
+      _action[_sub_key] = _val.get(_sub_key, None)
+
+    # Fix KWArgs
+    if _action.get('KWArgs', {}) is None:
+      _action['KWArgs'] = {}
+
+    # Handle "special" actions
+    if _key == 'KIT_NAME_FULL':
+      # Cleanup WK folders
+      _key = KIT_NAME_FULL
+      _action['KWArgs'] = {'folder_path': global_vars['ClientDir']}
+    elif _key == 'Ninite bundle':
+      # Add install_ninite_bundle() kwargs
+      _action['KWArgs'].update({
+        kw.lower(): kv for kw, kv in answers.items()
+        if SETUP_QUESTIONS.get(kw, {}).get('Ninite', False)
+        })
+    elif _key == 'Explorer (user)':
+      # Explorer settings (user)
+      _action['KWArgs'] = {'setup_mode': setup_mode}
+
+    # Add to dict
+    actions[_key] = _action
+
+  return actions
+
+
+def get_answers(setup_mode):
+  """Get setup answers based on setup_mode and user input, returns dict."""
+  answers = {k: v.get(setup_mode, False) for k, v in SETUP_QUESTIONS.items()}
+
+  # Answer setup questions as needed
+  if answers['MSE'] is None and global_vars['OS']['Version'] == '7':
+    answers.update(get_av_selection())
+
+  if answers['LibreOffice'] is None:
+    answers['LibreOffice'] = ask('Install LibreOffice?')
+
+  return answers
+
+
+def get_av_selection():
+  """Get AV selection."""
+  av_answers = {
+    'MSE': False,
+    }
+  av_options = [
+    {
+      'Name': 'Microsoft Security Essentials',
+      'Disabled': global_vars['OS']['Version'] not in ['7'],
+      },
+    ]
+  actions = [
+    {'Name': 'None', 'Letter': 'N'},
+    {'Name': 'Quit', 'Letter': 'Q'},
+    ]
+
+  # Show menu
+  selection = menu_select(
+    'Please select an option to install',
+    main_entries=av_options,
+    action_entries=actions)
+  if selection.isnumeric():
+    index = int(selection) - 1
+    if 'Microsoft' in av_options[index]['Name']:
+      av_answers['MSE'] = True
+  elif selection == 'Q':
+    abort()
+
+  return av_answers
+
+
+def get_mode():
+  """Get mode via menu_select, returns str."""
+  setup_mode = None
+  mode_options = [
+    {'Name': 'New', 'Display Name': 'New / Clean install (no data)'},
+    {'Name': 'Dat', 'Display Name': 'Clean install with data migration'},
+    {'Name': 'Cur', 'Display Name': 'Original OS (post-repair or overinstall)'},
+    {'Name': 'HW', 'Display Name': 'Hardware service (i.e. no software work)'},
+    ]
+  actions = [
+    {'Name': 'Quit', 'Letter': 'Q'},
+    ]
+
+  # Get selection
+  selection = menu_select(
+    'Please select a setup mode',
+    main_entries=mode_options,
+    action_entries=actions)
+  if selection.isnumeric():
+    index = int(selection) - 1
+    setup_mode = mode_options[index]['Name']
+  elif selection == 'Q':
+    abort()
+
+  return setup_mode
+
+
+def main():
+  """Main function."""
+  stay_awake()
+  clear_screen()
+
+  # Check installed OS
+  check_os_and_abort()
+
+  # Get setup mode
+  setup_mode = get_mode()
+
+  # Get answers to setup questions
+  answers = get_answers(setup_mode)
+
+  # Get actions to perform
+  actions = get_actions(setup_mode, answers)
+
+  # Perform actions
+  for action, values in actions.items():
+    kwargs = values.get('KWArgs', {})
+
+    # Print info lines
+    if values.get('Info', False):
+      print_info(action)
+      continue
+
+    # Print disabled actions
+    if not values.get('Enabled', False):
+      show_data(
+        message='{}...'.format(action),
+        data='DISABLED',
+        warning=True,
+        )
+      continue
+
+    # Check Windows activation if requested
+    if values.get('If not activated', False) and windows_is_activated():
+      # Skip
+      continue
+
+    # Run function
+    if values.get('Just run', False):
+      values['Function'](**kwargs)
+    else:
+      result = try_and_print(
+        message='{}...'.format(action),
+        function=values['Function'],
+        other_results=OTHER_RESULTS,
+        **kwargs)
+
+    # Wait for Ninite proc(s)
+    if action == 'Ninite bundle':
+      print_standard('Waiting for installations to finish...')
+      try:
+        for proc in result['Out']:
+          proc.wait()
+      except KeyboardInterrupt:
+        pass
+
+    # Pause
+    if values.get('Pause', False):
+      print_standard(values['Pause'])
+      pause()
+
+  # Show alert box for SecureBoot issues
+  try:
+    check_secure_boot_status(show_alert=True)
+  except Exception: # pylint: disable=broad-except
+    # Ignoring exceptions since we just want to show the popup
+    pass
+
+  # Done
+  pause('Press Enter to exit... ')
+
+
+if __name__ == '__main__':
+  try:
+    main()
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except: # pylint: disable=bare-except
+    major_exception()

.bin/Scripts/transferred_keys.py

@@ -4,25 +4,26 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.product_keys import *
 init_global_vars()
 os.system('title {}: Transferred Key Finder'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\Transferred Keys.log'.format(**global_vars)
+set_log_file('Transferred Keys.log')
 
 if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: Transferred Key Finder\n'.format(KIT_NAME_FULL))
-        try_and_print(message='Searching for keys...',
-            function=list_clientdir_keys, print_return=True)
-        
-        # Done
-        print_standard('\nDone.')
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    stay_awake()
+    clear_screen()
+    print_info('{}: Transferred Key Finder\n'.format(KIT_NAME_FULL))
+    try_and_print(message='Searching for keys...',
+      function=list_clientdir_keys, print_return=True)
+
+    # Done
+    print_standard('\nDone.')
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/update_kit.py

@@ -4,140 +4,140 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.update import *
 init_global_vars()
 os.system('title {}: Kit Update Tool'.format(KIT_NAME_FULL))
 
 if __name__ == '__main__':
-    try:
-        clear_screen()
-        print_info('{}: Kit Update Tool\n'.format(KIT_NAME_FULL))
-        other_results = {
-            'Error': {
-                'CalledProcessError': 'Unknown Error',
-            }}
-        
-        ## Prep ##
-        update_sdio = ask('Update SDI Origin?')
-        
-        ## Download ##
-        print_success('Downloading tools')
-        
-        # Data Recovery
-        print_info('    Data Recovery')
-        try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results, width=40)
-        
-        # Data Transfers
-        print_info('    Data Transfers')
-        try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results, width=40)
-        try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results, width=40)
-        try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results, width=40)
-        
-        # Diagnostics
-        print_info('    Diagnostics')
-        try_and_print(message='AIDA64...', function=update_aida64, other_results=other_results, width=40)
-        try_and_print(message='Autoruns...', function=update_autoruns, other_results=other_results, width=40)
-        try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results, width=40)
-        try_and_print(message='BlueScreenView...', function=update_bluescreenview, other_results=other_results, width=40)
-        try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results, width=40)
-        try_and_print(message='HitmanPro...', function=update_hitmanpro, other_results=other_results, width=40)
-        try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results, width=40)
-        try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results, width=40)
-        
-        # Drivers
-        print_info('    Drivers')
-        try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results, width=40)
-        try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results, width=40)
-        try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results, width=40)
-        if update_sdio:
-            try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results, width=40)
-        
-        # Installers
-        print_info('    Installers')
-        try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results, width=40)
-        try_and_print(message='MS Office...', function=update_office, other_results=other_results, width=40)
-        try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results, width=40)
-        update_all_ninite(other_results=other_results, width=40)
-        
-        # Misc
-        print_info('    Misc')
-        try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results, width=40)
-        try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results, width=40)
-        try_and_print(message='Du...', function=update_du, other_results=other_results, width=40)
-        try_and_print(message='Everything...', function=update_everything, other_results=other_results, width=40)
-        try_and_print(message='FirefoxExtensions...', function=update_firefox_ublock_origin, other_results=other_results, width=40)
-        try_and_print(message='PuTTY...', function=update_putty, other_results=other_results, width=40)
-        try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results, width=40)
-        try_and_print(message='TreeSizeFree...', function=update_treesizefree, other_results=other_results, width=40)
-        try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results, width=40)
-        
-        # Repairs
-        print_info('    Repairs')
-        try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results, width=40)
-        try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results, width=40)
-        try_and_print(message='RKill...', function=update_rkill, other_results=other_results, width=40)
-        try_and_print(message='TDSSKiller...', function=update_tdsskiller, other_results=other_results, width=40)
-        
-        # Uninstallers
-        print_info('    Uninstallers')
-        try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results, width=40)
-        
-        ## Review ##
-        print_standard('Please review the results and download/extract any missing items to .cbin')
-        pause('Press Enter to compress the .cbin items')
-        
-        ## Compress ##
-        print_success('Compressing tools')
-        print_info('    _Drivers')
-        for item in os.scandir(r'{}\_Drivers'.format(global_vars['CBinDir'])):
-            if not re.search(r'^(_Drivers|.*7z)$', item.name, re.IGNORECASE):
-                try_and_print(
-                    message='{}...'.format(item.name),
-                    function=compress_and_remove_item,
-                    other_results = other_results,
-                    width=40,
-                    item = item)
-        print_info('    .cbin')
-        for item in os.scandir(global_vars['CBinDir']):
-            if not re.search(r'^(_Drivers|_include|.*7z)$', item.name, re.IGNORECASE):
-                try_and_print(
-                    message='{}...'.format(item.name),
-                    function=compress_and_remove_item,
-                    other_results = other_results,
-                    width=40,
-                    item = item)
-        
-        ## Search for network Office/QuickBooks installers & add to LAUNCHERS
-        print_success('Scanning for network installers')
-        scan_for_net_installers(OFFICE_SERVER, 'Office', min_year=2010)
-        scan_for_net_installers(QUICKBOOKS_SERVER, 'QuickBooks', min_year=2015)
-        
-        ## Generate Launchers
-        print_success('Generating launchers')
-        for section in sorted(LAUNCHERS.keys()):
-            print_info('    {}'.format(section))
-            for name, options in sorted(LAUNCHERS[section].items()):
-                try_and_print(message=name, function=generate_launcher,
-                    section=section, name=name, options=options,
-                    other_results=other_results, width=40)
-        
-        # Rename "Copy WizardKit.cmd" (if necessary)
-        source = r'{}\Scripts\Copy WizardKit.cmd'.format(global_vars['BinDir'])
-        dest = r'{}\Copy {}.cmd'.format(global_vars['BaseDir'], KIT_NAME_FULL)
-        if os.path.exists(source):
-            try:
-                shutil.move(source, dest)
-            except Exception:
-                print_error('    Failed to rename "{}.cmd" to "{}.cmd"'.format(
-                    'Copy WizardKit', KIT_NAME_FULL))
-        
-        # Done
-        print_standard('\nDone.')
-        pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    clear_screen()
+    print_info('{}: Kit Update Tool\n'.format(KIT_NAME_FULL))
+    other_results = {
+      'Error': {
+        'CalledProcessError': 'Unknown Error',
+      }}
+
+    ## Prep ##
+    update_sdio = ask('Update SDI Origin?')
+
+    ## Download ##
+    print_success('Downloading tools')
+
+    # Data Recovery
+    print_info('  Data Recovery')
+    try_and_print(message='TestDisk / PhotoRec...', function=update_testdisk, other_results=other_results, width=40)
+
+    # Data Transfers
+    print_info('  Data Transfers')
+    try_and_print(message='FastCopy...', function=update_fastcopy, other_results=other_results, width=40)
+    try_and_print(message='wimlib...', function=update_wimlib, other_results=other_results, width=40)
+    try_and_print(message='XYplorer...', function=update_xyplorer, other_results=other_results, width=40)
+
+    # Diagnostics
+    print_info('  Diagnostics')
+    try_and_print(message='AIDA64...', function=update_aida64, other_results=other_results, width=40)
+    try_and_print(message='Autoruns...', function=update_autoruns, other_results=other_results, width=40)
+    try_and_print(message='BleachBit...', function=update_bleachbit, other_results=other_results, width=40)
+    try_and_print(message='Blue Screen View...', function=update_bluescreenview, other_results=other_results, width=40)
+    try_and_print(message='ERUNT...', function=update_erunt, other_results=other_results, width=40)
+    try_and_print(message='Hitman Pro...', function=update_hitmanpro, other_results=other_results, width=40)
+    try_and_print(message='HWiNFO...', function=update_hwinfo, other_results=other_results, width=40)
+    try_and_print(message='NirCmd...', function=update_nircmd, other_results=other_results, width=40)
+    try_and_print(message='ProduKey...', function=update_produkey, other_results=other_results, width=40)
+
+    # Drivers
+    print_info('  Drivers')
+    try_and_print(message='Intel RST...', function=update_intel_rst, other_results=other_results, width=40)
+    try_and_print(message='Intel SSD Toolbox...', function=update_intel_ssd_toolbox, other_results=other_results, width=40)
+    try_and_print(message='Samsing Magician...', function=update_samsung_magician, other_results=other_results, width=40)
+    if update_sdio:
+      try_and_print(message='Snappy Driver Installer Origin...', function=update_sdi_origin, other_results=other_results, width=40)
+
+    # Installers
+    print_info('  Installers')
+    try_and_print(message='Adobe Reader DC...', function=update_adobe_reader_dc, other_results=other_results, width=40)
+    try_and_print(message='LibreOffice...', function=update_libreoffice, other_results=other_results, width=40)
+    try_and_print(message='Macs Fan Control...', function=update_macs_fan_control, other_results=other_results, width=40)
+    try_and_print(message='MS Office...', function=update_office, other_results=other_results, width=40)
+    try_and_print(message='Visual C++ Runtimes...', function=update_vcredists, other_results=other_results, width=40)
+    try_and_print(message='Windows Updates...', function=download_windows_updates, other_results=other_results, width=40)
+    update_all_ninite(other_results=other_results, width=40)
+
+    # Misc
+    print_info('  Misc')
+    try_and_print(message='Caffeine...', function=update_caffeine, other_results=other_results, width=40)
+    try_and_print(message='Classic Start Skin...', function=update_classic_start_skin, other_results=other_results, width=40)
+    try_and_print(message='Du...', function=update_du, other_results=other_results, width=40)
+    try_and_print(message='Everything...', function=update_everything, other_results=other_results, width=40)
+    try_and_print(message='Firefox Extensions...', function=update_firefox_ublock_origin, other_results=other_results, width=40)
+    try_and_print(message='PuTTY...', function=update_putty, other_results=other_results, width=40)
+    try_and_print(message='Notepad++...', function=update_notepadplusplus, other_results=other_results, width=40)
+    try_and_print(message='WizTree...', function=update_wiztree, other_results=other_results, width=40)
+    try_and_print(message='XMPlay...', function=update_xmplay, other_results=other_results, width=40)
+
+    # Repairs
+    print_info('  Repairs')
+    try_and_print(message='AdwCleaner...', function=update_adwcleaner, other_results=other_results, width=40)
+    try_and_print(message='KVRT...', function=update_kvrt, other_results=other_results, width=40)
+    try_and_print(message='RKill...', function=update_rkill, other_results=other_results, width=40)
+    try_and_print(message='TDSS Killer...', function=update_tdsskiller, other_results=other_results, width=40)
+
+    # Uninstallers
+    print_info('  Uninstallers')
+    try_and_print(message='IObit Uninstaller...', function=update_iobit_uninstaller, other_results=other_results, width=40)
+
+    ## Review ##
+    print_standard('Please review the results and download/extract any missing items to .cbin')
+    pause('Press Enter to compress the .cbin items')
+
+    ## Compress ##
+    print_success('Compressing tools')
+    print_info('  _Drivers')
+    for item in os.scandir(r'{}\_Drivers'.format(global_vars['CBinDir'])):
+      if not re.search(r'^(_Drivers|.*7z)$', item.name, re.IGNORECASE):
+        try_and_print(
+          message='{}...'.format(item.name),
+          function=compress_and_remove_item,
+          other_results = other_results,
+          width=40,
+          item = item)
+    print_info('  .cbin')
+    for item in os.scandir(global_vars['CBinDir']):
+      if not re.search(r'^(_Drivers|_include|.*7z)$', item.name, re.IGNORECASE):
+        try_and_print(
+          message='{}...'.format(item.name),
+          function=compress_and_remove_item,
+          other_results = other_results,
+          width=40,
+          item = item)
+
+    ## Generate Launchers
+    print_success('Generating launchers')
+    for section in sorted(LAUNCHERS.keys()):
+      print_info('  {}'.format(section))
+      for name, options in sorted(LAUNCHERS[section].items()):
+        try_and_print(message=name, function=generate_launcher,
+          section=section, name=name, options=options,
+          other_results=other_results, width=40)
+
+    # Rename "Copy WizardKit.cmd" (if necessary)
+    source = r'{}\Scripts\Copy WizardKit.cmd'.format(global_vars['BinDir'])
+    dest = r'{}\Copy {}.cmd'.format(global_vars['BaseDir'], KIT_NAME_FULL)
+    if os.path.exists(source):
+      try:
+        shutil.move(source, dest)
+      except Exception:
+        print_error('  Failed to rename "{}.cmd" to "{}.cmd"'.format(
+          'Copy WizardKit', KIT_NAME_FULL))
+
+    # Done
+    print_standard('\nDone.')
+    pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/user_checklist.py

@@ -1,83 +0,0 @@
-# Wizard Kit: User Checklist
-
-import os
-import sys
-
-# Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
-from functions.browsers import *
-from functions.cleanup import *
-from functions.setup import *
-init_global_vars()
-os.system('title {}: User Checklist Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\User Checklist ({USERNAME}).log'.format(
-    **global_vars, **global_vars['Env'])
-
-if __name__ == '__main__':
-    try:
-        stay_awake()
-        clear_screen()
-        print_info('{}: User Checklist\n'.format(KIT_NAME_FULL))
-        other_results = {
-            'Warning': {
-                'NotInstalledError': 'Not installed',
-                'NoProfilesError': 'No profiles found',
-            }}
-        answer_config_browsers = ask('Install adblock?')
-        if answer_config_browsers:
-            answer_reset_browsers = ask(
-                'Reset browsers to safe defaults first?')
-        if global_vars['OS']['Version'] == '10':
-            answer_config_classicshell = ask('Configure ClassicShell?')
-            answer_config_explorer_user = ask('Configure Explorer?')
-        
-        # Cleanup
-        print_info('Cleanup')
-        try_and_print(message='Desktop...',
-            function=cleanup_desktop, cs='Done')
-        
-        # Scan for supported browsers
-        print_info('Scanning for browsers')
-        scan_for_browsers()
-        
-        # Homepages
-        print_info('Current homepages')
-        list_homepages()
-        
-        # Backup
-        print_info('Backing up browsers')
-        backup_browsers()
-        
-        # Reset
-        if answer_config_browsers and answer_reset_browsers:
-            print_info('Resetting browsers')
-            reset_browsers()
-        
-        # Configure
-        print_info('Configuring programs')
-        if answer_config_browsers:
-            install_adblock()
-        if global_vars['OS']['Version'] == '10':
-            if answer_config_classicshell:
-                try_and_print(message='ClassicStart...',
-                    function=config_classicstart, cs='Done')
-            if answer_config_explorer_user:
-                try_and_print(message='Explorer...',
-                    function=config_explorer_user, cs='Done')
-            if (not answer_config_browsers
-                and not answer_config_classicshell
-                and not answer_config_explorer_user):
-                print_warning('        Skipped')
-        else:
-            if not answer_config_browsers:
-                print_warning('        Skipped')
-        
-        # Done
-        print_standard('\nDone.')
-        pause('Press Enter to exit...')
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()

.bin/Scripts/user_data_transfer.py

@@ -4,50 +4,64 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.data import *
 from functions.repairs import *
 init_global_vars()
 os.system('title {}: User Data Transfer Tool'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\User Data Transfer.log'.format(**global_vars)
+set_log_file('User Data Transfer.log')
 
 if __name__ == '__main__':
-    try:
-        # Prep
-        stay_awake()
-        clear_screen()
-        print_info('{}: User Data Transfer Tool\n'.format(KIT_NAME_FULL))
-        ticket_number = get_ticket_number()
-        folder_path = r'{}\Transfer'.format(KIT_NAME_SHORT)
-        dest = select_destination(folder_path=folder_path,
-            prompt='Which disk are we transferring to?')
-        source = select_source(ticket_number)
-        items = scan_source(source, dest)
-        
-        # Transfer
-        clear_screen()
-        print_info('Transfer Details:\n')
-        show_data('Ticket:',        ticket_number)
-        show_data('Source:',        source.path)
-        show_data('Destination:',   dest)
-        
-        if (not ask('Proceed with transfer?')):
-            umount_backup_shares()
-            abort()
-        
-        print_info('Transferring Data')
-        transfer_source(source, dest, items)
-        try_and_print(message='Removing extra files...',
-            function=cleanup_transfer, cs='Done', dest_path=dest)
-        umount_backup_shares()
-        
-        # Done
-        run_kvrt()
-        print_standard('\nDone.')
-        pause("Press Enter to exit...")
-        exit_script()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    # Prep
+    stay_awake()
+    clear_screen()
+    print_info('{}: User Data Transfer Tool\n'.format(KIT_NAME_FULL))
+
+    # Get backup name prefix
+    ticket_number = get_ticket_number()
+    if ENABLED_TICKET_NUMBERS:
+      backup_prefix = ticket_number
+    else:
+      backup_prefix = get_simple_string(prompt='Enter backup name prefix')
+      backup_prefix = backup_prefix.replace(' ', '_')
+
+    # Set destination
+    folder_path = r'{}\Transfer'.format(KIT_NAME_SHORT)
+    dest = select_destination(folder_path=folder_path,
+      prompt='Which disk are we transferring to?')
+
+    # Set source items
+    source = select_source(backup_prefix)
+    items = scan_source(source, dest)
+
+    # Transfer
+    clear_screen()
+    print_info('Transfer Details:\n')
+    if ENABLED_TICKET_NUMBERS:
+      show_data('Ticket:',    ticket_number)
+    show_data('Source:',    source.path)
+    show_data('Destination:',   dest)
+
+    if (not ask('Proceed with transfer?')):
+      umount_backup_shares()
+      abort()
+
+    print_info('Transferring Data')
+    transfer_source(source, dest, items)
+    try_and_print(message='Removing extra files...',
+      function=cleanup_transfer, cs='Done', dest_path=dest)
+    umount_backup_shares()
+
+    # Done
+    try_and_print(message='Running KVRT...',
+      function=run_kvrt, cs='Started')
+    print_standard('\nDone.')
+    pause("Press Enter to exit...")
+    exit_script()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/windows_updates.py

@@ -0,0 +1,46 @@
+# Wizard Kit: Windows updates
+
+import os
+import sys
+
+# Init
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
+from functions.windows_updates import *
+init_global_vars()
+os.system('title {}: Windows Updates Tool'.format(KIT_NAME_FULL))
+set_log_file('Windows Updates Tool.log')
+
+if __name__ == '__main__':
+  try:
+    clear_screen()
+    print_info('{}: Windows Updates Tool\n'.format(KIT_NAME_FULL))
+
+    # Check args
+    if '--disable' in sys.argv:
+      disable_windows_updates()
+    elif '--enable' in sys.argv:
+      enable_windows_updates()
+    else:
+      print_error('Bad mode.')
+      abort()
+
+    # Done
+    exit_script()
+  except GenericError as err:
+    # Failed to complete request, show error(s) and prompt tech
+    print_standard(' ')
+    for line in str(err).splitlines():
+      print_warning(line)
+    print_standard(' ')
+    print_error('Error(s) encountered, see above.')
+    print_standard(' ')
+    if '--disable' in sys.argv:
+      print_standard('Please reboot and try again.')
+    pause('Press Enter to exit... ')
+    exit_script(1)
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/winpe_root_menu.py

@@ -4,19 +4,20 @@ import os
 import sys
 
 # Init
-os.chdir(os.path.dirname(os.path.realpath(__file__)))
-sys.path.append(os.getcwd())
+sys.path.append(os.path.dirname(os.path.realpath(__file__)))
 from functions.winpe_menus import *
 # Fix 7-Zip name
 TOOLS['SevenZip'].pop('64')
 init_global_vars()
 set_title('{}: Root Menu'.format(KIT_NAME_FULL))
-global_vars['LogFile'] = r'{LogDir}\WinPE.log'.format(**global_vars)
+set_log_file('WinPE.log')
 
 if __name__ == '__main__':
-    try:
-        menu_root()
-    except SystemExit:
-        pass
-    except:
-        major_exception()
+  try:
+    menu_root()
+  except SystemExit as sys_exit:
+    exit_script(sys_exit.code)
+  except:
+    major_exception()
+
+# vim: sts=2 sw=2 ts=2

.bin/Scripts/wk-power-command

@@ -0,0 +1,21 @@
+#!/bin/bash
+#
+## Wizard Kit: Wrapper for logout, reboot, & poweroff
+
+# Unmount filesystems
+find /media -maxdepth 1 -mindepth 1 -type d \
+  -exec udevil umount "{}" \;
+
+# Flush write cache
+sudo sync
+
+# Perform requested action
+case "${1:-x}" in
+  poweroff)
+    sudo systemctl poweroff;;
+  reboot)
+    sudo systemctl reboot;;
+  *)
+    openbox --exit;;
+esac
+exit 0

.bin/_Drivers/SDIO/sdi.cfg

@@ -21,4 +21,4 @@
 -uplimit:1
 -connections:0
 
--expertmode -norestorepnt -showdrpnames2 -onlyupdates -preservecfg
+-expertmode -norestorepnt -showdrpnames2 -onlyupdates -preservecfg -novirusalerts