diff --git a/.bin/Scripts/settings/launchers.py b/.bin/Scripts/settings/launchers.py
index ef0f6c16..9679184e 100644
--- a/.bin/Scripts/settings/launchers.py
+++ b/.bin/Scripts/settings/launchers.py
@@ -1,690 +1,692 @@
 # Wizard Kit: Settings - Launchers
 
 LAUNCHERS = {
-    r'(Root)': {
-        'Activate Windows': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'activate.py',
-            'L_ELEV': 'True',
-            },
-        'd7II': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'd7II',
-            'L_ITEM': 'd7II.exe',
-            },
-        'Post-d7II Work': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'post_d7.py',
-            'L_ELEV': 'True',
-            },
-        'System Checklist': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'system_checklist.py',
-            'L_ELEV': 'True',
-            },
-        'System Checklist (HW)': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'system_checklist_hw.py',
-            'L_ELEV': 'True',
-            },
-        'User Checklist': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'user_checklist.py',
-            },
-        },
-    r'.bin\Scripts\launchers_for_d7': {
-        'Browser Reset': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'reset_browsers.py',
-            'L_ARGS': 'd7mode',
-            },
-        'Install SW Bundle': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'install_sw_bundle.py',
-            'L_ARGS': 'd7mode',
-            'L_ELEV': 'True',
-            },
-        'System Checklist': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'system_checklist.py',
-            'L_ARGS': 'd7mode',
-            'L_ELEV': 'True',
-            },
-        'System Diagnostics': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'system_diagnostics.py',
-            'L_ARGS': 'd7mode',
-            'L_ELEV': 'True',
-            },
-        'User Checklist': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'user_checklist.py',
-            'L_ARGS': 'd7mode',
-            },
-        },
-    r'Data Recovery': {
-        'PhotoRec (CLI)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'TestDisk',
-            'L_ITEM': 'photorec_win.exe',
-            'L_ELEV': 'True',
-            'L__CLI': 'True',
-            },
-        'PhotoRec': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'TestDisk',
-            'L_ITEM': 'qphotorec_win.exe',
-            'L_ELEV': 'True',
-            },
-        'TestDisk': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'TestDisk',
-            'L_ITEM': 'testdisk_win.exe',
-            'L_ELEV': 'True',
-            'L__CLI': 'True',
-            },
-        },
-    r'Data Transfers': {
-        "Fab's Autobackup Pro": {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'AutoBackupPro',
-            'L_ITEM': 'autobackup6pro.exe',
-            },
-        'FastCopy (as ADMIN)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'FastCopy',
-            'L_ITEM': 'FastCopy.exe',
-            'L_ARGS': (
-                r' /logfile=%log_dir%\Tools\FastCopy.log'
-                r' /cmd=noexist_only'
-                r' /utf8'
-                r' /skip_empty_dir'
-                r' /linkdest'
-                r' /exclude='
-                    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'
-                r' /to=%client_dir%\Transfer_%iso_date%\ '
-                ),
-            'L_ELEV': 'True',
-            'Extra Code': [
-                r'call "%bin%\Scripts\init_client_dir.cmd" /Logs /Transfer',
-                ],
-            },
-        'FastCopy': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'FastCopy',
-            'L_ITEM': 'FastCopy.exe',
-            'L_ARGS': (
-                r' /logfile=%log_dir%\Tools\FastCopy.log'
-                r' /cmd=noexist_only'
-                r' /utf8'
-                r' /skip_empty_dir'
-                r' /linkdest'
-                r' /exclude='
-                    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'
-                r' /to=%client_dir%\Transfer_%iso_date%\ '
-                ),
-            'Extra Code': [
-                r'call "%bin%\Scripts\init_client_dir.cmd" /Logs /Transfer',
-                ],
-            },
-        'KVRT': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'KVRT',
-            'L_ITEM': 'KVRT.exe',
-            'L_ARGS': (
-                r' -accepteula'
-                r' -d %q_dir%'
-                r' -processlevel 3'
-                r' -dontcryptsupportinfo'
-                r' -fixednames'
-                ),
-            'Extra Code': [
-                r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
-                r'set "q_dir=%client_dir%\Quarantine\KVRT"',
-                r'mkdir "%q_dir%">nul 2>&1',
-                ],
-            },
-        'Mac & Linux Reader': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'LinuxReader',
-            'L_ITEM': 'LinuxReader.exe',
-            'L_ELEV': 'True',
-            },
-        'Transferred Keys': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'transferred_keys.py',
-            'L_ELEV': 'True',
-            },
-        'User Data Transfer': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'user_data_transfer.py',
-            'L_ELEV': 'True',
-            },
-        'XYplorer (as ADMIN)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'XYplorerFree',
-            'L_ITEM': 'XYplorerFree.exe',
-            'L_ARGS': r'/exp /win=max %userprofile%',
-            'L_ELEV': 'True',
-            },
-        'XYplorer': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'XYplorerFree',
-            'L_ITEM': 'XYplorerFree.exe',
-            'L_ARGS': r'/exp /win=max %userprofile%',
-            },
-        },
-    r'Diagnostics': {
-        'AIDA64': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'AIDA64',
-            'L_ITEM': 'aida64.exe',
-            },
-        'ProduKey': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'ProduKey',
-            'L_ITEM': 'ProduKey.exe',
-            'L_ELEV': 'True',
-            'Extra Code': [
-                r'if exist "%bin%\ProduKey" (',
-                r'    del "%bin%\ProduKey\ProduKey.cfg" 2>nul',
-                r'    del "%bin%\ProduKey\ProduKey64.cfg" 2>nul',
-                r')',
-                ],
-            },
-        'System Diagnostics': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'system_diagnostics.py',
-            'L_ELEV': 'True',
-            },
-        },
-    r'Diagnostics\Extras': {
-        'Autoruns (with VirusTotal Scan)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'Autoruns',
-            'L_ITEM': 'Autoruns.exe',
-            'L_ARGS': '-e',
-            'Extra Code': [
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownomicrosoft /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownowindows /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v showonlyvirustotal /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v submitvirustotal /t REG_DWORD /d 0 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v verifysignatures /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns\SigCheck /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul',
-                ],
-            },
-        'BleachBit': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'BleachBit',
-            'L_ITEM': 'bleachbit.exe',
-            },
-        'BlueScreenView': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'BlueScreenView',
-            'L_ITEM': 'BlueScreenView.exe',
-            },
-        'ERUNT': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'erunt',
-            'L_ITEM': 'ERUNT.EXE',
-            'L_ARGS': '%client_dir%\Backups\Registry\%iso_date% sysreg curuser otherusers',
-            'L_ELEV': 'True',
-            'Extra Code': [
-                r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
-                ],
-            },
-        'FurMark': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'FurMark',
-            'L_ITEM': 'FurMark.exe',
-            },
-        'HDTune Pro': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'HDTunePro',
-            'L_ITEM': 'HDTunePro.exe',
-            },
-        'HitmanPro': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'HitmanPro',
-            'L_ITEM': 'HitmanPro.exe',
-            'Extra Code': [
-                r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
-                ],
-            },
-        'HWiNFO': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'HWiNFO',
-            'L_ITEM': 'HWiNFO.exe',
-            'Extra Code': [
-                r'for %%a in (32 64) do (',
-                r'    copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r')',
-                ],
-            },
-        'HWiNFO (Sensors)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'HWiNFO',
-            'L_ITEM': 'HWiNFO.exe',
-            'Extra Code': [
-                r'for %%a in (32 64) do (',
-                r'    copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SensorsOnly=1)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r')',
-                ],
-            },
-        },
-    r'Drivers': {
-        'Intel RST (Current Release)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': '_Drivers\Intel RST',
-            'L_ITEM': 'SetupRST_16.5.exe',
-            'L_7ZIP': 'SetupRST_16.5.exe',
-            },
-        'Intel RST (Previous Releases)': {
-            'L_TYPE': 'Folder',
-            'L_PATH': '_Drivers\Intel RST',
-            'L_ITEM': '.',
-            'L_NCMD': 'True',
-            },
-        'Intel SSD Toolbox': {
-            'L_TYPE': 'Executable',
-            'L_PATH': r'_Drivers\Intel SSD Toolbox',
-            'L_ITEM': 'Intel SSD Toolbox.exe',
-            },
-        'Samsing Magician': {
-            'L_TYPE': 'Executable',
-            'L_PATH': r'_Drivers\Samsung Magician',
-            'L_ITEM': 'Samsung Magician.exe',
-            },
-        'Snappy Driver Installer Origin': {
-            'L_TYPE': 'Executable',
-            'L_PATH': '_Drivers\SDIO',
-            'L_ITEM': 'SDIO.exe',
-            },
-        },
-    r'Drivers\Extras': {
-        'Acer': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'HWiNFO',
-            'L_ITEM': 'HWiNFO.exe',
-            'Extra Code': [
-                r'for %%a in (32 64) do (',
-                r'    copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r')',
-                r'start "" "http://us.acer.com/ac/en/US/content/drivers"',
-                ],
-            },
-        'Lenovo': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'HWiNFO',
-            'L_ITEM': 'HWiNFO.exe',
-            'Extra Code': [
-                r'for %%a in (32 64) do (',
-                r'    copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r')',
-                r'start "" "https://pcsupport.lenovo.com/us/en/"',
-                ],
-            },
-        'Toshiba': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'HWiNFO',
-            'L_ITEM': 'HWiNFO.exe',
-            'Extra Code': [
-                r'for %%a in (32 64) do (',
-                r'    copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r'    (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
-                r')',
-                r'start "" "http://support.toshiba.com/drivers"',
-                ],
-            },
-        },
-    r'Installers': {
-        'ESET NOD32 AV': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'install_eset_nod32_av.py',
-            'L_ELEV': 'True',
-            },
-        'SW Bundle': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'install_sw_bundle.py',
-            'L_ELEV': 'True',
-            },
-        },
-    r'Installers\Extras\Office\2016': {
-        'Home and Business 2016 (x32)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2016',
-            'L_ITEM': 'hb_32.xml',
-            'L_NCMD': 'True',
-            },
-        'Home and Business 2016 (x64)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2016',
-            'L_ITEM': 'hb_64.xml',
-            'L_NCMD': 'True',
-            },
-        'Home and Student 2016 (x32)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2016',
-            'L_ITEM': 'hs_32.xml',
-            'L_NCMD': 'True',
-            },
-        'Home and Student 2016 (x64)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2016',
-            'L_ITEM': 'hs_64.xml',
-            'L_NCMD': 'True',
-            },
-        'Office 365 2016 (x32)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2016',
-            'L_ITEM': '365_32.xml',
-            'L_NCMD': 'True',
-            },
-        'Office 365 2016 (x64)': {
-            'L_TYPE': 'Office',
-            'L_PATH': '2016',
-            'L_ITEM': '365_64.xml',
-            'L_NCMD': 'True',
-            },
-        },
-    r'Installers\Extras\Runtimes': {
-        'Visual C++ Runtimes': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'install_vcredists.py',
-            'L_ELEV': 'True',
-            },
-        },
-    r'Misc': {
-        'Cleanup CBS Temp Files': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'cbs_fix.py',
-            'L_ELEV': 'True',
-            },
-        'ConEmu (as ADMIN)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'ConEmu',
-            'L_ITEM': 'ConEmu.exe',
-            'L_ELEV': 'True',
-            },
-        'ConEmu': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'ConEmu',
-            'L_ITEM': 'ConEmu.exe',
-            },
-        'Enter SafeMode': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'safemode_enter.py',
-            'L_ELEV': 'True',
-            },
-        'Everything': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'Everything',
-            'L_ITEM': 'Everything.exe',
-            'L_ARGS': '-nodb',
-            'L_ELEV': 'True',
-            },
-        'Exit SafeMode': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'safemode_exit.py',
-            'L_ELEV': 'True',
-            },
-        'Network Stability Test': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'network_stability_test.py',
-            },
-        'Notepad++': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'notepadplusplus',
-            'L_ITEM': 'notepadplusplus.exe',
-            },
-        'PuTTY': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'PuTTY',
-            'L_ITEM': 'PUTTY.EXE',
-            },
-        'ShutUp10': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'ShutUp10',
-            'L_ITEM': 'OOSU10.exe',
-            },
-        'ShutUp10 (1201 Minimal Selection)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'ShutUp10',
-            'L_ITEM': 'OOSU10.exe',
-            'L_ARGS': '1201.cfg',
-            },
-        'WizTree': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'WizTree',
-            'L_ITEM': 'WizTree.exe',
-            'L_ELEV': 'True',
-            },
-        'XMPlay': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'XMPlay',
-            'L_ITEM': 'xmplay.exe',
-            'L_ARGS': '"%bin%\XMPlay\music.7z"',
-            },
-        },
-    r'Repairs': {
-        'AdwCleaner': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'AdwCleaner',
-            'L_ITEM': 'AdwCleaner.exe',
-            },
-        'Autoruns': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'Autoruns',
-            'L_ITEM': 'Autoruns.exe',
-            'L_ARGS': '-e',
-            'Extra Code': [
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 0 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownomicrosoft /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownowindows /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v showonlyvirustotal /t REG_DWORD /d 0 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v submitvirustotal /t REG_DWORD /d 0 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns /v verifysignatures /t REG_DWORD /d 0 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns\SigCheck /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
-                r'reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul',
-                ],
-            },
-        'CHKDSK': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'check_disk.py',
-            'L_ELEV': 'True',
-            },
-        'DISM': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'dism.py',
-            'L_ELEV': 'True',
-            },
-        'ESET Online Scanner': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'ESET',
-            'L_ITEM': 'ESET.exe',
-            },
-        'KVRT': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'KVRT',
-            'L_ITEM': 'KVRT.exe',
-            'L_ARGS': (
-                r' -accepteula'
-                r' -d %q_dir%'
-                r' -processlevel 3'
-                r' -dontcryptsupportinfo'
-                r' -fixednames'
-                ),
-            'Extra Code': [
-                r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
-                r'set "q_dir=%client_dir%\Quarantine\KVRT"',
-                r'mkdir "%q_dir%">nul 2>&1',
-                ],
-            },
-        'RKill': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'RKill',
-            'L_ITEM': 'RKill.exe',
-            'L_ARGS': '-s -l %log_dir%\Tools\RKill.log',
-            'L_ELEV': 'True',
-            'Extra Code': [
-                r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
-                ],
-            },
-        'SFC Scan': {
-            'L_TYPE': 'PyScript',
-            'L_PATH': 'Scripts',
-            'L_ITEM': 'sfc_scan.py',
-            'L_ELEV': 'True',
-            },
-        'TDSSKiller': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'TDSSKiller',
-            'L_ITEM': 'TDSSKiller.exe',
-            'L_ARGS': (
-                r' -l %log_dir%\Tools\TDSSKiller.log'
-                r' -qpath %q_dir%'
-                r' -accepteula'
-                r' -accepteulaksn'
-                r' -dcexact'
-                r' -tdlfs'
-                ),
-            'Extra Code': [
-                r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
-                r'set "q_dir=%client_dir%\Quarantine\TDSSKiller"',
-                r'mkdir "%q_dir%">nul 2>&1',
-                ],
-            },
-        'WinAIO Repair': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'WinAIORepair',
-            'L_ITEM': 'Repair_Windows.exe',
-            'L_ELEV': 'True',
-            'Extra Code': [
-                r'copy /y "%bin%\WinAIORepair\__empty.ini" "%bin%\WinAIORepair\settings.ini"',
-                ],
-            },
-        'WinAIO Repair (Fix Associations)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'WinAIORepair',
-            'L_ITEM': 'Repair_Windows.exe',
-            'L_ELEV': 'True',
-            'Extra Code': [
-                r'copy /y "%bin%\WinAIORepair\__associations.ini" "%bin%\WinAIORepair\settings.ini"',
-                ],
-            },
-        'WinAIO Repair (Fix Permissions)': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'WinAIORepair',
-            'L_ITEM': 'Repair_Windows.exe',
-            'L_ELEV': 'True',
-            'Extra Code': [
-                r'copy /y "%bin%\WinAIORepair\__permissions.ini" "%bin%\WinAIORepair\settings.ini"',
-                ],
-            },
-        },
-    r'Uninstallers': {
-        'IObit Uninstaller': {
-            'L_TYPE': 'Executable',
-            'L_PATH': 'IObitUninstallerPortable',
-            'L_ITEM': 'IObitUninstallerPortable.exe',
-            },
-        },
-    }
+  r'(Root)': {
+    'Activate Windows': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'activate.py',
+      'L_ELEV': 'True',
+      },
+    'd7II': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'd7II',
+      'L_ITEM': 'd7II.exe',
+      },
+    'Post-d7II Work': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'post_d7.py',
+      'L_ELEV': 'True',
+      },
+    'System Checklist': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'system_checklist.py',
+      'L_ELEV': 'True',
+      },
+    'System Checklist (HW)': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'system_checklist_hw.py',
+      'L_ELEV': 'True',
+      },
+    'User Checklist': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'user_checklist.py',
+      },
+    },
+  r'.bin\Scripts\launchers_for_d7': {
+    'Browser Reset': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'reset_browsers.py',
+      'L_ARGS': 'd7mode',
+      },
+    'Install SW Bundle': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'install_sw_bundle.py',
+      'L_ARGS': 'd7mode',
+      'L_ELEV': 'True',
+      },
+    'System Checklist': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'system_checklist.py',
+      'L_ARGS': 'd7mode',
+      'L_ELEV': 'True',
+      },
+    'System Diagnostics': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'system_diagnostics.py',
+      'L_ARGS': 'd7mode',
+      'L_ELEV': 'True',
+      },
+    'User Checklist': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'user_checklist.py',
+      'L_ARGS': 'd7mode',
+      },
+    },
+  r'Data Recovery': {
+    'PhotoRec (CLI)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'TestDisk',
+      'L_ITEM': 'photorec_win.exe',
+      'L_ELEV': 'True',
+      'L__CLI': 'True',
+      },
+    'PhotoRec': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'TestDisk',
+      'L_ITEM': 'qphotorec_win.exe',
+      'L_ELEV': 'True',
+      },
+    'TestDisk': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'TestDisk',
+      'L_ITEM': 'testdisk_win.exe',
+      'L_ELEV': 'True',
+      'L__CLI': 'True',
+      },
+    },
+  r'Data Transfers': {
+    "Fab's Autobackup Pro": {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'AutoBackupPro',
+      'L_ITEM': 'autobackup6pro.exe',
+      },
+    'FastCopy (as ADMIN)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'FastCopy',
+      'L_ITEM': 'FastCopy.exe',
+      'L_ARGS': (
+        r' /logfile=%log_dir%\Tools\FastCopy.log'
+        r' /cmd=noexist_only'
+        r' /utf8'
+        r' /skip_empty_dir'
+        r' /linkdest'
+        r' /exclude='
+          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'
+        r' /to=%client_dir%\Transfer_%iso_date%\ '
+        ),
+      'L_ELEV': 'True',
+      'Extra Code': [
+        r'call "%bin%\Scripts\init_client_dir.cmd" /Logs /Transfer',
+        ],
+      },
+    'FastCopy': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'FastCopy',
+      'L_ITEM': 'FastCopy.exe',
+      'L_ARGS': (
+        r' /logfile=%log_dir%\Tools\FastCopy.log'
+        r' /cmd=noexist_only'
+        r' /utf8'
+        r' /skip_empty_dir'
+        r' /linkdest'
+        r' /exclude='
+          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'
+        r' /to=%client_dir%\Transfer_%iso_date%\ '
+        ),
+      'Extra Code': [
+        r'call "%bin%\Scripts\init_client_dir.cmd" /Logs /Transfer',
+        ],
+      },
+    'KVRT': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'KVRT',
+      'L_ITEM': 'KVRT.exe',
+      'L_ARGS': (
+        r' -accepteula'
+        r' -d %q_dir%'
+        r' -processlevel 3'
+        r' -dontcryptsupportinfo'
+        r' -fixednames'
+        ),
+      'Extra Code': [
+        r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
+        r'set "q_dir=%client_dir%\Quarantine\KVRT"',
+        r'mkdir "%q_dir%">nul 2>&1',
+        ],
+      },
+    'Mac & Linux Reader': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'LinuxReader',
+      'L_ITEM': 'LinuxReader.exe',
+      'L_ELEV': 'True',
+      },
+    'Transferred Keys': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'transferred_keys.py',
+      'L_ELEV': 'True',
+      },
+    'User Data Transfer': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'user_data_transfer.py',
+      'L_ELEV': 'True',
+      },
+    'XYplorer (as ADMIN)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'XYplorerFree',
+      'L_ITEM': 'XYplorerFree.exe',
+      'L_ARGS': r'/exp /win=max %userprofile%',
+      'L_ELEV': 'True',
+      },
+    'XYplorer': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'XYplorerFree',
+      'L_ITEM': 'XYplorerFree.exe',
+      'L_ARGS': r'/exp /win=max %userprofile%',
+      },
+    },
+  r'Diagnostics': {
+    'AIDA64': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'AIDA64',
+      'L_ITEM': 'aida64.exe',
+      },
+    'ProduKey': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ProduKey',
+      'L_ITEM': 'ProduKey.exe',
+      'L_ELEV': 'True',
+      'Extra Code': [
+        r'if exist "%bin%\ProduKey" (',
+        r'  del "%bin%\ProduKey\ProduKey.cfg" 2>nul',
+        r'  del "%bin%\ProduKey\ProduKey64.cfg" 2>nul',
+        r')',
+        ],
+      },
+    'System Diagnostics': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'system_diagnostics.py',
+      'L_ELEV': 'True',
+      },
+    },
+  r'Diagnostics\Extras': {
+    'Autoruns (with VirusTotal Scan)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'Autoruns',
+      'L_ITEM': 'Autoruns.exe',
+      'L_ARGS': '-e',
+      'Extra Code': [
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownomicrosoft /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownowindows /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v showonlyvirustotal /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v submitvirustotal /t REG_DWORD /d 0 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v verifysignatures /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns\SigCheck /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul',
+        ],
+      },
+    'BleachBit': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'BleachBit',
+      'L_ITEM': 'bleachbit.exe',
+      },
+    'BlueScreenView': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'BlueScreenView',
+      'L_ITEM': 'BlueScreenView.exe',
+      },
+    'ERUNT': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'erunt',
+      'L_ITEM': 'ERUNT.EXE',
+      'L_ARGS': '%client_dir%\Backups\Registry\%iso_date% sysreg curuser otherusers',
+      'L_ELEV': 'True',
+      'Extra Code': [
+        r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
+        ],
+      },
+    'FurMark': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'FurMark',
+      'L_ITEM': 'FurMark.exe',
+      },
+    'HDTune Pro': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'HDTunePro',
+      'L_ITEM': 'HDTunePro.exe',
+      },
+    'HitmanPro': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'HitmanPro',
+      'L_ITEM': 'HitmanPro.exe',
+      'Extra Code': [
+        r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
+        ],
+      },
+    'HWiNFO': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'HWiNFO',
+      'L_ITEM': 'HWiNFO.exe',
+      'Extra Code': [
+        r'for %%a in (32 64) do (',
+        r'  copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r')',
+        ],
+      },
+    'HWiNFO (Sensors)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'HWiNFO',
+      'L_ITEM': 'HWiNFO.exe',
+      'Extra Code': [
+        r'for %%a in (32 64) do (',
+        r'  copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SensorsOnly=1)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r')',
+        ],
+      },
+    },
+  r'Drivers': {
+    'Intel RST (Current Release)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': '_Drivers\Intel RST',
+      'L_ITEM': 'SetupRST_16.5.exe',
+      'L_7ZIP': 'SetupRST_16.5.exe',
+      },
+    'Intel RST (Previous Releases)': {
+      'L_TYPE': 'Folder',
+      'L_PATH': '_Drivers\Intel RST',
+      'L_ITEM': '.',
+      'L_NCMD': 'True',
+      },
+    'Intel SSD Toolbox': {
+      'L_TYPE': 'Executable',
+      'L_PATH': r'_Drivers\Intel SSD Toolbox',
+      'L_ITEM': 'Intel SSD Toolbox.exe',
+      },
+    'Samsing Magician': {
+      'L_TYPE': 'Executable',
+      'L_PATH': r'_Drivers\Samsung Magician',
+      'L_ITEM': 'Samsung Magician.exe',
+      },
+    'Snappy Driver Installer Origin': {
+      'L_TYPE': 'Executable',
+      'L_PATH': '_Drivers\SDIO',
+      'L_ITEM': 'SDIO.exe',
+      },
+    },
+  r'Drivers\Extras': {
+    'Acer': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'HWiNFO',
+      'L_ITEM': 'HWiNFO.exe',
+      'Extra Code': [
+        r'for %%a in (32 64) do (',
+        r'  copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r')',
+        r'start "" "http://us.acer.com/ac/en/US/content/drivers"',
+        ],
+      },
+    'Lenovo': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'HWiNFO',
+      'L_ITEM': 'HWiNFO.exe',
+      'Extra Code': [
+        r'for %%a in (32 64) do (',
+        r'  copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r')',
+        r'start "" "https://pcsupport.lenovo.com/us/en/"',
+        ],
+      },
+    'Toshiba': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'HWiNFO',
+      'L_ITEM': 'HWiNFO.exe',
+      'Extra Code': [
+        r'for %%a in (32 64) do (',
+        r'  copy /y "%bin%\HWiNFO\general.ini" "%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SensorsOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r'  (echo SummaryOnly=0)>>"%bin%\HWiNFO\HWiNFO%%a.ini"',
+        r')',
+        r'start "" "http://support.toshiba.com/drivers"',
+        ],
+      },
+    },
+  r'Installers': {
+    'ESET NOD32 AV': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'install_eset_nod32_av.py',
+      'L_ELEV': 'True',
+      },
+    'SW Bundle': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'install_sw_bundle.py',
+      'L_ELEV': 'True',
+      },
+    },
+  r'Installers\Extras\Office\2016': {
+    'Home and Business 2016 (x32)': {
+      'L_TYPE': 'Office',
+      'L_PATH': '2016',
+      'L_ITEM': 'hb_32.xml',
+      'L_NCMD': 'True',
+      },
+    'Home and Business 2016 (x64)': {
+      'L_TYPE': 'Office',
+      'L_PATH': '2016',
+      'L_ITEM': 'hb_64.xml',
+      'L_NCMD': 'True',
+      },
+    'Home and Student 2016 (x32)': {
+      'L_TYPE': 'Office',
+      'L_PATH': '2016',
+      'L_ITEM': 'hs_32.xml',
+      'L_NCMD': 'True',
+      },
+    'Home and Student 2016 (x64)': {
+      'L_TYPE': 'Office',
+      'L_PATH': '2016',
+      'L_ITEM': 'hs_64.xml',
+      'L_NCMD': 'True',
+      },
+    'Office 365 2016 (x32)': {
+      'L_TYPE': 'Office',
+      'L_PATH': '2016',
+      'L_ITEM': '365_32.xml',
+      'L_NCMD': 'True',
+      },
+    'Office 365 2016 (x64)': {
+      'L_TYPE': 'Office',
+      'L_PATH': '2016',
+      'L_ITEM': '365_64.xml',
+      'L_NCMD': 'True',
+      },
+    },
+  r'Installers\Extras\Runtimes': {
+    'Visual C++ Runtimes': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'install_vcredists.py',
+      'L_ELEV': 'True',
+      },
+    },
+  r'Misc': {
+    'Cleanup CBS Temp Files': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'cbs_fix.py',
+      'L_ELEV': 'True',
+      },
+    'ConEmu (as ADMIN)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ConEmu',
+      'L_ITEM': 'ConEmu.exe',
+      'L_ELEV': 'True',
+      },
+    'ConEmu': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ConEmu',
+      'L_ITEM': 'ConEmu.exe',
+      },
+    'Enter SafeMode': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'safemode_enter.py',
+      'L_ELEV': 'True',
+      },
+    'Everything': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'Everything',
+      'L_ITEM': 'Everything.exe',
+      'L_ARGS': '-nodb',
+      'L_ELEV': 'True',
+      },
+    'Exit SafeMode': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'safemode_exit.py',
+      'L_ELEV': 'True',
+      },
+    'Network Stability Test': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'network_stability_test.py',
+      },
+    'Notepad++': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'notepadplusplus',
+      'L_ITEM': 'notepadplusplus.exe',
+      },
+    'PuTTY': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'PuTTY',
+      'L_ITEM': 'PUTTY.EXE',
+      },
+    'ShutUp10': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ShutUp10',
+      'L_ITEM': 'OOSU10.exe',
+      },
+    'ShutUp10 (1201 Minimal Selection)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ShutUp10',
+      'L_ITEM': 'OOSU10.exe',
+      'L_ARGS': '1201.cfg',
+      },
+    'WizTree': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'WizTree',
+      'L_ITEM': 'WizTree.exe',
+      'L_ELEV': 'True',
+      },
+    'XMPlay': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'XMPlay',
+      'L_ITEM': 'xmplay.exe',
+      'L_ARGS': '"%bin%\XMPlay\music.7z"',
+      },
+    },
+  r'Repairs': {
+    'AdwCleaner': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'AdwCleaner',
+      'L_ITEM': 'AdwCleaner.exe',
+      },
+    'Autoruns': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'Autoruns',
+      'L_ITEM': 'Autoruns.exe',
+      'L_ARGS': '-e',
+      'Extra Code': [
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v checkvirustotal /t REG_DWORD /d 0 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownomicrosoft /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v shownowindows /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v showonlyvirustotal /t REG_DWORD /d 0 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v submitvirustotal /t REG_DWORD /d 0 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns /v verifysignatures /t REG_DWORD /d 0 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns\SigCheck /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns\Streams /v EulaAccepted /t REG_DWORD /d 1 /f >nul',
+        r'reg add HKCU\Software\Sysinternals\AutoRuns\VirusTotal /v VirusTotalTermsAccepted /t REG_DWORD /d 1 /f >nul',
+        ],
+      },
+    'CHKDSK': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'check_disk.py',
+      'L_ELEV': 'True',
+      },
+    'DISM': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'dism.py',
+      'L_ELEV': 'True',
+      },
+    'ESET Online Scanner': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ESET',
+      'L_ITEM': 'ESET.exe',
+      },
+    'KVRT': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'KVRT',
+      'L_ITEM': 'KVRT.exe',
+      'L_ARGS': (
+        r' -accepteula'
+        r' -d %q_dir%'
+        r' -processlevel 3'
+        r' -dontcryptsupportinfo'
+        r' -fixednames'
+        ),
+      'Extra Code': [
+        r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
+        r'set "q_dir=%client_dir%\Quarantine\KVRT"',
+        r'mkdir "%q_dir%">nul 2>&1',
+        ],
+      },
+    'RKill': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'RKill',
+      'L_ITEM': 'RKill.exe',
+      'L_ARGS': '-s -l %log_dir%\Tools\RKill.log',
+      'L_ELEV': 'True',
+      'Extra Code': [
+        r'call "%bin%\Scripts\init_client_dir.cmd" /Logs',
+        ],
+      },
+    'SFC Scan': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'sfc_scan.py',
+      'L_ELEV': 'True',
+      },
+    'TDSSKiller': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'TDSSKiller',
+      'L_ITEM': 'TDSSKiller.exe',
+      'L_ARGS': (
+        r' -l %log_dir%\Tools\TDSSKiller.log'
+        r' -qpath %q_dir%'
+        r' -accepteula'
+        r' -accepteulaksn'
+        r' -dcexact'
+        r' -tdlfs'
+        ),
+      'Extra Code': [
+        r'call "%bin%\Scripts\init_client_dir.cmd" /Quarantine',
+        r'set "q_dir=%client_dir%\Quarantine\TDSSKiller"',
+        r'mkdir "%q_dir%">nul 2>&1',
+        ],
+      },
+    'WinAIO Repair': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'WinAIORepair',
+      'L_ITEM': 'Repair_Windows.exe',
+      'L_ELEV': 'True',
+      'Extra Code': [
+        r'copy /y "%bin%\WinAIORepair\__empty.ini" "%bin%\WinAIORepair\settings.ini"',
+        ],
+      },
+    'WinAIO Repair (Fix Associations)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'WinAIORepair',
+      'L_ITEM': 'Repair_Windows.exe',
+      'L_ELEV': 'True',
+      'Extra Code': [
+        r'copy /y "%bin%\WinAIORepair\__associations.ini" "%bin%\WinAIORepair\settings.ini"',
+        ],
+      },
+    'WinAIO Repair (Fix Permissions)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'WinAIORepair',
+      'L_ITEM': 'Repair_Windows.exe',
+      'L_ELEV': 'True',
+      'Extra Code': [
+        r'copy /y "%bin%\WinAIORepair\__permissions.ini" "%bin%\WinAIORepair\settings.ini"',
+        ],
+      },
+    },
+  r'Uninstallers': {
+    'IObit Uninstaller': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'IObitUninstallerPortable',
+      'L_ITEM': 'IObitUninstallerPortable.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
diff --git a/.bin/Scripts/settings/main.py b/.bin/Scripts/settings/main.py
index 5e9002f5..5869580b 100644
--- a/.bin/Scripts/settings/main.py
+++ b/.bin/Scripts/settings/main.py
@@ -5,7 +5,7 @@ ENABLED_OPEN_LOGS = False
 ENABLED_TICKET_NUMBERS = False
 ENABLED_UPLOAD_DATA = True
 HW_OVERRIDES_FORCED = False
-HW_OVERRIDES_LIMITED = True                # If True this disables HW_OVERRIDE_FORCED
+HW_OVERRIDES_LIMITED = True               # If True this disables HW_OVERRIDE_FORCED
 
 # STATIC VARIABLES (also used by BASH and BATCH files)
 ## NOTE: There are no spaces around the = for easier parsing in BASH and BATCH
@@ -17,7 +17,7 @@ SUPPORT_MESSAGE='Please let support know by opening an issue on Gogs'
 # imgur
 IMGUR_CLIENT_ID='3d1ee1d38707b85'
 # Live Linux
-MPRIME_LIMIT='7'                           # of minutes to run Prime95 during hw-diags
+MPRIME_LIMIT='7'                          # of minutes to run Prime95 during hw-diags
 ROOT_PASSWORD='1201 loves computers!'
 TECH_PASSWORD='Sorted1201'
 # Root Certificate Authority
@@ -37,59 +37,61 @@ WIFI_PASSWORD='justintime!'
 ##       one server serves multiple shares then you have to use the same
 ##       user/password for all of those shares.
 BACKUP_SERVERS = [
-    {   'IP':       '10.11.1.20',
-        'Name':     'Anaconda',
-        'Mounted':  False,
-        'Share':    'Backups',
-        'User':     'cx',
-        'Pass':     'cx',
-        'RW-User':  'backup',
-        'RW-Pass':  '1201 loves computers!',
-    },
+  { 'IP':       '10.11.1.20',
+    'Name':     'Anaconda',
+    'Mounted':  False,
+    'Share':    'Backups',
+    'User':     'cx',
+    'Pass':     'cx',
+    'RW-User':  'backup',
+    'RW-Pass':  '1201 loves computers!',
+  },
 ]
 BENCHMARK_SERVER = {
-    'Name':         'Nextcloud',
-    'Short Url':    'https://1201north.ddns.net:8001/index.php/f/27892',
-    'Url':          'https://1201north.ddns.net:8001/public.php/webdav/Benchmarks',
-    'User':         'RAE7ajRk25CBnW6',
-    'Pass':         '',
+  'Name':       'Nextcloud',
+  'Short Url':  'https://1201north.ddns.net:8001/index.php/f/27892',
+  'Url':        'https://1201north.ddns.net:8001/public.php/webdav/Benchmarks',
+  'User':       'RAE7ajRk25CBnW6',
+  'Pass':       '',
 }
 CRASH_SERVER = {
-    'Name':         'Nextcloud',
-    'Url':          'https://1201north.ddns.net:8001/public.php/webdav/WizardKit_Issues',
-    'User':         'LoQ97J3r6CFGT2T',
-    'Pass':         '',
+  'Name':       'Nextcloud',
+  'Url':        'https://1201north.ddns.net:8001/public.php/webdav/WizardKit_Issues',
+  'User':       'LoQ97J3r6CFGT2T',
+  'Pass':       '',
 }
 OFFICE_SERVER = {
-    'IP':           OFFICE_SERVER_IP,
-    'Name':         'Anaconda',
-    'Mounted':      False,
-    'Share':       r'Public\Office\MS Office',
-    'User':         'cx',
-    'Pass':         'cx',
-    'RW-User':      'backup',
-    'RW-Pass':      '1201 loves computers!',
+  'IP':         OFFICE_SERVER_IP,
+  'Name':       'Anaconda',
+  'Mounted':    False,
+  'Share':     r'Public\Office\MS Office',
+  'User':       'cx',
+  'Pass':       'cx',
+  'RW-User':    'backup',
+  'RW-Pass':    '1201 loves computers!',
 }
 QUICKBOOKS_SERVER = {
-    'IP':           QUICKBOOKS_SERVER_IP,
-    'Name':         'Anaconda',
-    'Mounted':      False,
-    'Share':       r'Public\QuickBooks',
-    'User':         'cx',
-    'Pass':         'cx',
-    'RW-User':      'backup',
-    'RW-Pass':      '1201 loves computers!',
+  'IP':         QUICKBOOKS_SERVER_IP,
+  'Name':       'Anaconda',
+  'Mounted':    False,
+  'Share':     r'Public\QuickBooks',
+  'User':       'cx',
+  'Pass':       'cx',
+  'RW-User':    'backup',
+  'RW-Pass':    '1201 loves computers!',
 }
 WINDOWS_SERVER = {
-    'IP':           '10.11.1.20',
-    'Name':         'Anaconda',
-    'Mounted':      False,
-    'Share':       r'Public\Windows',
-    'User':         'cx',
-    'Pass':         'cx',
-    'RW-User':      'backup',
-    'RW-Pass':      '1201 loves computers!',
+  'IP':         '10.11.1.20',
+  'Name':       'Anaconda',
+  'Mounted':    False,
+  'Share':     r'Public\Windows',
+  'User':       'cx',
+  'Pass':       'cx',
+  'RW-User':    'backup',
+  'RW-Pass':    '1201 loves computers!',
 }
 
 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
diff --git a/.bin/Scripts/settings/music.py b/.bin/Scripts/settings/music.py
index a2d49f31..37f5d178 100644
--- a/.bin/Scripts/settings/music.py
+++ b/.bin/Scripts/settings/music.py
@@ -1,70 +1,72 @@
 # 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
diff --git a/.bin/Scripts/settings/osticket.py b/.bin/Scripts/settings/osticket.py
index fe998eb2..6360a579 100644
--- a/.bin/Scripts/settings/osticket.py
+++ b/.bin/Scripts/settings/osticket.py
@@ -28,6 +28,6 @@ OSTICKET = {
   }
 
 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
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index 1dc650f2..55d30e0c 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -1,208 +1,208 @@
 # Wizard Kit: Settings - Sources
 
 SOURCE_URLS = {
-    'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1801120058/AcroRdrDC1801120058_en_US.exe',
-    'AdwCleaner': 'https://downloads.malwarebytes.com/file/adwcleaner',
-    'AIDA64': 'http://download.aida64.com/aida64engineer597.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',
-    'ESET Online Scanner': 'https://download.eset.com/com/eset/tools/online_scanner/latest/esetonlinescanner_enu.exe',
-    'ESET NOD32 AV': 'https://download.eset.com/com/eset/apps/home/eav/windows/latest/eav_nt64.exe',
-    'Everything32': 'https://www.voidtools.com/Everything-1.4.1.895.x86.zip',
-    'Everything64': 'https://www.voidtools.com/Everything-1.4.1.895.x64.zip',
-    'FastCopy': 'http://ftp.vector.co.jp/70/64/2323/FastCopy354_installer.zip',
-    'FurMark': 'https://geeks3d.com/dl/get/569',
-    'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/1056733/ublock_origin-1.16.20-an+fx.xpi',
-    'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
-    'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
-    'HWiNFO': 'http://app.oldfoss.com:81/download/HWiNFO/hwi_588.zip',
-    'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27656/eng/Intel%20SSD%20Toolbox%20-%20v3.5.2.exe',
-    'IOBit_Uninstaller': 'https://portableapps.duckduckgo.com/IObitUninstallerPortable_7.5.0.7.paf.exe',
-    'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
-    'Linux Reader': 'https://www.diskinternals.com/download/Linux_Reader.exe',
-    '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.5.8/npp.7.5.8.bin.minimalist.7z',
-    'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_10810.33603.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_2_1_180523/CD0CFAC4675B9E502899B41BE00525C3909ECE3AD57CC1A2FB6B74A766B2A1EA/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',
-    'ShutUp10': 'https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe',
-    '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.12.0-windows-i686-bin.zip',
-    'wimlib64': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip',
-    'WinAIO Repair': 'http://www.tweaking.com/files/setups/tweaking.com_windows_repair_aio.zip',
-    'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
-    'WizTree': 'https://antibody-software.com/files/wiztree_3_26_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',
-    }
+  'Adobe Reader DC': 'http://ardownload.adobe.com/pub/adobe/reader/win/AcrobatDC/1801120058/AcroRdrDC1801120058_en_US.exe',
+  'AdwCleaner': 'https://downloads.malwarebytes.com/file/adwcleaner',
+  'AIDA64': 'http://download.aida64.com/aida64engineer597.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',
+  'ESET Online Scanner': 'https://download.eset.com/com/eset/tools/online_scanner/latest/esetonlinescanner_enu.exe',
+  'ESET NOD32 AV': 'https://download.eset.com/com/eset/apps/home/eav/windows/latest/eav_nt64.exe',
+  'Everything32': 'https://www.voidtools.com/Everything-1.4.1.895.x86.zip',
+  'Everything64': 'https://www.voidtools.com/Everything-1.4.1.895.x64.zip',
+  'FastCopy': 'http://ftp.vector.co.jp/70/64/2323/FastCopy354_installer.zip',
+  'FurMark': 'https://geeks3d.com/dl/get/569',
+  'Firefox uBO': 'https://addons.mozilla.org/firefox/downloads/file/1056733/ublock_origin-1.16.20-an+fx.xpi',
+  'HitmanPro32': 'https://dl.surfright.nl/HitmanPro.exe',
+  'HitmanPro64': 'https://dl.surfright.nl/HitmanPro_x64.exe',
+  'HWiNFO': 'http://app.oldfoss.com:81/download/HWiNFO/hwi_588.zip',
+  'Intel SSD Toolbox': r'https://downloadmirror.intel.com/27656/eng/Intel%20SSD%20Toolbox%20-%20v3.5.2.exe',
+  'IOBit_Uninstaller': 'https://portableapps.duckduckgo.com/IObitUninstallerPortable_7.5.0.7.paf.exe',
+  'KVRT': 'http://devbuilds.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
+  'Linux Reader': 'https://www.diskinternals.com/download/Linux_Reader.exe',
+  '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.5.8/npp.7.5.8.bin.minimalist.7z',
+  'Office Deployment Tool 2016': 'https://download.microsoft.com/download/2/7/A/27AF1BE6-DD20-4CB4-B154-EBAB8A7D4A7E/officedeploymenttool_10810.33603.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_2_1_180523/CD0CFAC4675B9E502899B41BE00525C3909ECE3AD57CC1A2FB6B74A766B2A1EA/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',
+  'ShutUp10': 'https://dl5.oo-software.com/files/ooshutup10/OOSU10.exe',
+  '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.12.0-windows-i686-bin.zip',
+  'wimlib64': 'https://wimlib.net/downloads/wimlib-1.12.0-windows-x86_64-bin.zip',
+  'WinAIO Repair': 'http://www.tweaking.com/files/setups/tweaking.com_windows_repair_aio.zip',
+  'Winapp2': 'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
+  'WizTree': 'https://antibody-software.com/files/wiztree_3_26_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 = {
-    '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',
-        },
-    }
+  '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_SOURCES = {
-    'Bundles': {
-        'Legacy.exe': '.net4.7.2-7zip-chrome-firefox-sumatrapdf-vlc',
-        'Modern.exe': '.net4.7.2-7zip-chrome-classicstart-firefox-sumatrapdf-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': {
-        'Discord': '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',
-        '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.2',
-        '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 13.exe': 'teamviewer13',
-        'TeraCopy.exe': 'teracopy',
-        'WinDirStat.exe': 'windirstat',
-        },
-    'Web Browsers': {
-        'Google Chrome.exe': 'chrome',
-        'Mozilla Firefox.exe': 'firefox',
-        'Opera Chromium.exe': 'operaChromium',
-        },
-    }
+  'Bundles': {
+    'Legacy.exe': '.net4.7.2-7zip-chrome-firefox-sumatrapdf-vlc',
+    'Modern.exe': '.net4.7.2-7zip-chrome-classicstart-firefox-sumatrapdf-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': {
+    'Discord': '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',
+    '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.2',
+    '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 13.exe': 'teamviewer13',
+    '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_16.0.exe': 'https://downloadmirror.intel.com/27681/eng/SetupRST.exe',
-    'SetupRST_16.5.exe': 'https://downloadmirror.intel.com/27984/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/27400/eng/SetupRST.exe',
+  'SetupRST_16.0.exe': 'https://downloadmirror.intel.com/27681/eng/SetupRST.exe',
+  'SetupRST_16.5.exe': 'https://downloadmirror.intel.com/27984/eng/SetupRST.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=4 sw=4 ts=4 tw=0 nowrap
+# vim: sts=2 sw=2 ts=2
diff --git a/.bin/Scripts/settings/tools.py b/.bin/Scripts/settings/tools.py
index b470603c..0ee74dec 100644
--- a/.bin/Scripts/settings/tools.py
+++ b/.bin/Scripts/settings/tools.py
@@ -1,56 +1,58 @@
 # 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'},
-    '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'},
-    }
+  # 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