From 8c03530ec5809f82c7029fe90251e9828f6b8f8e Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Wed, 19 Oct 2022 23:21:23 -0700
Subject: [PATCH 1/3] Update details before confirming selection

---
 scripts/wk/clone/ddrescue.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/wk/clone/ddrescue.py b/scripts/wk/clone/ddrescue.py
index 8f2f263b..ae5d0220 100644
--- a/scripts/wk/clone/ddrescue.py
+++ b/scripts/wk/clone/ddrescue.py
@@ -740,6 +740,10 @@ class State():
         self.destination = select_path('Destination')
     self.update_top_panes()
 
+    # Update details
+    self.source.update_details(skip_children=False)
+    self.destination.update_details(skip_children=False)
+
     # Confirmation #1
     self.confirm_selections(
       prompt='Are these selections correct?',

From df6d3d4a24e64459fa7c7c66cc97a7cb3808013e Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Wed, 19 Oct 2022 23:30:20 -0700
Subject: [PATCH 2/3] Fix Auto Setup selections under Windows 11

---
 scripts/wk/setup/win.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index 40ebb512..2fb76dd7 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -163,11 +163,6 @@ def build_menus(base_menus, title, presets):
   MENU_PRESETS.add_action('Quit')
   MENU_PRESETS.update()
 
-  # Disable entries incompatible with Windows 11
-  if OS_VERSION == 11:
-    for group_name, entry_name in DISABLED_ENTRIES_WINDOWS_11.items():
-      menus[group_name].options[entry_name]['Disabled'] = True
-
   # Done
   return menus
 
@@ -230,6 +225,12 @@ def load_preset(menus, presets, title, enable_menu_exit=True):
   # Re-enable Main Menu action if disabled
   MENU_PRESETS.actions['Main Menu'].update({'Disabled':False, 'Hidden':False})
 
+  # Disable entries incompatible with Windows 11
+  if OS_VERSION == 11:
+    for group_name, entry_name in DISABLED_ENTRIES_WINDOWS_11.items():
+      menus[group_name].options[entry_name]['Disabled'] = True
+      menus[group_name].options[entry_name]['Selected'] = False
+
 
 def run_auto_setup(base_menus, presets):
   """Run Auto Setup."""

From eab7a03f70ca8b026a789540585116fcddc0b602 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Wed, 19 Oct 2022 23:34:51 -0700
Subject: [PATCH 3/3] Update launchers.py

---
 scripts/wk/cfg/launchers.py | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/scripts/wk/cfg/launchers.py b/scripts/wk/cfg/launchers.py
index 58e26187..a03c7ef9 100644
--- a/scripts/wk/cfg/launchers.py
+++ b/scripts/wk/cfg/launchers.py
@@ -18,8 +18,8 @@ LAUNCHERS = {
       },
     '2) Windows Updates': {
       'L_TYPE': 'Executable',
-      'L_PATH': '.',
-      'L_ITEM': 'control',
+      'L_PATH': r'%SystemRoot%\System32',
+      'L_ITEM': 'control.exe',
       'L_ARGS': 'update',
       'L_ELEV': 'True',
       },
@@ -81,6 +81,24 @@ LAUNCHERS = {
       'L_PATH': 'ConEmu',
       'L_ITEM': 'ConEmu.exe',
       },
+    'Debug Console (Command Prompt)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ConEmu',
+      'L_ITEM': 'ConEmu.exe',
+      'L_ARGS': r'-Dir %bin%\Scripts',
+      'L_ELEV': 'True',
+      },
+    'Debug Console (Python)': {
+      'L_TYPE': 'Executable',
+      'L_PATH': 'ConEmu',
+      'L_ITEM': 'ConEmu.exe',
+      'L_ARGS': r'-Dir %bin%\Scripts -Run ..\Python\x%ARCH%\python.exe -i embedded_python_env.py',
+      'L_ELEV': 'True',
+      'Extra Code': [
+        'set ARCH=32',
+        'if /i "%PROCESSOR_ARCHITECTURE%" == "AMD64" set "ARCH=64"',
+        ],
+      },
     'ERUNT': {
       'L_TYPE': 'Executable',
       'L_PATH': 'erunt',
@@ -245,17 +263,6 @@ LAUNCHERS = {
       'L_ITEM': 'UninstallView.exe',
       'L_ELEV': 'True',
       },
-    'WizardKit Debug Console': {
-      'L_TYPE': 'Executable',
-      'L_PATH': 'ConEmu',
-      'L_ITEM': 'ConEmu.exe',
-      'L_ARGS': r'-Dir %bin%\Scripts -Run ..\Python\x%ARCH%\python.exe -i embedded_python_env.py',
-      'L_ELEV': 'True',
-      'Extra Code': [
-        'set ARCH=32',
-        'if /i "%PROCESSOR_ARCHITECTURE%" == "AMD64" set "ARCH=64"',
-        ],
-      },
     'WizTree': {
       'L_TYPE': 'Executable',
       'L_PATH': 'WizTree',