diff --git a/scripts/wk/cfg/launchers.py b/scripts/wk/cfg/launchers.py
index 9e98d5fb..58e26187 100644
--- a/scripts/wk/cfg/launchers.py
+++ b/scripts/wk/cfg/launchers.py
@@ -4,42 +4,100 @@
 
 LAUNCHERS = {
   r'': { # Root Dir
-    'Auto Repairs': {
+    '0) Export BitLocker': {
+      'L_TYPE': 'PyScript',
+      'L_PATH': 'Scripts',
+      'L_ITEM': 'export_bitlocker.py',
+      'L_ELEV': 'True',
+      },
+    '1) Auto Repairs': {
       'L_TYPE': 'PyScript',
       'L_PATH': 'Scripts',
       'L_ITEM': 'auto_repairs.py',
       'L_ELEV': 'True',
       },
-    'Auto Setup': {
+    '2) Windows Updates': {
+      'L_TYPE': 'Executable',
+      'L_PATH': '.',
+      'L_ITEM': 'control',
+      'L_ARGS': 'update',
+      'L_ELEV': 'True',
+      },
+    '3) Snappy Driver Installer Origin': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'SDIO',
+      'L_ITEM': 'SDIO.exe',
+      'L_ARGS': r'-log_dir "%client_dir%\Logs\Tools"',
+      },
+    '4) Auto Setup': {
       'L_TYPE': 'PyScript',
       'L_PATH': 'Scripts',
       'L_ITEM': 'auto_setup.py',
       'L_ELEV': 'True',
       },
     },
-  r'Data Recovery': {
-    'PhotoRec (CLI)': {
+  r'Tools': {
+    'AIDA64': {
       'L_TYPE': 'Executable',
-      'L_PATH': 'TestDisk',
-      'L_ITEM': 'photorec_win.exe',
-      'L_ELEV': 'True',
-      'L__CLI': 'True',
+      'L_PATH': 'AIDA64',
+      'L_ITEM': 'aida64.exe',
       },
-    'PhotoRec': {
+    'Autoruns (with VirusTotal Scan)': {
       'L_TYPE': 'Executable',
-      'L_PATH': 'TestDisk',
-      'L_ITEM': 'qphotorec_win.exe',
+      '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',
+      },
+    'ConEmu (as ADMIN)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ConEmu',
+      'L_ITEM': 'ConEmu.exe',
       'L_ELEV': 'True',
       },
-    'TestDisk': {
+    'ConEmu': {
       'L_TYPE': 'Executable',
-      'L_PATH': 'TestDisk',
-      'L_ITEM': 'testdisk_win.exe',
-      'L_ELEV': 'True',
-      'L__CLI': 'True',
+      'L_PATH': 'ConEmu',
+      'L_ITEM': 'ConEmu.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',
+        ],
+      },
+    'Everything': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'Everything',
+      'L_ITEM': 'Everything.exe',
+      'L_ARGS': '-nodb',
+      'L_ELEV': 'True',
       },
-    },
-  r'Data Transfers': {
     'FastCopy (as ADMIN)': {
       'L_TYPE': 'Executable',
       'L_PATH': 'FastCopy',
@@ -137,51 +195,6 @@ LAUNCHERS = {
         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',
-        ],
-      },
     'FurMark': {
       'L_TYPE': 'Executable',
       'L_PATH': 'FurMark',
@@ -211,31 +224,6 @@ LAUNCHERS = {
         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',
@@ -246,6 +234,17 @@ LAUNCHERS = {
       'L_PATH': 'PuTTY',
       'L_ITEM': 'PUTTY.EXE',
       },
+    'Snappy Driver Installer Origin': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'SDIO',
+      'L_ITEM': 'SDIO.exe',
+      },
+    'UninstallView': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'UninstallView',
+      'L_ITEM': 'UninstallView.exe',
+      'L_ELEV': 'True',
+      },
     'WizardKit Debug Console': {
       'L_TYPE': 'Executable',
       'L_PATH': 'ConEmu',
@@ -270,13 +269,6 @@ LAUNCHERS = {
       'L_ARGS': r'"%bin%\XMPlay\music.7z"',
       },
     },
-  r'Uninstallers': {
-    'IObit Uninstaller': {
-      'L_TYPE': 'Executable',
-      'L_PATH': 'IObitUninstallerPortable',
-      'L_ITEM': 'IObitUninstallerPortable.exe',
-      },
-    },
   }