From b9202c0ba277c8f78be9ab1484da0e7fd70f24d8 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 23 Oct 2022 16:48:03 -0700
Subject: [PATCH 1/3] Fix Auto Repairs presets

---
 scripts/wk/repairs/win.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index 01ffd56f..a965a511 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -377,6 +377,9 @@ def load_preset(menus, presets, enable_menu_exit=True):
   for group, menu in menus.items():
     group_enabled = group in preset
     for name in menu.options:
+      name_str = strip_colors(name)
+        if name_str == 'Reboot (Forced)':
+          name_str = 'Reboot'
       value = group_enabled and name in preset[group]
       menu.options[name]['Selected'] = value
 

From d1ff7a391b6706aa7dac9de8dfc0073c7937de0f Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 23 Oct 2022 16:49:42 -0700
Subject: [PATCH 2/3] Fix typo

---
 scripts/wk/repairs/win.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index a965a511..b9942dbe 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -380,7 +380,7 @@ def load_preset(menus, presets, enable_menu_exit=True):
       name_str = strip_colors(name)
         if name_str == 'Reboot (Forced)':
           name_str = 'Reboot'
-      value = group_enabled and name in preset[group]
+      value = group_enabled and name_str in preset[group]
       menu.options[name]['Selected'] = value
 
   # Re-enable Main Menu action if disabled

From 94c1f282f59444027547197fad350e322a1647b9 Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sun, 23 Oct 2022 17:09:08 -0700
Subject: [PATCH 3/3] Fix reboot entries in Auto Repairs presets

---
 scripts/auto_repairs.py   | 15 +++------------
 scripts/wk/repairs/win.py |  2 --
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/scripts/auto_repairs.py b/scripts/auto_repairs.py
index 2d033533..1435003d 100644
--- a/scripts/auto_repairs.py
+++ b/scripts/auto_repairs.py
@@ -10,21 +10,12 @@ import wk # pylint: disable=wrong-import-position
 
 
 # Classes
+REBOOT_STR = wk.std.color_string('Reboot', 'YELLOW')
 class MenuEntry():
   # pylint: disable=too-few-public-methods
   """Simple class to allow cleaner code below."""
   def __init__(self, name, function=None, selected=True, **kwargs):
     self.name = name
-
-    # Color reboot entries
-    if name == 'Reboot':
-      self.name = wk.std.color_string(
-        ['Reboot', ' ', '(Forced)'],
-        ['YELLOW', None, 'ORANGE'],
-        sep='',
-        )
-
-    # Set details
     self.details = {
       'Function': function,
       'Selected': selected,
@@ -49,7 +40,7 @@ BASE_MENUS = {
     'Windows Repairs': (
       MenuEntry('Disable Windows Updates',  'auto_windows_updates_disable'),
       MenuEntry('Reset Windows Updates',    'auto_windows_updates_reset'),
-      MenuEntry('Reboot',                   'auto_reboot'),
+      MenuEntry(REBOOT_STR,                 'auto_reboot'),
       MenuEntry('CHKDSK',                   'auto_chkdsk'),
       MenuEntry('DISM RestoreHealth',       'auto_dism'),
       MenuEntry('SFC Scan',                 'auto_sfc'),
@@ -65,7 +56,7 @@ BASE_MENUS = {
       MenuEntry('KVRT',                     'auto_kvrt'),
       MenuEntry('Windows Defender',         'auto_microsoft_defender'),
       MenuEntry('Remove Custom Power Plan', 'auto_remove_power_plan'),
-      MenuEntry('Reboot',                   'auto_reboot'),
+      MenuEntry(REBOOT_STR,                 'auto_reboot'),
       ),
     'Manual Steps': (
       MenuEntry('AdwCleaner',               'auto_adwcleaner'),
diff --git a/scripts/wk/repairs/win.py b/scripts/wk/repairs/win.py
index b9942dbe..4c090b06 100644
--- a/scripts/wk/repairs/win.py
+++ b/scripts/wk/repairs/win.py
@@ -378,8 +378,6 @@ def load_preset(menus, presets, enable_menu_exit=True):
     group_enabled = group in preset
     for name in menu.options:
       name_str = strip_colors(name)
-        if name_str == 'Reboot (Forced)':
-          name_str = 'Reboot'
       value = group_enabled and name_str in preset[group]
       menu.options[name]['Selected'] = value