diff --git a/PHI-CL/data/b/gm-sap.lua b/PHI-CL/data/b/gm-sap.lua
index cbc6f2a..324e02e 100644
--- a/PHI-CL/data/b/gm-sap.lua
+++ b/PHI-CL/data/b/gm-sap.lua
@@ -73,3 +73,84 @@ data:extend({{
     upgrade = true,
     localised_name = {'entity-name.cargo-landing-pad'}
 }})
+
+-- GM C 3 SPACE_AGE ENTITY
+if data.raw['assembling-machine'] then
+    if data.raw['assembling-machine']['electromagnetic-plant'] then
+        local cct = {}
+        local cc = {}
+
+        if data.raw['assembling-machine']['assembling-machine-3'] and data.raw['assembling-machine']['assembling-machine-3'].crafting_categories then
+            for _, v in pairs(data.raw['assembling-machine']['assembling-machine-3'].crafting_categories) do
+                cct[v] = true
+                table.insert(cc, v)
+            end
+        end
+
+        if data.raw['assembling-machine']['electromagnetic-plant'].crafting_categories then
+            for _, v in pairs(data.raw['assembling-machine']['electromagnetic-plant'].crafting_categories) do
+                if not cct[v] then
+                    cct[v] = true
+                    table.insert(cc, v)
+                end
+            end
+        end
+
+        data.raw['assembling-machine']['electromagnetic-plant'].crafting_categories = cc
+    end
+
+    if data.raw['assembling-machine']['foundry'] then
+        local cct = {}
+        local cc = {}
+
+        if data.raw['furnace'] and data.raw['furnace']['electric-furnace'] and data.raw['furnace']['electric-furnace'].crafting_categories then
+            for _, v in pairs(data.raw['furnace']['electric-furnace'].crafting_categories) do
+                cct[v] = true
+                table.insert(cc, v)
+            end
+        end
+
+        if data.raw['assembling-machine']['foundry'].crafting_categories then
+            for _, v in pairs(data.raw['assembling-machine']['foundry'].crafting_categories) do
+                if not cct[v] then
+                    cct[v] = true
+                    table.insert(cc, v)
+                end
+            end
+        end
+
+        data.raw['assembling-machine']['foundry'].crafting_categories = cc
+    end
+
+    if data.raw['assembling-machine']['cryogenic-plant'] then
+        local cct = {}
+        local cc = {}
+
+        if data.raw['assembling-machine']['oil-refinery'] and data.raw['assembling-machine']['oil-refinery'].crafting_categories then
+            for _, v in pairs(data.raw['assembling-machine']['oil-refinery'].crafting_categories) do
+                cct[v] = true
+                table.insert(cc, v)
+            end
+        end
+
+        if data.raw['assembling-machine']['chemical-plant'] and data.raw['assembling-machine']['chemical-plant'].crafting_categories then
+            for _, v in pairs(data.raw['assembling-machine']['chemical-plant'].crafting_categories) do
+                if not cct[v] then
+                    cct[v] = true
+                    table.insert(cc, v)
+                end
+            end
+        end
+
+        if data.raw['assembling-machine']['cryogenic-plant'].crafting_categories then
+            for _, v in pairs(data.raw['assembling-machine']['cryogenic-plant'].crafting_categories) do
+                if not cct[v] then
+                    cct[v] = true
+                    table.insert(cc, v)
+                end
+            end
+        end
+
+        data.raw['assembling-machine']['cryogenic-plant'].crafting_categories = cc
+    end
+end
diff --git a/PHI-CL/data/b/gm.lua b/PHI-CL/data/b/gm.lua
index 37caf18..f8893d6 100644
--- a/PHI-CL/data/b/gm.lua
+++ b/PHI-CL/data/b/gm.lua
@@ -123,84 +123,3 @@ for _, v in pairs(data.raw['resource']) do
         data.raw.item[vn].stack_size = math.max(data.raw.item[vn].stack_size, 100)
     end
 end
-
--- GM C 3 SPACE_AGE ENTITY
-if data.raw['assembling-machine'] then
-    if data.raw['assembling-machine']['electromagnetic-plant'] then
-        local cct = {}
-        local cc = {}
-
-        if data.raw['assembling-machine']['assembling-machine-3'] and data.raw['assembling-machine']['assembling-machine-3'].crafting_categories then
-            for _, v in pairs(data.raw['assembling-machine']['assembling-machine-3'].crafting_categories) do
-                cct[v] = true
-                table.insert(cc, v)
-            end
-        end
-
-        if data.raw['assembling-machine']['electromagnetic-plant'].crafting_categories then
-            for _, v in pairs(data.raw['assembling-machine']['electromagnetic-plant'].crafting_categories) do
-                if not cct[v] then
-                    cct[v] = true
-                    table.insert(cc, v)
-                end
-            end
-        end
-
-        data.raw['assembling-machine']['electromagnetic-plant'].crafting_categories = cc
-    end
-
-    if data.raw['assembling-machine']['foundry'] then
-        local cct = {}
-        local cc = {}
-
-        if data.raw['furnace'] and data.raw['furnace']['electric-furnace'] and data.raw['furnace']['electric-furnace'].crafting_categories then
-            for _, v in pairs(data.raw['furnace']['electric-furnace'].crafting_categories) do
-                cct[v] = true
-                table.insert(cc, v)
-            end
-        end
-
-        if data.raw['assembling-machine']['foundry'].crafting_categories then
-            for _, v in pairs(data.raw['assembling-machine']['foundry'].crafting_categories) do
-                if not cct[v] then
-                    cct[v] = true
-                    table.insert(cc, v)
-                end
-            end
-        end
-
-        data.raw['assembling-machine']['foundry'].crafting_categories = cc
-    end
-
-    if data.raw['assembling-machine']['cryogenic-plant'] then
-        local cct = {}
-        local cc = {}
-
-        if data.raw['assembling-machine']['oil-refinery'] and data.raw['assembling-machine']['oil-refinery'].crafting_categories then
-            for _, v in pairs(data.raw['assembling-machine']['oil-refinery'].crafting_categories) do
-                cct[v] = true
-                table.insert(cc, v)
-            end
-        end
-
-        if data.raw['assembling-machine']['chemical-plant'] and data.raw['assembling-machine']['chemical-plant'].crafting_categories then
-            for _, v in pairs(data.raw['assembling-machine']['chemical-plant'].crafting_categories) do
-                if not cct[v] then
-                    cct[v] = true
-                    table.insert(cc, v)
-                end
-            end
-        end
-
-        if data.raw['assembling-machine']['cryogenic-plant'].crafting_categories then
-            for _, v in pairs(data.raw['assembling-machine']['cryogenic-plant'].crafting_categories) do
-                if not cct[v] then
-                    cct[v] = true
-                    table.insert(cc, v)
-                end
-            end
-        end
-
-        data.raw['assembling-machine']['cryogenic-plant'].crafting_categories = cc
-    end
-end
diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua
index 238ab9b..3ca5642 100644
--- a/PHI-CL/settings.lua
+++ b/PHI-CL/settings.lua
@@ -168,7 +168,7 @@ data:extend({
   default_value = '',
   allowed_values = {'', 'SAP', 'VP'},
   localised_name = {'phi-cl.setting-category-color', 'GM', {'phi-cl.enable'}, {'mod-setting-name.PHI-GM'}},
-  localised_description = {'', {'phi-cl.setting-change-color', '[GM] [51] A20 C24 H7\n[SAP] [30] A3 C27\n[VP] [614] A12 C192 H410'}},
+  localised_description = {'', {'phi-cl.setting-change-color', '[GM] [48] A20 C21 H7\n[SAP] [33] A3 C30\n[VP] [614] A12 C192 H410'}},
   order = 'D00'
 },  {
   type = 'bool-setting',