diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt
index 4975cb3..949fb63 100644
--- a/PHI-CL/changelog.txt
+++ b/PHI-CL/changelog.txt
@@ -1,3 +1,12 @@
+---------------------------------------------------------------------------------------------------
+Version: 3.0.96
+Date: 2025-04-27
+
+  Changes:
+    - [SA] Clean up the code of previous change that is not in the correct block.
+    - [SA] Removed the settings to change the item weight for space age silo, use the silo capacity instead.
+    - [EQ] Grouped the equipment settings together.
+
 ---------------------------------------------------------------------------------------------------
 Version: 3.0.95
 Date: 2025-04-27
diff --git a/PHI-CL/config.lua b/PHI-CL/config.lua
index d33b875..19fb5dc 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-POWER-TIER'].value
+            max = settings.startup['PHI-EQ-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-DEFENSE-TIER'].value
+            max = settings.startup['PHI-EQ-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-DEFENSE-TIER'].value
+            max = settings.startup['PHI-EQ-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 = settings.startup['PHI-EQ-UTILITY-TIER'].value
+            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
         },
         ['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-POWER-TIER'].value
+            max = settings.startup['PHI-EQ-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 = settings.startup['PHI-EQ-UTILITY-TIER'].value
+            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
         },
         ['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-DEFENSE-TIER'].value
+            max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
         },
         ['personal-roboport-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-POWER-TIER'].value,
+            max = settings.startup['PHI-EQ-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-POWER-TIER'].value
+        max = settings.startup['PHI-EQ-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 = settings.startup['PHI-EQ-UTILITY-TIER'].value
+        max = settings.startup['PHI-EQ-EQUIPMENT-TIER'].value
     }
 
     items['equipment']['battery-equipment'].ref_name = 'battery-mk3-equipment'
diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index a8e2f78..57c0809 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -295,7 +295,6 @@ if settings.startup['PHI-MI'].value then
 
     data.raw['utility-constants'].default.default_pipeline_extent = settings.startup['PHI-MI-PIPE-EXTENT'].value
     data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-MI-ROCKET-CAPACITY'].value * 1000000
-    data.raw['utility-constants'].default.default_item_weight = settings.startup['PHI-MI-CARGO-WEIGHT'].value
 end
 
 if settings.startup['PHI-CT'].value or (settings.startup['PHI-MI'].value) or (settings.startup['PHI-SA'].value and settings.startup['PHI-SA-RESTRICTION'].value) or settings.startup['PHI-VP'].value then
diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg
index f687982..d8c1cd9 100644
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -105,11 +105,9 @@ 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-DEFENSE-TIER=[color=54,228,255]EQ2[/color]
-PHI-EQ-TOOL-TIER=[color=54,228,255]EQ3[/color]
-PHI-EQ-UTILITY-TIER=[color=54,228,255]EQ4[/color]
-PHI-EQ-ARMOR=[color=54,228,255]EQ5[/color]
-PHI-EQ-SIZE=[color=54,228,255]EQ6[/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-MI=[color=255,254,42]MI[/color]
 PHI-MI-LANDFILL=[color=54,228,255]MI1[/color]
@@ -121,7 +119,6 @@ PHI-MI-ROBOT-ENERGY=[color=54,228,255]MI6[/color]
 PHI-MI-TRAIN=[color=54,228,255]MI7[/color]
 PHI-MI-PIPE-EXTENT=[color=54,228,255]MI8[/color]
 PHI-MI-ROCKET-CAPACITY=[color=54,228,255]MI9[/color]
-PHI-MI-CARGO-WEIGHT=[color=54,228,255]MI10[/color]
 
 PHI-SA=[color=255,254,42]SA[/color]
 PHI-SA-HEAT-RADIUS=[color=54,228,255]SA1[/color]
@@ -151,9 +148,7 @@ 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=Power tier
-PHI-EQ-DEFENSE-TIER=Defense tier
-PHI-EQ-TOOL-TIER=Tool tier
+PHI-EQ-POWER-TIER=Equipment tier
 PHI-EQ-UTILITY-TIER=Utility tier
 PHI-EQ-ARMOR=Enable armor
 PHI-EQ-SIZE=Small equipment
@@ -168,7 +163,6 @@ PHI-MI-ROBOT-ENERGY=Nuclear fussion robot
 PHI-MI-TRAIN=Train efficiency
 PHI-MI-PIPE-EXTENT=Pipe Extent
 PHI-MI-ROCKET-CAPACITY=Rocket capacity
-PHI-MI-CARGO-WEIGHT=Rocket cargo weight
 
 PHI-SA=[color=255,254,42]Space Age[/color]
 PHI-SA-HEAT-RADIUS=Heat radius
@@ -190,6 +184,5 @@ PHI-CT-TILE-CHOICE=Map generation tile choice
 PHI-EQ-SIZE=1x1
 PHI-MI-LANDFILL=50
 PHI-MI-ROCKET-CAPACITY='000 KG
-PHI-MI-CARGO-WEIGHT=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 3524c4a..7350ae8 100644
--- a/PHI-CL/locale/ja/locale.cfg
+++ b/PHI-CL/locale/ja/locale.cfg
@@ -104,9 +104,7 @@ 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-DEFENSE-TIER=防御モジュールの最高等級
-PHI-EQ-TOOL-TIER=ツールモジュールの最高等級
+PHI-EQ-POWER-TIER=アーマー設備の最高等級
 PHI-EQ-UTILITY-TIER=ユーティリティモジュールの最高等級
 PHI-EQ-ARMOR=アーマーを有効にする
 PHI-EQ-SIZE=小さなアーマー設備
@@ -121,7 +119,6 @@ PHI-MI-ROBOT-ENERGY=核融合ロボット
 PHI-MI-TRAIN=列車効率
 PHI-MI-PIPE-EXTENT=パイプ範囲
 PHI-MI-ROCKET-CAPACITY=ロケット容量
-PHI-MI-CARGO-WEIGHT=ロケット積載重量
 
 PHI-SA=[color=255,254,42]Space Age[/color]
 PHI-SA-HEAT-RADIUS=熱半径
diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg
index d2fffcc..3776a73 100644
--- a/PHI-CL/locale/zh-CN/locale.cfg
+++ b/PHI-CL/locale/zh-CN/locale.cfg
@@ -104,9 +104,7 @@ 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-DEFENSE-TIER=防禦的最高等級
-PHI-EQ-TOOL-TIER=工具的最高等級
+PHI-EQ-POWER-TIER=裝甲設備的最高等級
 PHI-EQ-UTILITY-TIER=雜項的最高等級
 PHI-EQ-ARMOR=啟用護甲
 PHI-EQ-SIZE=小型裝甲裝備
@@ -121,7 +119,6 @@ PHI-MI-ROBOT-ENERGY=核融合無人機
 PHI-MI-TRAIN=火車效率
 PHI-MI-PIPE-EXTENT=管道長度
 PHI-MI-ROCKET-CAPACITY=火箭容量
-PHI-MI-CARGO-WEIGHT=火箭貨物重量
 
 PHI-SA=[color=255,254,42]太空時代[/color]
 PHI-SA-HEAT-RADIUS=熱半徑
diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg
index d2fffcc..3776a73 100644
--- a/PHI-CL/locale/zh-TW/locale.cfg
+++ b/PHI-CL/locale/zh-TW/locale.cfg
@@ -104,9 +104,7 @@ 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-DEFENSE-TIER=防禦的最高等級
-PHI-EQ-TOOL-TIER=工具的最高等級
+PHI-EQ-POWER-TIER=裝甲設備的最高等級
 PHI-EQ-UTILITY-TIER=雜項的最高等級
 PHI-EQ-ARMOR=啟用護甲
 PHI-EQ-SIZE=小型裝甲裝備
@@ -121,7 +119,6 @@ PHI-MI-ROBOT-ENERGY=核融合無人機
 PHI-MI-TRAIN=火車效率
 PHI-MI-PIPE-EXTENT=管道長度
 PHI-MI-ROCKET-CAPACITY=火箭容量
-PHI-MI-CARGO-WEIGHT=火箭貨物重量
 
 PHI-SA=[color=255,254,42]太空時代[/color]
 PHI-SA-HEAT-RADIUS=熱半徑
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index 93b3976..ddf87fb 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -76,28 +76,12 @@ data:extend({
   order = 'B00'
 }, {
   type = 'int-setting',
-  name = 'PHI-EQ-POWER-TIER',
+  name = 'PHI-EQ-EQUIPMENT-TIER',
   setting_type = 'startup',
-  default_value = 8,
+  default_value = 2,
   allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-POWER-TIER'}, {'mod-setting-name.PHI-EQ-POWER-TIER'}},
+  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-EQUIPMENT-TIER'}, {'mod-setting-name.PHI-EQ-EQUIPMENT-TIER'}},
   order = 'B01'
-}, {
-  type = 'int-setting',
-  name = 'PHI-EQ-DEFENSE-TIER',
-  setting_type = 'startup',
-  default_value = 8,
-  allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-DEFENSE-TIER'}, {'mod-setting-name.PHI-EQ-DEFENSE-TIER'}},
-  order = 'B02'
-}, {
-  type = 'int-setting',
-  name = 'PHI-EQ-TOOL-TIER',
-  setting_type = 'startup',
-  default_value = 8,
-  allowed_values = {1, 2, 3, 4, 5, 6, 7, 8},
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-EQ-TOOL-TIER'}, {'mod-setting-name.PHI-EQ-TOOL-TIER'}},
-  order = 'B03'
 }, {
   type = 'int-setting',
   name = 'PHI-EQ-UTILITY-TIER',
@@ -105,21 +89,21 @@ data:extend({
   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 = 'B04'
+  order = 'B02'
 }, {
   type = 'bool-setting',
   name = 'PHI-EQ-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 = 'B05'
+  order = 'B03'
 }, {
   type = 'bool-setting',
   name = 'PHI-EQ-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 = 'B06'
+  order = 'B04'
 }, {
   type = 'bool-setting',
   name = 'PHI-MI',
@@ -201,15 +185,6 @@ data:extend({
   maximum_value = 10000,
   localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-ROCKET-CAPACITY'}, {'mod-setting-name.PHI-MI-ROCKET-CAPACITY'}},
   order = 'C09'
-}, {
-  type = 'int-setting',
-  name = 'PHI-MI-CARGO-WEIGHT',
-  setting_type = 'startup',
-  default_value = 100,
-  minimum_value = 1,
-  maximum_value = 1000,
-  localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-MI-CARGO-WEIGHT'}, {'mod-setting-name.PHI-MI-CARGO-WEIGHT'}},
-  order = 'C10'
 }, {
   type = 'bool-setting',
   name = 'PHI-SA',