diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt
index d9c1204..af699ac 100644
--- a/PHI-CL/changelog.txt
+++ b/PHI-CL/changelog.txt
@@ -1,3 +1,10 @@
+---------------------------------------------------------------------------------------------------
+Version: 3.0.97
+Date: 2025-04-29
+
+  Changes:
+    - [MB] Moved EQ group into MB group for settings.
+
 ---------------------------------------------------------------------------------------------------
 Version: 3.0.96
 Date: 2025-04-29
diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua
index e17aa6d..e4e71db 100644
--- a/PHI-CL/config.lua
+++ b/PHI-CL/config.lua
@@ -263,7 +263,7 @@ local items = {
             ref_name = 'battery-mk2-equipment',
             tech = 'battery-mk2-equipment',
             min = 3,
-            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
+            max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
         },
         ['discharge-defense-equipment'] = {
             enabled = settings.startup['PHI-EQ'].value,
@@ -274,7 +274,7 @@ local items = {
             ref_name = 'discharge-defense-equipment',
             tech = 'discharge-defense-equipment',
             min = 2,
-            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
+            max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
         },
         ['energy-shield-equipment'] = {
             enabled = settings.startup['PHI-EQ'].value,
@@ -285,7 +285,7 @@ local items = {
             ref_name = 'energy-shield-mk2-equipment',
             tech = 'energy-shield-mk2-equipment',
             min = 3,
-            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
+            max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
         },
         ['exoskeleton-equipment'] = {
             enabled = settings.startup['PHI-EQ'].value,
@@ -296,7 +296,7 @@ local items = {
             ref_name = 'exoskeleton-equipment',
             tech = 'exoskeleton-equipment',
             min = 2,
-            max = math.min(tonumber(settings.startup['PHI-EQ-EQUIPMENT-TIER'].value) or 1, 2)
+            max = math.min(tonumber(settings.startup['PHI-MB-EQUIPMENT-TIER'].value) or 1, 2)
         },
         ['fission-reactor-equipment'] = {
             enabled = settings.startup['PHI-EQ'].value,
@@ -307,7 +307,7 @@ local items = {
             ref_name = 'fission-reactor-equipment',
             tech = 'fission-reactor-equipment',
             min = 2,
-            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
+            max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
         },
         ['night-vision-equipment'] = {
             enabled = settings.startup['PHI-EQ'].value,
@@ -318,7 +318,7 @@ local items = {
             ref_name = 'night-vision-equipment',
             tech = 'night-vision-equipment',
             min = 2,
-            max = math.min(tonumber(settings.startup['PHI-EQ-EQUIPMENT-TIER'].value) or 1, 2)
+            max = math.min(tonumber(settings.startup['PHI-MB-EQUIPMENT-TIER'].value) or 1, 2)
         },
         ['personal-laser-defense-equipment'] = {
             enabled = settings.startup['PHI-EQ'].value,
@@ -329,7 +329,7 @@ local items = {
             ref_name = 'personal-laser-defense-equipment',
             tech = 'personal-laser-defense-equipment',
             min = 2,
-            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
+            max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
         },
         ['personal-roboport-equipment'] = {
             enabled = settings.startup['PHI-EQ'].value,
@@ -340,7 +340,7 @@ local items = {
             ref_name = 'personal-roboport-mk2-equipment',
             tech = 'personal-roboport-mk2-equipment',
             min = 3,
-            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
+            max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
         },
         ['solar-panel-equipment'] = {
             enabled = settings.startup['PHI-EQ'].value,
@@ -351,7 +351,7 @@ local items = {
             ref_name = 'solar-panel-equipment',
             tech = 'solar-panel-equipment',
             min = 2,
-            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value,
+            max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value,
             base = 30,
             graphics_name = 'solar-panel-equipment'
         }
@@ -859,7 +859,7 @@ if mods and mods['space-age'] then
         ref_name = 'fusion-reactor-equipment',
         tech = 'fusion-reactor-equipment',
         min = 2,
-        max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
+        max = settings.startup['PHI-MB-EQUIPMENT-TIER'].value
     }
 
     items['equipment']['toolbelt-equipment'] = {
@@ -871,7 +871,7 @@ if mods and mods['space-age'] then
         ref_name = 'toolbelt-equipment',
         tech = 'toolbelt-equipment',
         min = 2,
-        max = math.min(tonumber(settings.startup['PHI-EQ-EQUIPMENT-TIER'].value) or 1, 2)
+        max = math.min(tonumber(settings.startup['PHI-MB-EQUIPMENT-TIER'].value) or 1, 2)
     }
 
     items['equipment']['battery-equipment'].ref_name = 'battery-mk3-equipment'
diff --git a/PHI-CL/info.json b/PHI-CL/info.json
index c8f3a3a..e10df72 100644
--- a/PHI-CL/info.json
+++ b/PHI-CL/info.json
@@ -1,6 +1,6 @@
 {
     "name": "PHI-CL",
-    "version": "3.0.96",
+    "version": "3.0.97",
     "factorio_version": "2.0",
     "date": "2025-04-29",
     "title": "Phidias Collection",
diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg
index e8e1235..90ecfb8 100644
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -102,12 +102,11 @@ PHI-MB-MACHINE=[color=255,254,42]MBM[/color]
 PHI-MB-MACHINE-TIER=[color=54,228,255]MBM1[/color]
 PHI-MB-WEAPON=[color=255,254,42]MBW[/color]
 PHI-MB-WEAPON-TIER=[color=54,228,255]MBW1[/color]
-
-PHI-EQ=[color=255,254,42]EQ[/color]
-PHI-EQ-POWER-TIER=[color=54,228,255]EQ1[/color]
-PHI-EQ-UTILITY-TIER=[color=54,228,255]EQ2[/color]
-PHI-EQ-ARMOR=[color=54,228,255]EQ3[/color]
-PHI-EQ-SIZE=[color=54,228,255]EQ4[/color]
+PHI-MB-EQUIPMENT=[color=255,254,42]MBQ[/color]
+PHI-MB-EQUIPMENT-TIER=[color=54,228,255]MBQ1[/color]
+PHI-MB-EQUIPMENT-UTILITY-TIER=[color=54,228,255]MBQ2[/color]
+PHI-MB-EQUIPMENT-ARMOR=[color=54,228,255]MBQ3[/color]
+PHI-MB-EQUIPMENT-SIZE=[color=54,228,255]MBQ4[/color]
 
 PHI-MI=[color=255,254,42]MI[/color]
 PHI-MI-LANDFILL=[color=54,228,255]MI1[/color]
@@ -145,12 +144,11 @@ PHI-MB-MACHINE=[color=255,254,42]Enable compound machine[/color]
 PHI-MB-MACHINE-TIER=Machine tier
 PHI-MB-WEAPON=[color=255,254,42]Enable military defense[/color]
 PHI-MB-WEAPON-TIER=Military tier
-
-PHI-EQ=[color=255,254,42]Armor equipment[/color]
-PHI-EQ-POWER-TIER=Equipment tier
-PHI-EQ-UTILITY-TIER=Utility tier
-PHI-EQ-ARMOR=Enable armor
-PHI-EQ-SIZE=Small equipment
+PHI-MB-EQUIPMENT=[color=255,254,42]Armor equipment[/color]
+PHI-MB-EQUIPMENT-TIER=Equipment tier
+PHI-MB-EQUIPMENT-UTILITY-TIER=Utility tier
+PHI-MB-EQUIPMENT-ARMOR=Enable armor
+PHI-MB-EQUIPMENT-SIZE=Small equipment
 
 PHI-MI=[color=255,254,42]Miscellaneous change[/color]
 PHI-MI-LANDFILL=Landfill requirement
@@ -179,7 +177,7 @@ PHI-CT-TILE=Enable map generation world tile
 PHI-CT-TILE-CHOICE=Map generation tile choice
 
 [mod-setting-description]
-PHI-EQ-SIZE=1x1
+PHI-MB-EQUIPMENT-SIZE=1x1
 PHI-MI-LANDFILL=50
 PHI-MI-ROCKET-CAPACITY='000 KG
 PHI-SA-SPOIL-FREEZE-RATIO=x0.1
diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg
index 5d8dc5b..5b42323 100644
--- a/PHI-CL/locale/ja/locale.cfg
+++ b/PHI-CL/locale/ja/locale.cfg
@@ -102,12 +102,11 @@ PHI-MB-MACHINE=[color=255,254,42]複合機械を有効にする[/color]
 PHI-MB-MACHINE-TIER=機械の最高等級
 PHI-MB-WEAPON=[color=255,254,42]軍事防衛を有効にする[/color]
 PHI-MB-WEAPON-TIER=軍事防衛の最高等級
-
-PHI-EQ=[color=255,254,42]アーマー設備を有効にする[/color]
-PHI-EQ-POWER-TIER=アーマー設備の最高等級
-PHI-EQ-UTILITY-TIER=ユーティリティモジュールの最高等級
-PHI-EQ-ARMOR=アーマーを有効にする
-PHI-EQ-SIZE=小さなアーマー設備
+PHI-MB-EQUIPMENT=[color=255,254,42]アーマー設備を有効にする[/color]
+PHI-MB-EQUIPMENT-TIER=アーマー設備の最高等級
+PHI-MB-EQUIPMENT-UTILITY-TIER=ユーティリティモジュールの最高等級
+PHI-MB-EQUIPMENT-ARMOR=アーマーを有効にする
+PHI-MB-EQUIPMENT-SIZE=小さなアーマー設備
 
 PHI-MI=[color=255,254,42]その他の変更[/color]
 PHI-MI-LANDFILL=埋立地要件
diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg
index bc447b2..b40987f 100644
--- a/PHI-CL/locale/zh-CN/locale.cfg
+++ b/PHI-CL/locale/zh-CN/locale.cfg
@@ -102,12 +102,11 @@ PHI-MB-MACHINE=[color=255,254,42]啟用複合機器[/color]
 PHI-MB-MACHINE-TIER=機器的最高等級
 PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color]
 PHI-MB-WEAPON-TIER=軍事防禦的最高等級
-
-PHI-EQ=[color=255,254,42]啟用裝甲設備[/color]
-PHI-EQ-POWER-TIER=裝甲設備的最高等級
-PHI-EQ-UTILITY-TIER=雜項的最高等級
-PHI-EQ-ARMOR=啟用護甲
-PHI-EQ-SIZE=小型裝甲裝備
+PHI-MB-EQUIPMENT=[color=255,254,42]啟用裝甲設備[/color]
+PHI-MB-EQUIPMENT-TIER=裝甲設備的最高等級
+PHI-MB-EQUIPMENT-UTILITY-TIER=雜項的最高等級
+PHI-MB-EQUIPMENT-ARMOR=啟用護甲
+PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備
 
 PHI-MI=[color=255,254,42]雜項小變化[/color]
 PHI-MI-LANDFILL=人造陸地需求
diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg
index bc447b2..b40987f 100644
--- a/PHI-CL/locale/zh-TW/locale.cfg
+++ b/PHI-CL/locale/zh-TW/locale.cfg
@@ -102,12 +102,11 @@ PHI-MB-MACHINE=[color=255,254,42]啟用複合機器[/color]
 PHI-MB-MACHINE-TIER=機器的最高等級
 PHI-MB-WEAPON=[color=255,254,42]啟用軍事防禦[/color]
 PHI-MB-WEAPON-TIER=軍事防禦的最高等級
-
-PHI-EQ=[color=255,254,42]啟用裝甲設備[/color]
-PHI-EQ-POWER-TIER=裝甲設備的最高等級
-PHI-EQ-UTILITY-TIER=雜項的最高等級
-PHI-EQ-ARMOR=啟用護甲
-PHI-EQ-SIZE=小型裝甲裝備
+PHI-MB-EQUIPMENT=[color=255,254,42]啟用裝甲設備[/color]
+PHI-MB-EQUIPMENT-TIER=裝甲設備的最高等級
+PHI-MB-EQUIPMENT-UTILITY-TIER=雜項的最高等級
+PHI-MB-EQUIPMENT-ARMOR=啟用護甲
+PHI-MB-EQUIPMENT-SIZE=小型裝甲裝備
 
 PHI-MI=[color=255,254,42]雜項小變化[/color]
 PHI-MI-LANDFILL=人造陸地需求
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index 2c1fec7..ea260b4 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -69,41 +69,41 @@ data:extend({
   order = 'AC01'
 }, {
   type = 'bool-setting',
-  name = 'PHI-EQ',
+  name = 'PHI-MB-EQUIPMENT',
   setting_type = 'startup',
   default_value = false,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ'}, {'mod-setting-name.PHI-EQ'}},
-  order = 'B00'
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT'}, {'mod-setting-name.PHI-MB-EQUIPMENT'}},
+  order = 'AD00'
 }, {
   type = 'int-setting',
-  name = 'PHI-EQ-EQUIPMENT-TIER',
+  name = 'PHI-MB-EQUIPMENT-TIER',
   setting_type = 'startup',
   default_value = 2,
   allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-EQUIPMENT-TIER'}, {'mod-setting-name.PHI-EQ-EQUIPMENT-TIER'}},
-  order = 'B01'
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-TIER'}, {'mod-setting-name.PHI-MB-EQUIPMENT-TIER'}},
+  order = 'AD01'
 }, {
   type = 'int-setting',
-  name = 'PHI-EQ-UTILITY-TIER',
+  name = 'PHI-MB-EQUIPMENT-UTILITY-TIER',
   setting_type = 'startup',
   default_value = 2,
   allowed_values = {1, 2},
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-UTILITY-TIER'}, {'mod-setting-name.PHI-EQ-UTILITY-TIER'}},
-  order = 'B02'
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-UTILITY-TIER'}, {'mod-setting-name.PHI-MB-EQUIPMENT-UTILITY-TIER'}},
+  order = 'AD02'
 }, {
   type = 'bool-setting',
-  name = 'PHI-EQ-ARMOR',
+  name = 'PHI-MB-EQUIPMENT-ARMOR',
   setting_type = 'startup',
   default_value = true,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-ARMOR'}, {'mod-setting-name.PHI-EQ-ARMOR'}},
-  order = 'B03'
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-ARMOR'}, {'mod-setting-name.PHI-MB-EQUIPMENT-ARMOR'}},
+  order = 'AD03'
 }, {
   type = 'bool-setting',
-  name = 'PHI-EQ-SIZE',
+  name = 'PHI-MB-EQUIPMENT-SIZE',
   setting_type = 'startup',
   default_value = false,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-SIZE'}, {'mod-setting-name.PHI-EQ-SIZE'}},
-  order = 'B04'
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MB-EQUIPMENT-SIZE'}, {'mod-setting-name.PHI-MB-EQUIPMENT-SIZE'}},
+  order = 'AD04'
 }, {
   type = 'bool-setting',
   name = 'PHI-MI',