From b9e99ac4d82c5a700927799567b95ab70b372cfd Mon Sep 17 00:00:00 2001
From: 2Shirt <2xShirt@gmail.com>
Date: Sat, 16 Nov 2019 14:40:23 -0700
Subject: [PATCH] Include classic start in base group

---
 .bin/Scripts/functions/setup.py  | 5 ++++-
 .bin/Scripts/settings/sources.py | 3 ++-
 .bin/Scripts/system_setup.py     | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py
index 570b59ba..eb94f9aa 100644
--- a/.bin/Scripts/functions/setup.py
+++ b/.bin/Scripts/functions/setup.py
@@ -362,7 +362,10 @@ def install_ninite_bundle(
   # Main selections
   main_selections = []
   if base:
-    main_selections.append('base')
+    if global_vars['OS']['Version'] in ('8', '8.1', '10'):
+      main_selections.append('base')
+    else:
+      main_selections.append('base7')
   if standard:
     if global_vars['OS']['Version'] in ('8', '8.1', '10'):
       main_selections.append('standard')
diff --git a/.bin/Scripts/settings/sources.py b/.bin/Scripts/settings/sources.py
index 881a9ed1..72e3e358 100644
--- a/.bin/Scripts/settings/sources.py
+++ b/.bin/Scripts/settings/sources.py
@@ -85,7 +85,8 @@ NINITE_REGEX = {
   }
 NINITE_SOURCES = {
   'Bundles': {
-    'base.exe': '.net4.8-7zip-vlc',
+    'base.exe': '.net4.8-7zip-classicstart-vlc',
+    'base7.exe': '.net4.8-7zip-vlc',
     'base-standard.exe': '.net4.8-7zip-chrome-classicstart-firefox-sumatrapdf-vlc',
     'base-standard7.exe': '.net4.8-7zip-chrome-firefox-sumatrapdf-vlc',
     'standard.exe': 'chrome-classicstart-firefox-sumatrapdf',
diff --git a/.bin/Scripts/system_setup.py b/.bin/Scripts/system_setup.py
index faa61cf8..4c9c592a 100644
--- a/.bin/Scripts/system_setup.py
+++ b/.bin/Scripts/system_setup.py
@@ -62,7 +62,7 @@ SETUP_ACTIONS = OrderedDict({
 
   # Install extensions
   'Installing Extensions':  {'Info': True},
-  'Classic Shell skin':     {'New': True,   'Dat': True,  'Cur': False, 'HW': False, 'Verf': False, 'Function': install_classicstart_skin, 'Win10 only': True,},
+  'Classic Shell skin':     {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': install_classicstart_skin, 'Win10 only': True,},
   'Chrome extensions':      {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': install_chrome_extensions,},
   'Firefox extensions':     {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': install_firefox_extensions,},
 
@@ -75,7 +75,7 @@ SETUP_ACTIONS = OrderedDict({
   'Browser add-ons':        {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': install_adblock, 'Just run': True,
                              'Pause': 'Please enable uBlock Origin for all browsers',
                              },
-  'Classic Start':          {'New': True,   'Dat': True,  'Cur': False, 'HW': False, 'Verf': False, 'Function': config_classicstart, 'Win10 only': True,},
+  'Classic Start':          {'New': True,   'Dat': True,  'Cur': True,  'HW': False, 'Verf': False, 'Function': config_classicstart, 'Win10 only': True,},
   'Config Windows Updates': {'New': True,   'Dat': True,  'Cur': True,  'HW': True, 'Verf': True,  'Function': config_windows_updates, 'Win10 only': True,},
   'Enable System Restore':  {'New': True,   'Dat': True,  'Cur': True,  'HW': True, 'Verf': True,  'Function': enable_system_restore,},
   'Create System Restore':  {'New': True,   'Dat': True,  'Cur': True,  'HW': True, 'Verf': False,  'Function': create_system_restore_point,},