diff --git a/.bin/Scripts/functions/setup.py b/.bin/Scripts/functions/setup.py
index eb94f9aa..da872e62 100644
--- a/.bin/Scripts/functions/setup.py
+++ b/.bin/Scripts/functions/setup.py
@@ -361,16 +361,14 @@ def install_ninite_bundle(
 
   # Main selections
   main_selections = []
-  if 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')
-    else:
-      main_selections.append('standard7')
+  if base and standard:
+    main_selections.append('base-standard')
+  elif base:
+    main_selections.append('base')
+  elif standard:
+    main_selections.append('standard')
+  if global_vars['OS']['Version'] not in ('8', '8.1', '10'):
+    main_selections = [f'{s}7' for s in main_selections]
   if main_selections:
     # Only run if base and/or standard are enabled
     cmd = r'{}\Installers\Extras\Bundles\{}.exe'.format(