diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py
index 89285823..925c0a94 100644
--- a/.bin/Scripts/system_setup.py
+++ b/.bin/Scripts/system_setup.py
@@ -51,7 +51,7 @@ SETUP_ACTIONS = OrderedDict({
   'LibreOffice':            {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': install_libreoffice,
                              'If answer': 'LibreOffice', 'KWArgs': {'quickstart': False, 'register_mso_types': True, 'use_mso_formats': True, 'vcredist': False},
                              },
-  'Ninite bundle':          {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': install_ninite_bundle, 'KWArgs': {'cs': 'Started'},},
+  'Ninite bundle':          {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': install_ninite_bundle, 'KWArgs': {'cs': 'STARTED'},},
 
   # Browsers
   'Scanning for browsers':  {'Info': True},
@@ -68,7 +68,7 @@ SETUP_ACTIONS = OrderedDict({
   # Configure software'
   'Configuring Programs':   {'Info': True},
   'Browser add-ons':        {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': install_adblock, 'Just run': True,
-                             'KWArgs': {'cs': 'Started'}, 'Pause': 'Please enable uBlock Origin for all browsers',
+                             'KWArgs': {'cs': 'STARTED'}, 'Pause': 'Please enable uBlock Origin for all browsers',
                              },
   'Classic Start':          {'New': True,   'Fab': True,  'Cur': False, 'HW': False, 'Function': config_classicstart, 'Win10 only': True,},
   'Explorer (user)':        {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': config_explorer_user, 'Win10 only': True,},
@@ -113,14 +113,14 @@ SETUP_ACTIONS = OrderedDict({
 
   # Open things
   'Opening Programs':       {'Info': True},
-  'Device Manager':         {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': open_device_manager, 'KWArgs': {'cs': 'Started'},},
-  'HWiNFO sensors':         {'New': True,   'Fab': True,  'Cur': True,  'HW': True,  'Function': run_hwinfo_sensors, 'KWArgs': {'cs': 'Started'},},
-  'Snappy':                 {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': open_snappy_driver_origin, 'KWArgs': {'cs': 'Started'},},
-  'Speed test':             {'New': True,   'Fab': True,  'Cur': True,  'HW': True,  'Function': open_speedtest, 'KWArgs': {'cs': 'Started'},},
-  'Windows Updates':        {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': open_windows_updates, 'KWArgs': {'cs': 'Started'},},
-  'Windows Activation':     {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': open_windows_activation, 'If not activated': True, 'KWArgs': {'cs': 'Started'},},
+  'Device Manager':         {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': open_device_manager, 'KWArgs': {'cs': 'STARTED'},},
+  'HWiNFO sensors':         {'New': True,   'Fab': True,  'Cur': True,  'HW': True,  'Function': run_hwinfo_sensors, 'KWArgs': {'cs': 'STARTED'},},
+  'Snappy':                 {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': open_snappy_driver_origin, 'KWArgs': {'cs': 'STARTED'},},
+  'Speed test':             {'New': True,   'Fab': True,  'Cur': True,  'HW': True,  'Function': open_speedtest, 'KWArgs': {'cs': 'STARTED'},},
+  'Windows Updates':        {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': open_windows_updates, 'KWArgs': {'cs': 'STARTED'},},
+  'Windows Activation':     {'New': True,   'Fab': True,  'Cur': True,  'HW': False, 'Function': open_windows_activation, 'If not activated': True, 'KWArgs': {'cs': 'STARTED'},},
   'Sleep':                  {'New': True,   'Fab': True,  'Cur': True,  'HW': True,  'Function': sleep, 'Just run': True, 'KWArgs': {'seconds': 3},},
-  'XMPlay':                 {'New': True,   'Fab': True,  'Cur': True,  'HW': True,  'Function': run_xmplay, 'KWArgs': {'cs': 'Started'},},
+  'XMPlay':                 {'New': True,   'Fab': True,  'Cur': True,  'HW': True,  'Function': run_xmplay, 'KWArgs': {'cs': 'STARTED'},},
   })
 SETUP_ACTION_KEYS = (
   'Function',