diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt
index bbf0aae..f4e73f9 100644
--- a/PHI-CL/changelog.txt
+++ b/PHI-CL/changelog.txt
@@ -4,6 +4,7 @@ Date: 2025-06-06
 
   Changes:
     - [SA] Introduced asteroid density to reduce the ups usage for space platform.
+    - [CL] Grouped SA Plus and Vanilla Plus together as game mode in the settings.
 
 ---------------------------------------------------------------------------------------------------
 Version: 3.0.111
diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index d07017e..0fb3c5f 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -115,7 +115,7 @@ if settings.startup['PHI-MB-EQUIPMENT'].value and settings.startup['PHI-MB-EQUIP
     end
 end
 
-if settings.startup['PHI-CT'].value or settings.startup['PHI-MI'].value or (settings.startup['PHI-SA'].value and settings.startup['PHI-SA-GENERIC'].value) or settings.startup['PHI-VP'].value then
+if settings.startup['PHI-CT'].value or settings.startup['PHI-MI'].value or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then
     data.raw['mining-drill']['electric-mining-drill'].filter_count = 5
 
     if mods['space-age'] then
@@ -252,7 +252,7 @@ if settings.startup['PHI-MI'].value then
     data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-MI-ROCKET-CAPACITY'].value * 1000000
 end
 
-if settings.startup['PHI-CT'].value or (settings.startup['PHI-MI'].value) or (settings.startup['PHI-SA'].value and settings.startup['PHI-SA-GENERIC'].value) or settings.startup['PHI-VP'].value then
+if settings.startup['PHI-CT'].value or (settings.startup['PHI-MI'].value) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '-') then
     data:extend({{type = 'recipe-category', name = 'fluid'}})
 
     local item = table.deepcopy(data.raw['item']['offshore-pump'])
@@ -344,7 +344,7 @@ if settings.startup['PHI-SA'].value and settings.startup['PHI-SA-QUALITY'].value
     end
 end
 
-if mods['space-age'] and ((settings.startup['PHI-SA'].value and ((not settings.startup['PHI-SA-ENABLE-QUALITY'].value) or settings.startup['PHI-SA-GENERIC'].value)) or settings.startup['PHI-VP'].value) then
+if mods['space-age'] and ((settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-ENABLE-QUALITY'].value)) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '-')) then
     for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do
         if data.raw.technology[v] then
             data.raw.technology[v].hidden = true
@@ -481,7 +481,7 @@ if (settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-SPOIL'].v
     end
 end
 
-if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup['PHI-SA-GENERIC'].value) or settings.startup['PHI-VP'].value) then
+if mods['space-age'] and (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '-') then
     data.raw['character']['character']['mining_categories'] = {'basic-solid', 'hard-solid'}
 
     data.raw.resource['lithium-brine'].infinite = true
@@ -716,7 +716,7 @@ if mods['space-age'] and ((settings.startup['PHI-SA'].value and settings.startup
     end
 end
 
-if settings.startup['PHI-VP'].value then
+if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'VP' then
     if mods['space-age'] then
         data.raw.quality['normal'].level = 0
         data.raw.quality['normal'].beacon_power_usage_multiplier = 1
diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg
index dc7e4c5..96985f7 100644
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -149,26 +149,31 @@ PHI-MI-PIPE-EXTENT=Pipe Extent
 PHI-MI-ROCKET-CAPACITY=Rocket capacity
 
 PHI-SA=[color=255,254,42]Space Age[/color]
-PHI-SA-GENERIC=Game mode: Space Age Plus
 PHI-SA-SPOIL=Enable spoilage
 PHI-SA-SPOIL-FREEZE=Freeze spoilage
 PHI-SA-SPOIL-FREEZE-RATIO=Freeze spoilage multiplier
 PHI-SA-ENABLE-QUALITY=Enable quality
 PHI-SA-QUALITY=Quality chance multiplier
 
-PHI-VP=[color=255,254,42]Game mode: Vanilla Plus[/color]
+PHI-GM=[color=255,254,42]Game mode[/color]
 
 PHI-CT=[color=255,254,42]Creative testing tools[/color]
 PHI-CT-TILE=Enable map generation world tile
 PHI-CT-TILE-CHOICE=Map generation tile choice
 
+[string-mod-setting]
+PHI-GM-SAP=Space Age Plus
+PHI-GM-VP=Vanilla Plus
+
 [mod-setting-description]
 PHI-MB-EQUIPMENT-SIZE=1x1
+
 PHI-MI-LANDFILL=50
 PHI-MI-EFFCY=x0.1
 PHI-MI-PIPE=x0.1
 PHI-MI-ROBOT=x0.1
 PHI-MI-TRAIN=x0.1
 PHI-MI-ROCKET-CAPACITY='000 KG
+
 PHI-SA-SPOIL-FREEZE-RATIO=x0.1
 PHI-SA-QUALITY=x0.1
diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg
index 52ec3fb..31f82f2 100644
--- a/PHI-CL/locale/ja/locale.cfg
+++ b/PHI-CL/locale/ja/locale.cfg
@@ -115,15 +115,18 @@ PHI-MI-PIPE-EXTENT=パイプ範囲
 PHI-MI-ROCKET-CAPACITY=ロケット容量
 
 PHI-SA=[color=255,254,42]Space Age[/color]
-PHI-SA-GENERIC=ゲームモード: Space Age プラス
 PHI-SA-SPOIL=変質を有効にする
 PHI-SA-SPOIL-FREEZE=変質凍結
 PHI-SA-SPOIL-FREEZE-RATIO=変質凍結マルチプライヤ
 PHI-SA-ENABLE-QUALITY=品質を有効にする
 PHI-SA-QUALITY=品質確率マルチプライヤ
 
-PHI-VP=[color=255,254,42]ゲームモード: バニラプラス[/color]
+PHI-GM=[color=255,254,42]ゲームモード[/color]
 
 PHI-CT=[color=255,254,42]クリエイティブテストツール[/color]
 PHI-CT-TILE=マップ生成ワールドタイルを有効にする
 PHI-CT-TILE-CHOICE=マップ生成ドタイル選択
+
+[string-mod-setting]
+PHI-GM-SAP=Space Age プラス
+PHI-GM-VP=バニラプラス
diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg
index 170c0bb..7b62f2b 100644
--- a/PHI-CL/locale/zh-CN/locale.cfg
+++ b/PHI-CL/locale/zh-CN/locale.cfg
@@ -115,15 +115,18 @@ PHI-MI-PIPE-EXTENT=管道長度
 PHI-MI-ROCKET-CAPACITY=火箭容量
 
 PHI-SA=[color=255,254,42]太空時代[/color]
-PHI-SA-GENERIC=遊戲模式: 太空時代加強版
 PHI-SA-SPOIL=啟用變質
 PHI-SA-SPOIL-FREEZE=變質凍結
 PHI-SA-SPOIL-FREEZE-RATIO=變質凍結倍數
 PHI-SA-ENABLE-QUALITY=啟用品質
 PHI-SA-QUALITY=品質概率倍數
 
-PHI-VP=[color=255,254,42]遊戲模式: 原版加強版[/color]
+PHI-GM=[color=255,254,42]遊戲模式[/color]
 
 PHI-CT=[color=255,254,42]創意測試工具[/color]
 PHI-CT-TILE=啟用地圖生成世界地磚
 PHI-CT-TILE-CHOICE=地圖生成世界地磚選擇
+
+[string-mod-setting]
+PHI-GM-SAP=太空時代加強版
+PHI-GM-VP=原版加強版
diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg
index d0c75d5..7b62f2b 100644
--- a/PHI-CL/locale/zh-TW/locale.cfg
+++ b/PHI-CL/locale/zh-TW/locale.cfg
@@ -115,16 +115,18 @@ PHI-MI-PIPE-EXTENT=管道長度
 PHI-MI-ROCKET-CAPACITY=火箭容量
 
 PHI-SA=[color=255,254,42]太空時代[/color]
-PHI-SA-GENERIC=遊戲模式: 太空時代加強版
 PHI-SA-SPOIL=啟用變質
 PHI-SA-SPOIL-FREEZE=變質凍結
 PHI-SA-SPOIL-FREEZE-RATIO=變質凍結倍數
 PHI-SA-ENABLE-QUALITY=啟用品質
 PHI-SA-QUALITY=品質概率倍數
 
-PHI-VP=[color=255,254,42]遊戲模式: 原版加強版[/color]
+PHI-GM=[color=255,254,42]遊戲模式[/color]
 
 PHI-CT=[color=255,254,42]創意測試工具[/color]
 PHI-CT-TILE=啟用地圖生成世界地磚
 PHI-CT-TILE-CHOICE=地圖生成世界地磚選擇
 
+[string-mod-setting]
+PHI-GM-SAP=太空時代加強版
+PHI-GM-VP=原版加強版
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index 8b6d821..086cc31 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -139,27 +139,20 @@ data:extend({
   default_value = false,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA'}, {'mod-setting-name.PHI-SA'}},
   order = 'C00'
-}, {
-  type = 'bool-setting',
-  name = 'PHI-SA-GENERIC',
-  setting_type = 'startup',
-  default_value = true,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-GENERIC'}, {'mod-setting-name.PHI-SA-GENERIC'}},
-  order = 'C01'
 }, {
   type = 'bool-setting',
   name = 'PHI-SA-SPOIL',
   setting_type = 'startup',
   default_value = false,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL'}, {'mod-setting-name.PHI-SA-SPOIL'}},
-  order = 'C02'
+  order = 'C01'
 }, {
   type = 'bool-setting',
   name = 'PHI-SA-SPOIL-FREEZE',
   setting_type = 'startup',
   default_value = false,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL-FREEZE'}, {'mod-setting-name.PHI-SA-SPOIL-FREEZE'}},
-  order = 'C03'
+  order = 'C02'
 }, {
   type = 'int-setting',
   name = 'PHI-SA-SPOIL-FREEZE-RATIO',
@@ -168,14 +161,14 @@ data:extend({
   minimum_value = 1,
   maximum_value = 1000,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-SPOIL-FREEZE-RATIO'}, {'mod-setting-name.PHI-SA-SPOIL-FREEZE-RATIO'}},
-  order = 'C04'
+  order = 'C03'
 }, {
   type = 'bool-setting',
   name = 'PHI-SA-ENABLE-QUALITY',
   setting_type = 'startup',
   default_value = false,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-ENABLE-QUALITY'}, {'mod-setting-name.PHI-SA-ENABLE-QUALITY'}},
-  order = 'C05'
+  order = 'C04'
 }, {
   type = 'int-setting',
   name = 'PHI-SA-QUALITY',
@@ -184,13 +177,14 @@ data:extend({
   minimum_value = 1,
   maximum_value = 100,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-SA-QUALITY'}, {'mod-setting-name.PHI-SA-QUALITY'}},
-  order = 'C06'
+  order = 'C05'
 }, {
-  type = 'bool-setting',
-  name = 'PHI-VP',
+  type = 'string-setting',
+  name = 'PHI-GM',
   setting_type = 'startup',
-  default_value = false,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-VP'}, {'mod-setting-name.PHI-VP'}},
+  default_value = '',
+  allowed_values = {'', 'SAP', 'VP'},
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-GM'}, {'mod-setting-name.PHI-GM'}},
   order = 'D00'
 },  {
   type = 'bool-setting',