diff --git a/PHI-CL/data-final-fixes.lua b/PHI-CL/data-final-fixes.lua
index 4f32499..4802202 100644
--- a/PHI-CL/data-final-fixes.lua
+++ b/PHI-CL/data-final-fixes.lua
@@ -4,10 +4,6 @@ local file_stage = 3
 
 data.raw['utility-constants'].default.zoom_to_world_effect_strength = 0
 data.raw['utility-constants'].default.zoom_to_world_can_use_nightvision = true
-data.raw['lamp']['small-lamp'].darkness_for_all_lamps_on = 0
-data.raw['lamp']['small-lamp'].darkness_for_all_lamps_off = 0
-table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-grey', color={r=128, g=128, b=128}})
-table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-black', color={r=0, g=0, b=0}})
 
 for _,name in pairs({'furnace', 'lab', 'beacon'}) do
 	local entities = {}
diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua
index 8ee6abc..7bb0502 100644
--- a/PHI-CL/data.lua
+++ b/PHI-CL/data.lua
@@ -81,6 +81,13 @@ if settings.startup['PHI-CT'].value then
             end
         end
     end
+
+    if settings.startup['PHI-CT-LAMP'].value then
+        data.raw['lamp']['small-lamp'].darkness_for_all_lamps_on = 0
+        data.raw['lamp']['small-lamp'].darkness_for_all_lamps_off = nil
+        table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-grey', color={r=128, g=128, b=128}})
+        table.insert(data.raw['lamp']['small-lamp'].signal_to_color_mapping, {type='virtual', name='signal-black', color={r=0, g=0, b=0}})
+    end
 end
 
 if settings.startup['PHI-MI'].value then
diff --git a/PHI-CL/info.json b/PHI-CL/info.json
index b603f02..3fef26d 100644
--- a/PHI-CL/info.json
+++ b/PHI-CL/info.json
@@ -1,8 +1,8 @@
 {
     "name": "PHI-CL",
-    "version": "2.0.27",
+    "version": "2.0.28",
     "factorio_version": "1.1",
-    "date": "2024-08-28",
+    "date": "2024-08-29",
     "title": "Phidias Collection",
     "author": "PHIDIAS0303",
     "contributers": "",
diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg
index 6d1eb69..9256ff2 100644
--- a/PHI-CL/locale/en/locale.cfg
+++ b/PHI-CL/locale/en/locale.cfg
@@ -931,6 +931,7 @@ PHI-CT-LINKED=Linked chest
 PHI-CT-LOADER=Loader enable
 PHI-CT-RECIPE=Recipe
 PHI-CT-ENERGY=Energy
+PHI-CT-LAMP=Lamp
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=Default 8 ; Disable 1
diff --git a/PHI-CL/locale/ja/locale.cfg b/PHI-CL/locale/ja/locale.cfg
index 365bf1c..5ca066f 100644
--- a/PHI-CL/locale/ja/locale.cfg
+++ b/PHI-CL/locale/ja/locale.cfg
@@ -931,6 +931,7 @@ PHI-CT-LINKED=リンクされたチェスト
 PHI-CT-LOADER=ローダーを有効にする
 PHI-CT-RECIPE=レシピ
 PHI-CT-ENERGY=エネルギー
+PHI-CT-LAMP=ランプ
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=デフォルト 8 ; 止める 1
diff --git a/PHI-CL/locale/zh-CN/locale.cfg b/PHI-CL/locale/zh-CN/locale.cfg
index ad8dc99..c2b4bc3 100644
--- a/PHI-CL/locale/zh-CN/locale.cfg
+++ b/PHI-CL/locale/zh-CN/locale.cfg
@@ -931,6 +931,7 @@ PHI-CT-LINKED=連結箱
 PHI-CT-LOADER=裝卸機啟用
 PHI-CT-RECIPE=配方
 PHI-CT-ENERGY=能量
+PHI-CT-LAMP=燈
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1
diff --git a/PHI-CL/locale/zh-TW/locale.cfg b/PHI-CL/locale/zh-TW/locale.cfg
index ad8dc99..c2b4bc3 100644
--- a/PHI-CL/locale/zh-TW/locale.cfg
+++ b/PHI-CL/locale/zh-TW/locale.cfg
@@ -931,6 +931,7 @@ PHI-CT-LINKED=連結箱
 PHI-CT-LOADER=裝卸機啟用
 PHI-CT-RECIPE=配方
 PHI-CT-ENERGY=能量
+PHI-CT-LAMP=燈
 
 [mod-setting-description]
 PHI-EN-SOLAR-TIER=預設 8 ; 停用 1
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index 4bd7510..8ab32e1 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -502,6 +502,12 @@ data:extend({
     setting_type = 'startup',
     default_value = true,
     order = 'JA08'
+  }, {
+    type = 'bool-setting',
+    name = 'PHI-CT-LAMP',
+    setting_type = 'startup',
+    default_value = true,
+    order = 'JA09'
   }, {
     type = 'bool-setting',
     name = 'PHI-CT-TILE',