diff --git a/PHI-CL/changelog.txt b/PHI-CL/changelog.txt
index 9665ed1..8567f26 100644
--- a/PHI-CL/changelog.txt
+++ b/PHI-CL/changelog.txt
@@ -1,3 +1,10 @@
+---------------------------------------------------------------------------------------------------
+Version: 3.1.17
+Date: 2026-11-08
+
+  Changes:
+    - [CT] Generic Code layout restructure.
+
 ---------------------------------------------------------------------------------------------------
 Version: 3.1.16
 Date: 2026-11-08
diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua
index b11948b..e3f7d21 100644
--- a/PHI-CL/control.lua
+++ b/PHI-CL/control.lua
@@ -24,7 +24,7 @@ if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].valu
 end
 
 local function gui_create(player)
-    for _, v in pairs({'phi_cl_inserter_config', 'phi_cl_combinator_config', 'phi_cl_inserter'}) do
+    for _, v in pairs({'phi_cl_inserter'}) do
         if player.gui.relative[v] then
             player.gui.relative[v].destroy()
         end
@@ -109,10 +109,7 @@ if (settings.startup['PHI-MI'].value and settings.startup['PHI-MI-GENERIC'].valu
 end
 
 if settings.startup['PHI-CT'].value then
-    script.on_event(defines.events.on_lua_shortcut, function(event)
-        editor.toggle(event)
-    end)
-
+    script.on_event(defines.events.on_lua_shortcut, editor.toggle)
     script.on_event(defines.events.on_player_toggled_map_editor, editor.toggle_editor)
 
     script.on_event(defines.events.on_player_promoted, function(event)
diff --git a/PHI-CL/info.json b/PHI-CL/info.json
index 596c841..4236221 100644
--- a/PHI-CL/info.json
+++ b/PHI-CL/info.json
@@ -1,6 +1,6 @@
 {
     "name": "PHI-CL",
-    "version": "3.1.16",
+    "version": "3.1.17",
     "factorio_version": "2.1",
     "date": "2026-11-08",
     "title": "Phidias Collection",