Update Windows kit layout and update tool configs

Going forward cbin/.cbin will only be used if necessary and not by default. This removes a step for most tools when used and better aligns with the new auto_repairs and auto_setup scripts.
2021-10-13 17:51:55 -06:00 · 2021-10-13 17:51:55 -06:00 · 0725674a3b
commit 0725674a3b
parent d1b32a786c
17 changed files with 739 additions and 31 deletions
--- a/scripts/Launcher_Template.cmd
+++ b/scripts/Launcher_Template.cmd
@ -67,8 +67,8 @@ popd
@exit /b 0

 :SetTitle
-rem Sets title using KIT_NAME_FULL from settings\main.py
-set "SETTINGS=%bin%\Scripts\settings\main.py"
+rem Sets title using KIT_NAME_FULL from wk\cfg\main.py
+set "SETTINGS=%bin%\Scripts\wk\cfg\main.py"
 for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_FULL "%SETTINGS%"`) do (
  set "_v=%%f"
  set "_v=!_v:*'=!"
--- a/scripts/init_client_dir.cmd
+++ b/scripts/init_client_dir.cmd
@ -26,7 +26,7 @@ set _minute=%_minute:~-2%
 set iso_date=%_yyyy%-%_mm%-%_dd%

 :SetVars
-set "SETTINGS=%bin%\Scripts\settings\main.py"
+set "SETTINGS=%bin%\Scripts\wk\cfg\main.py"
 for /f "tokens=* usebackq" %%f in (`findstr KIT_NAME_SHORT "%SETTINGS%"`) do (
  set "_v=%%f"
  set "_v=!_v:*'=!"
--- a/scripts/wk/cfg/init.py
+++ b/scripts/wk/cfg/init.py
@ -2,8 +2,10 @@

 from . import ddrescue
 from . import hw
+from . import launchers
 from . import log
 from . import main
+from . import music
 from . import net
 from . import repairs
 from . import setup
--- a/scripts/wk/cfg/launchers.py
+++ b/scripts/wk/cfg/launchers.py
@ -0,0 +1,254 @@
+"""WizardKit: Config - Launchers (Windows)"""
+# pylint: disable=line-too-long
+# vim: sts=2 sw=2 ts=2
+
+LAUNCHERS = {
+  r'': { # Root Dir
+    'Auto Repairs': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'auto_repairs.py',
+      'L_ELEV': 'True',
+      },
+    'Auto Setup': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'auto_setup.py',
+      'L_ELEV': 'True',
+      },
+    },
+  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': {
+    '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',
+        ],
+      },
+    },
+  r'Diagnostics': {
+    'AIDA64': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'AIDA64',
+      'L_ITEM': 'aida64.exe',
+      },
+    'Autoruns (with VirusTotal Scan)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'Sysinternals',
+      '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': r'%client_dir%\Backups\Registry\%iso_date% sysreg curuser otherusers',
+      'L_ELEV': 'True',
+      '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')',
+        ],
+      },
+    'Snappy Driver Installer Origin': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'SDIO',
+      'L_ITEM': 'SDIO.exe',
+      },
+    },
+  r'Misc': {
+    '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',
+      },
+    'Everything': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'Everything',
+      'L_ITEM': 'Everything.exe',
+      'L_ARGS': '-nodb',
+      'L_ELEV': 'True',
+      },
+    'Notepad++': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'notepadplusplus',
+      'L_ITEM': 'notepadplusplus.exe',
+      },
+    'PuTTY': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'PuTTY',
+      'L_ITEM': 'PUTTY.EXE',
+      },
+    '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': r'"%bin%\XMPlay\music.7z"',
+      },
+    },
+  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.")
--- a/scripts/wk/cfg/music.py
+++ b/scripts/wk/cfg/music.py
@ -0,0 +1,73 @@
+"""WizardKit: Config - Music Sources"""
+# vim: sts=2 sw=2 ts=2
+
+MUSIC_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'),
+  )
+MUSIC_SNES = (
+  '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.")
+
+# vim: sts=2 sw=2 ts=2
--- a/scripts/wk/cfg/repairs.py
+++ b/scripts/wk/cfg/repairs.py
@ -9,36 +9,54 @@ BLEACH_BIT_CLEANERS = (
  # Applications
  'adobe_reader.cache',
  'adobe_reader.tmp',
+  'amule.temp',
+  'discord.cache',
  'flash.cache',
  'gimp.tmp',
+  'google_earth.temporary_files',
+  'gpodder.cache',
  'hippo_opensim_viewer.cache',
  'java.cache',
  'miro.cache',
  'openofficeorg.cache',
  'pidgin.cache',
+  'seamonkey.cache',
  'secondlife_viewer.Cache',
+  'silverlight.temp',
+  'slack.cache',
+  'smartftp.cache',
  'thunderbird.cache',
  'vuze.cache',
+  'vuze.temp',
+  'windows_media_player.cache',
+  'winrar.temp',
  'yahoo_messenger.cache',
+  'zoom.cache',
  # Browsers
+  'brave.cache',
+  'brave.session',
  'chromium.cache',
+  'chromium.search_engines',
  'chromium.session',
  'firefox.cache',
  'firefox.session_restore',
  'google_chrome.cache',
  'google_chrome.session',
-  'google_earth.temporary_files',
+  'internet_explorer.cache',
+  'microsoft_edge.cache',
+  'microsoft_edge.session',
  'opera.cache',
  'opera.session',
+  'palemoon.cache',
+  'palemoon.session_restore',
  'safari.cache',
-  'seamonkey.cache',
+  'waterfox.cache',
+  'waterfox.session_restore',
  # System
  'system.clipboard',
  'system.tmp',
-  'winapp2_windows.jump_lists',
-  'winapp2_windows.ms_search',
+  'windows_defender.temp',
  'windows_explorer.run',
-  'windows_explorer.search_history',
  'windows_explorer.thumbnails',
  )
 POWER_PLANS = {
--- a/scripts/wk/cfg/sources.py
+++ b/scripts/wk/cfg/sources.py
@ -1,4 +1,4 @@
-"""WizardKit: Config - Sources"""
+"""WizardKit: Config - Tool Sources"""
 # pylint: disable=line-too-long
 # vim: sts=2 sw=2 ts=2

@ -15,15 +15,12 @@ SOURCES = {
  'AdwCleaner':         'https://downloads.malwarebytes.com/file/adwcleaner',
  'Autologon32':        'http://live.sysinternals.com/Autologon.exe',
  'Autologon64':        'http://live.sysinternals.com/Autologon64.exe',
-  'Autoruns32':         'http://live.sysinternals.com/Autoruns.exe',
-  'Autoruns64':         'http://live.sysinternals.com/Autoruns64.exe',
  'Firefox32':          'https://download.mozilla.org/?product=firefox-latest-ssl&os=win&lang=en-US',
  'Firefox64':          'https://download.mozilla.org/?product=firefox-latest-ssl&os=win64&lang=en-US',
  'Fluent-Metro':       'https://github.com/bonzibudd/Fluent-Metro/releases/download/v1.5.2/Fluent-Metro_1.5.2.zip',
  'HitmanPro32':        'https://dl.surfright.nl/HitmanPro.exe',
  'HitmanPro64':        'https://dl.surfright.nl/HitmanPro_x64.exe',
  'KVRT':               'https://devbuilds.s.kaspersky-labs.com/devbuilds/KVRT/latest/full/KVRT.exe',
-  'LibreOffice':        'https://download.documentfoundation.org/libreoffice/stable/7.1.2/win/x86_64/LibreOffice_7.1.2_Win_x64.msi',
  'OpenShell':          'https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.160/OpenShellSetup_4_4_160.exe',
  'RKill':              'https://download.bleepingcomputer.com/grinler/rkill.exe',
  'RegDelNull':         'https://live.sysinternals.com/RegDelNull.exe',
@ -40,6 +37,8 @@ SOURCES = {
  # Build Kit
  'AIDA64':             'https://download.aida64.com/aida64engineer633.zip',
  'Adobe Reader DC':    'https://ardownload2.adobe.com/pub/adobe/reader/win/AcrobatDC/2100720091/AcroRdrDC2100720091_en_US.exe',
+  'Autoruns32':         'http://live.sysinternals.com/Autoruns.exe',
+  'Autoruns64':         'http://live.sysinternals.com/Autoruns64.exe',
  'Aria2':              'https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0-win-32bit-build1.zip',
  'BleachBit':          'https://download.bleachbit.org/BleachBit-4.4.0-portable.zip',
  'BlueScreenView32':   'http://www.nirsoft.net/utils/bluescreenview.zip',
@ -49,21 +48,22 @@ SOURCES = {
  'Everything64':       'https://www.voidtools.com/Everything-1.4.1.1009.x64.en-US.zip',
  'FastCopy':           'https://ftp.vector.co.jp/73/10/2323/FastCopy392_installer.exe',
  'FurMark':            'https://geeks3d.com/dl/get/569',
-  'HWiNFO':             'https://files2.majorgeeks.com/1847e0d1291483b8a3c98d75a637ef33bae928f7/systeminfo/hwi_712.zip',
-  'IOBit_Uninstaller':  'https://portableapps.com/redirect/?a=IObitUninstallerPortable&s=s&d=pa&f=IObitUninstallerPortable_7.5.0.7.paf.exe',
+  'HWiNFO':             'https://www.sac.sk/download/utildiag/hwi_712.zip',
+  'IOBit Uninstaller':  'https://portableapps.com/redirect/?a=IObitUninstallerPortable&s=s&d=pa&f=IObitUninstallerPortable_7.5.0.7.paf.exe',
+  'LibreOffice32':      'https://download.documentfoundation.org/libreoffice/stable/7.2.1/win/x86/LibreOffice_7.2.1_Win_x86.msi',
+  'LibreOffice64':      'https://download.documentfoundation.org/libreoffice/stable/7.2.1/win/x86_64/LibreOffice_7.2.1_Win_x64.msi',
  'Macs Fan Control':   'https://www.crystalidea.com/downloads/macsfancontrol_setup.exe',
+  'Neutron':            'http://keir.net/download/neutron.zip',
  'Notepad++':          'https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.1.5/npp.8.1.5.portable.minimalist.7z',
  'PuTTY':              'https://the.earth.li/~sgtatham/putty/latest/w32/putty.zip',
-  'SDIO Themes':        'http://snappy-driver-installer.org/downloads/SDIO_Themes.zip',
  'SDIO Torrent':       'http://snappy-driver-installer.org/downloads/SDIO_Update.torrent',
  'TestDisk':           'https://www.cgsecurity.org/testdisk-7.2-WIP.win.zip',
-  'Winapp2':            'https://github.com/MoscaDotTo/Winapp2/archive/master.zip',
  'WizTree':            'https://wiztreefree.com/files/wiztree_3_39_portable.zip',
  'XMPlay':             'https://support.xmplay.com/files/20/xmplay385.zip?v=47090',
  '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 Innocuous':   'https://support.xmplay.com/files/10/Innocuous%20(v1.4).zip?v=594785',
 }


--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@ -251,8 +251,7 @@ def init_run(options):
      )
  if options['Sync Clock']['Selected']:
    TRY_PRINT.run(
-      'Syncing Clock...', run_tool, 'Neutron', 'Neutron',
-      cbin=True, msg_good='DONE',
+      'Syncing Clock...', run_tool, 'Neutron', 'Neutron', msg_good='DONE',
      )
  if options['Run RKill']['Selected']:
    TRY_PRINT.run('Running RKill...', run_rkill, msg_good='DONE')
@ -911,10 +910,7 @@ def backup_registry():
    raise GenericWarning('Backup already exists.')

  # Backup registry
-  run_tool(
-    'ERUNT', 'ERUNT', backup_path, 'sysreg', 'curuser', 'otherusers',
-    cbin=True,
-    )
+  run_tool('ERUNT', 'ERUNT', backup_path, 'sysreg', 'curuser', 'otherusers')


 def delete_registry_null_keys():
@ -935,7 +931,7 @@ def run_bleachbit(cleaners, preview=True):
    )
  log_path = format_log_path(log_name='BleachBit', timestamp=True, tool=True)
  log_path.parent.mkdir(parents=True, exist_ok=True)
-  proc = run_tool('BleachBit', 'bleachbit_console', *cmd_args, cbin=True)
+  proc = run_tool('BleachBit', 'bleachbit_console', *cmd_args)

  # Save logs
  log_path.write_text(proc.stdout, encoding='utf-8')
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@ -696,7 +696,7 @@ def install_firefox():
 def install_libreoffice(
    register_mso_types=True, use_mso_formats=False, vcredist=True):
  """Install LibreOffice."""
-  installer = find_kit_dir('Installers').joinpath('LibreOffice.msi')
+  installer = find_kit_dir('Installers').joinpath(f'LibreOffice{ARCH}.msi')
  xcu_dir = get_path_obj(f'{os.environ.get("APPDATA")}/LibreOffice/4/user')
  xcu_file = xcu_dir.joinpath('registrymodifications.xcu')

@ -875,7 +875,8 @@ def export_aida64_report():
    '/R', report_path,
    '/CUSTOM', 'basic.rpf',
    '/HTML', '/SILENT', '/SAFEST',
-    cbin=True, cwd=True)
+    cwd=True,
+    )
  if proc.returncode:
    raise GenericError('Error(s) encountered exporting report.')

@ -914,7 +915,7 @@ def open_windows_updates():
 def open_xmplay():
  """Open XMPlay."""
  sleep(2)
-  run_tool('XMPlay', 'XMPlay', 'music.7z', cbin=True, cwd=True, popen=True)
+  run_tool('XMPlay', 'XMPlay', 'music.7z', cwd=True, popen=True)


 if __name__ == '__main__':
--- a/setup/build_windows.cmd
+++ b/setup/build_windows.cmd
@ -25,7 +25,9 @@ set "OUT_DIR=OUT_KIT\%KIT_NAME_FULL%"
 rem Copy base files to a new folder %OUT_DIR%
 mkdir %OUT_DIR% >nul 2>&1
 robocopy /e windows/bin %OUT_DIR%\.bin
-robocopy /e windows/cbin %OUT_DIR%\.cbin
+robocopy /e ..\scripts %OUT_DIR%\.bin\Scripts
+rem robocopy /e windows/cbin %OUT_DIR%\.cbin
+mkdir %OUT_DIR%\.cbin
 copy ..\LICENSE.txt %OUT_DIR%\LICENSE.txt
 copy ..\README.md %OUT_DIR%\README.md
 copy ..\images\ConEmu.png %OUT_DIR%\.bin\ConEmu\
--- a/setup/windows/bin/BleachBit/BleachBit.ini
+++ b/setup/windows/bin/BleachBit/BleachBit.ini
@ -0,0 +1,110 @@
+[Portable]
+
+[bleachbit]
+auto_hide = False
+check_beta = False
+check_online_updates = False
+dark_mode = True
+debug = False
+delete_confirmation = True
+exit_done = False
+remember_geometry = False
+shred = False
+units_iec = True
+window_fullscreen = False
+window_maximized = False
+update_winapp2 = False
+win10_theme = False
+first_start = True
+version = 4.4.0
+
+[preserve_languages]
+en = True
+
+[tree]
+adobe_reader = True
+adobe_reader.cache = True
+adobe_reader.tmp = True
+amule = True
+amule.temp = True
+brave = True
+brave.cache = True
+brave.session = True
+chromium = True
+chromium.cache = True
+chromium.search_engines = True
+chromium.session = True
+discord = True
+discord.cache = True
+firefox = True
+firefox.cache = True
+firefox.session_restore = True
+flash = True
+flash.cache = True
+gimp = True
+gimp.tmp = True
+google_chrome = True
+google_chrome.cache = True
+google_chrome.session = True
+google_earth = True
+google_earth.temporary_files = True
+gpodder = True
+gpodder.cache = True
+hippo_opensim_viewer = True
+hippo_opensim_viewer.cache = True
+internet_explorer = True
+internet_explorer.cache = True
+java = True
+java.cache = True
+microsoft_edge = True
+microsoft_edge.cache = True
+microsoft_edge.session = True
+miro = True
+miro.cache = True
+openofficeorg = True
+openofficeorg.cache = True
+opera = True
+opera.cache = True
+opera.session = True
+palemoon = True
+palemoon.cache = True
+palemoon.session_restore = True
+pidgin = True
+pidgin.cache = True
+safari = True
+safari.cache = True
+seamonkey = True
+seamonkey.cache = True
+secondlife_viewer = True
+secondlife_viewer.Cache = True
+silverlight = True
+silverlight.temp = True
+slack = True
+slack.cache = True
+smartftp = True
+smartftp.cache = True
+system = True
+system.clipboard = True
+system.tmp = True
+thunderbird = True
+thunderbird.cache = True
+vuze = True
+vuze.cache = True
+vuze.temp = True
+waterfox = True
+waterfox.cache = True
+waterfox.session_restore = True
+windows_defender = True
+windows_defender.temp = True
+windows_explorer = True
+windows_explorer.run = True
+windows_explorer.thumbnails = True
+windows_media_player = True
+windows_media_player.cache = True
+winrar = True
+winrar.temp = True
+yahoo_messenger = True
+yahoo_messenger.cache = True
+zoom = True
+zoom.cache = True
+
--- a/setup/windows/bin/Everything/Everything.ini
+++ b/setup/windows/bin/Everything/Everything.ini
@ -0,0 +1,6 @@
+[Everything]
+run_as_admin=1
+run_in_background=0
+show_in_taskbar=1
+show_tray_icon=1
+
--- a/setup/windows/bin/Neutron/Neutron.ini
+++ b/setup/windows/bin/Neutron/Neutron.ini
@ -0,0 +1,27 @@
+[Options]
+AutoSync=1
+AutoExit=1
+Retry=1
+Server=0
+
+[Servers]
+0="time-a.nist.gov"
+1="time-a.timefreq.bldrdoc.gov"
+2="time-b.nist.gov"
+3="time-b.timefreq.bldrdoc.gov"
+4="time-c.timefreq.bldrdoc.gov"
+5="us.pool.ntp.org"
+6="1.us.pool.ntp.org"
+7="2.us.pool.ntp.org"
+8="3.us.pool.ntp.org"
+9="pubts1-sj.witime.net"
+10="pubts2-sj.witime.net"
+11="rolex.usg.edu"
+12="timekeeper.isi.edu"
+13="nist1.symmetricom.com"
+14="clock.via.net"
+15="nist1.aol-ca.truetime.com"
+16="nist.expertsmi.com"
+17="nist1-dc.WiTime.net"
+18="nist1-sj.WiTime.net"
+19="utcnist.colorado.edu"
--- a/setup/windows/bin/NotepadPlusPlus/config.xml
+++ b/setup/windows/bin/NotepadPlusPlus/config.xml
@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<NotepadPlus>
+    <FindHistory nbMaxFindHistoryPath="10" nbMaxFindHistoryFilter="10" nbMaxFindHistoryFind="10" nbMaxFindHistoryReplace="10" matchWord="no" matchCase="no" wrap="yes" directionDown="yes" fifRecuisive="yes" fifInHiddenFolder="no" fifProjectPanel1="no" fifProjectPanel2="no" fifProjectPanel3="no" fifFilterFollowsDoc="no" fifFolderFollowsDoc="no" searchMode="0" transparencyMode="1" transparency="150" dotMatchesNewline="no" isSearch2ButtonsMode="no" regexBackward4PowerUser="no" />
+    <History nbMaxFile="10" inSubMenu="no" customLength="-1" />
+    <ProjectPanels>
+        <ProjectPanel id="0" workSpaceFile="" />
+        <ProjectPanel id="1" workSpaceFile="" />
+        <ProjectPanel id="2" workSpaceFile="" />
+    </ProjectPanels>
+    <GUIConfigs>
+        <GUIConfig name="ToolBar" visible="no">standard</GUIConfig>
+        <GUIConfig name="StatusBar">show</GUIConfig>
+        <GUIConfig name="TabBar" dragAndDrop="yes" drawTopBar="yes" drawInactiveTab="yes" reduce="yes" closeButton="yes" doubleClick2Close="no" vertical="no" multiLine="no" hide="no" quitOnEmpty="yes" iconSetNumber="1" />
+        <GUIConfig name="ScintillaViewsSplitter">vertical</GUIConfig>
+        <GUIConfig name="UserDefineDlg" position="undocked">hide</GUIConfig>
+        <GUIConfig name="TabSetting" replaceBySpace="yes" size="2" />
+        <GUIConfig name="FindWindowPosition" left="0" top="0" right="0" bottom="0" />
+        <GUIConfig name="FinderConfig" wrappedLines="no" purgeBeforeEverySearch="no" />
+        <GUIConfig name="noUpdate" intervalDays="15" nextUpdateDate="20080426">no</GUIConfig>
+        <GUIConfig name="Auto-detection">yes</GUIConfig>
+        <GUIConfig name="CheckHistoryFiles">no</GUIConfig>
+        <GUIConfig name="TrayIcon">no</GUIConfig>
+        <GUIConfig name="MaitainIndent">yes</GUIConfig>
+        <GUIConfig name="TagsMatchHighLight" TagAttrHighLight="yes" HighLightNonHtmlZone="no">yes</GUIConfig>
+        <GUIConfig name="RememberLastSession">no</GUIConfig>
+        <GUIConfig name="DetectEncoding">yes</GUIConfig>
+        <GUIConfig name="SaveAllConfirm">yes</GUIConfig>
+        <GUIConfig name="NewDocDefaultSettings" format="0" encoding="4" lang="0" codepage="-1" openAnsiAsUTF8="yes" />
+        <GUIConfig name="langsExcluded" gr0="0" gr1="0" gr2="0" gr3="0" gr4="0" gr5="0" gr6="0" gr7="0" gr8="0" gr9="0" gr10="0" gr11="0" gr12="0" langMenuCompact="yes" />
+        <GUIConfig name="Print" lineNumber="yes" printOption="3" headerLeft="" headerMiddle="" headerRight="" footerLeft="" footerMiddle="" footerRight="" headerFontName="" headerFontStyle="0" headerFontSize="0" footerFontName="" footerFontStyle="0" footerFontSize="0" margeLeft="0" margeRight="0" margeTop="0" margeBottom="0" />
+        <GUIConfig name="Backup" action="0" useCustumDir="no" dir="" isSnapshotMode="no" snapshotBackupTiming="7000" />
+        <GUIConfig name="TaskList">no</GUIConfig>
+        <GUIConfig name="MRU">no</GUIConfig>
+        <GUIConfig name="URL">2</GUIConfig>
+        <GUIConfig name="uriCustomizedSchemes">svn:// cvs:// git:// imap:// irc:// irc6:// ircs:// ldap:// ldaps:// news: telnet:// gopher:// ssh:// sftp:// smb:// skype: snmp:// spotify: steam:// sms: slack:// chrome:// bitcoin:</GUIConfig>
+        <GUIConfig name="globalOverride" fg="no" bg="no" font="no" fontSize="no" bold="no" italic="no" underline="no" />
+        <GUIConfig name="auto-completion" autoCAction="3" triggerFromNbChar="1" autoCIgnoreNumbers="yes" funcParams="yes" />
+        <GUIConfig name="auto-insert" parentheses="no" brackets="no" curlyBrackets="no" quotes="no" doubleQuotes="no" htmlXmlTag="no" />
+        <GUIConfig name="sessionExt"></GUIConfig>
+        <GUIConfig name="workspaceExt"></GUIConfig>
+        <GUIConfig name="MenuBar">show</GUIConfig>
+        <GUIConfig name="Caret" width="1" blinkRate="600" />
+        <GUIConfig name="ScintillaGlobalSettings" enableMultiSelection="no" />
+        <GUIConfig name="openSaveDir" value="0" defaultDirPath="" />
+        <GUIConfig name="titleBar" short="no" />
+        <GUIConfig name="insertDateTime" customizedFormat="yyyy-MM-dd HH:mm:ss" reverseDefaultOrder="no" />
+        <GUIConfig name="wordCharList" useDefault="yes" charsAdded="" />
+        <GUIConfig name="delimiterSelection" leftmostDelimiter="40" rightmostDelimiter="41" delimiterSelectionOnEntireDocument="no" />
+        <GUIConfig name="multiInst" setting="0" />
+        <GUIConfig name="MISC" fileSwitcherWithoutExtColumn="yes" fileSwitcherExtWidth="50" fileSwitcherWithoutPathColumn="yes" fileSwitcherPathWidth="50" backSlashIsEscapeCharacterForSql="yes" writeTechnologyEngine="0" isFolderDroppedOpenFiles="no" docPeekOnTab="no" docPeekOnMap="no" saveDlgExtFilterToAllTypes="no" muteSounds="no" />
+        <GUIConfig name="Searching" monospacedFontFindDlg="no" stopFillingFindField="no" findDlgAlwaysVisible="no" confirmReplaceInAllOpenDocs="yes" replaceStopsWithoutFindingNext="no" />
+        <GUIConfig name="searchEngine" searchEngineChoice="2" searchEngineCustom="" />
+        <GUIConfig name="MarkAll" matchCase="no" wholeWordOnly="yes" />
+        <GUIConfig name="SmartHighLight" matchCase="no" wholeWordOnly="yes" useFindSettings="no" onAnotherView="no">yes</GUIConfig>
+        <GUIConfig name="DarkMode" enable="no" colorTone="0" customColorTop="2105376" customColorMenuHotTrack="4210752" customColorActive="4210752" customColorMain="2105376" customColorError="176" customColorText="14737632" customColorDarkText="12632256" customColorDisabledText="8421504" customColorEdge="6579300" />
+        <GUIConfig name="ScintillaPrimaryView" lineNumberMargin="show" lineNumberDynamicWidth="yes" bookMarkMargin="show" indentGuideLine="show" folderMarkStyle="box" lineWrapMethod="aligned" currentLineHilitingShow="show" scrollBeyondLastLine="yes" rightClickKeepsSelection="no" disableAdvancedScrolling="no" wrapSymbolShow="hide" Wrap="no" borderEdge="yes" isEdgeBgMode="no" edgeMultiColumnPos="" zoom="0" zoom2="0" whiteSpaceShow="hide" eolShow="hide" borderWidth="2" smoothFont="no" paddingLeft="0" paddingRight="0" distractionFreeDivPart="4" />
+        <GUIConfig name="DockingManager" leftWidth="200" rightWidth="200" topHeight="200" bottomHeight="200">
+            <ActiveTabs cont="0" activeTab="-1" />
+            <ActiveTabs cont="1" activeTab="-1" />
+            <ActiveTabs cont="2" activeTab="-1" />
+            <ActiveTabs cont="3" activeTab="-1" />
+        </GUIConfig>
+    </GUIConfigs>
+</NotepadPlus>
+
--- a/setup/windows/bin/SDIO/sdi.cfg
+++ b/setup/windows/bin/SDIO/sdi.cfg
@ -9,7 +9,7 @@
 "-finish_upd_cmd:"

 "-lang:English"
-"-theme:YetAnotherSDI"
+"-theme:Coax"
 -hintdelay:250
 -license:1
 -scale:256
@ -21,4 +21,4 @@
 -uplimit:1
 -connections:0

-expertmode -norestorepnt -showdrpnames2 -onlyupdates -preservecfg -novirusalerts
+-expertmode -novirusalerts -onlyupdates -preservecfg -showdrpnames2
--- a/setup/windows/bin/XMPlay/xmplay.ini
+++ b/setup/windows/bin/XMPlay/xmplay.ini
@ -0,0 +1,154 @@
+[XMPlay]
+MixMode=56
+AutoName=0
+WriteSource=0
+WriteSourceRes=1
+WriteSepInst=0
+WriteNoExt=0
+WriteTitle=0
+AutoAmp=1
+RGain=0
+RGainAmp=0
+RGainLimit=0
+Time=1
+ShowTenths=1
+TimeHours=1
+Volume=90
+LogVolume=1
+Balance=50
+Amplify=0
+AmpReset=1
+PanSep=50
+Loop=0
+LoopLimit=1
+LoopLimitTime=0
+DecayEnd=5
+LoopList=1
+ListTotal=0
+UnloadLast=0
+AutoAdvance=1
+ListSort=0
+FollowList=0
+AutoRemove=0
+Trim=0
+NoMute=0
+Fade=0
+NetBuffer=5
+NetPreBuffer=3
+NetTimeout=10
+RestrictRate=0
+AutoReconnect=0
+Proxy=1
+ProxyConfig=
+Dither=0
+CrossFadeLen=0
+CrossFadeChange=0
+MODmode=0
+MODtimeinfo=1
+MODxfx=0
+MODloop=1
+MODloopreset=0
+MODvirtchans=256
+Mini=0
+InTray=0
+OnTop=259
+MultiInstance=0
+SaveClosePos=0
+Bubbles=3
+FadeBubbles=1
+InfoMove=0
+WindowLock=0
+PanelPos=0
+ListFilenames=0
+ListQueue=0
+ListClick=1793
+AutoSave=0
+ListCols=-2146959349
+Verify=1
+NoDuplicates=0
+ScanHTML=1
+ArchiveLevel=2
+SearchDrives=0
+Random=3
+DeadStop=0
+Queue=0
+QueueStop=0
+QueuePlay=0
+QueueToggle=1
+SubDir=0
+TitleNoExt=0
+TitleSpaces=0
+TitleSubsongs=0
+TitleCUE=1
+TitleScroll=1
+TitleTray=3
+Clipboard=0
+AutoSet=0
+InfoResize=1
+InfoResizeLimit=500
+InfoTextSize=0
+InfoWidth=80
+InfoList=15
+InfoPaty=234
+InfoPatmc=20
+RestrictVis=0
+RestrictVisW=290
+RestrictVisH=218
+SpectrumSpeed=1
+VisSync=0
+VisTextSize=0
+VisRefresh=40
+HelpTextSize=0
+PanelOpen=0
+InfoPos=B0010000190100006305000009030000
+VisSize=22010000DA000000
+FindSize=0000000000000000C8000000
+LibWidth=600
+LibSort=2
+LibMode=0
+LibCols=0000000000000000010000000000E04102000000000050410300000000005041040000000000E040050000000000E04006000000000040410700000000000000080000000000C04009000000000000000A0000000000E0400B0000000000E0400C000000000000000D000000000000000E000000000000000F00000000000000
+LibParseList=0
+LibFilePath=0
+LibAbrSize=1
+LibInlineText=1
+LibInfoTags=1
+LibKeepOverridden=1
+LibPlayTime=0
+LibAvgCount=0
+LibPlayReplace=0
+UpdateCheck=0
+UpdateTime=0
+IgnoreTypes=avi mpg mpeg
+FilePath=
+WritePath=X:\
+TitleForm=%?2{%2 - }%?1{%1|%0}%?3{  [%3]}
+TitleFormList=
+Find=
+FindPlay=0
+FindAutoList=0
+FindIn=3
+NoCheckDead=0
+CurTrack=64
+Info=197635
+Skin=plugins\Innocuous (Dark Skies - Purple-80) [L1]
+External=464C414300666C6163202D54205449544C453D2531202D54204152544953543D2532202D5420414C42554D3D2533202D5420444154453D2534202D5420545241434B4E554D4245523D2535202D542047454E52453D2536202D5420434F4D4D454E543D2537202D6F20256F202D00666C616300404C414D45006C616D65202D2D616C742D707265736574207374616E64617264202D2D69676E6F72652D7461672D6572726F7273202D2D7474202531202D2D7461202532202D2D746C202533202D2D7479202534202D2D746E202535202D2D7467202536202D2D7463202537202D20256F006D703300864F4747454E43006F6767656E63202D74202531202D61202532202D6C202533202D64202534202D4E202535202D47202536202D6320636F6D6D656E743D2537202D6F20256F202D006F676700C800
+DSP=FF000200100000000000000040410000004100008041000100280000000000000000000000000000000000000000000000000000000000000000000000000000000000
+PluginTypes=
+Shortcuts=060000004F0018020C0000004F04180250000000500019025100000050041902500000001300450251000000130445025200000027004D035300000025004B0354000000240047035600000027044D035500000025044B03810000002100490380000000220051038200000023004F03700100002D005203710100002D045203900100005A022C027B0100005100100277010000BF0435025001000026004803580100002604480351010000280050035901000028045003540100002602480354010000280250035501000041021E02560100004902170260010000460221026401000046012102610100004600210262010000460421026301000046062102740100000D001C02750100002000390276010000BF0035027E010000BF023502720100002E005303730100002E045303000200006B004E02010200006D004A02070200006F003503080200006A003702010000004D003202020000004E003102030000004E0431020A00000073013E020B00000073053E0205000000780043020101000070003B020201000071003C020301000072003D020401000073003E020501000074003F0260020000750040020801000043022E02060100006800480207010000620050022101000064004B022201000066004D022301000065004C0224010000670047022501000069004902040000007B005802
+DeviceMode=0000000080BB000002000000020000008A0200000000000003000000
+Track1=0
+CrossFade=1
+MODadlib=0
+WindowX=311
+WindowY=262
+ListSaveOpt=2
+TagCase=1
+UpdateStuff=0
+FindSelect=1
+Big=0
+BringToFore=1
+NoHistory=1
+NoSaveList=1
+NoScanList=1
+NoUserConfig=1
+
--- a/setup/windows/build.ps1
+++ b/setup/windows/build.ps1
@ -189,6 +189,6 @@ if ($MyInvocation.InvocationName -ne ".") {

  ## Done ##
  Pop-Location
-  $ArgumentList = @("-run", "$Bin\Python\x32\python.exe", "$Bin\Scripts\update_kit.py", "-new_console:n")
+  $ArgumentList = @("-run", "$Bin\Python\x32\python.exe", "$Bin\Scripts\build_kit_windows.py", "-new_console:n")
  Start-Process -FilePath "$Bin\ConEmu\ConEmu.exe" -ArgumentList $ArgumentList -verb RunAs
 }