diff --git a/PHI-CL/data/b/ct.lua b/PHI-CL/data/b/ct.lua
index 56059f7..40de711 100644
--- a/PHI-CL/data/b/ct.lua
+++ b/PHI-CL/data/b/ct.lua
@@ -19,6 +19,7 @@ for _, v in pairs({'infinity-chest', 'infinity-cargo-wagon', 'infinity-pipe'}) d
         name = data.raw['item'][v].name,
         energy_required = 2,
         enabled = true,
+        categories = {'crafting'},
         hidden = true,
         hidden_in_factoriopedia = true,
         ingredients = {},
@@ -36,7 +37,6 @@ if data.raw['linked-container'] and data.raw['linked-container']['linked-chest']
 
     data.raw['linked-container']['linked-chest'].circuit_connector = table.deepcopy(data.raw['container']['steel-chest'].circuit_connector)
     data.raw['linked-container']['linked-chest'].circuit_wire_max_distance = data.raw['container']['steel-chest'].circuit_wire_max_distance
-    -- data.raw['linked-container']['linked-chest'].quality_affects_inventory_size = false
     data.raw['linked-container']['linked-chest'].inventory_type = 'with_filters_and_bar'
     data.raw['linked-container']['linked-chest'].inventory_size = data.raw['container']['steel-chest'].inventory_size
     data.raw['linked-container']['linked-chest'].gui_mode = 'all'
@@ -47,6 +47,7 @@ if data.raw['linked-container'] and data.raw['linked-container']['linked-chest']
         name = 'linked-chest',
         energy_required = 2,
         enabled = true,
+        categories = {'crafting'},
         hidden = true,
         hidden_in_factoriopedia = true,
         ingredients = {{type = 'item', name = 'steel-chest', amount = 1}},
@@ -82,6 +83,7 @@ if data.raw['radar'] and data.raw['radar']['radar'] then
         name = item.name,
         energy_required = 2,
         enabled = true,
+        categories = {'crafting'},
         hidden = true,
         hidden_in_factoriopedia = true,
         ingredients = {{type = 'item', name = 'electronic-circuit', amount = 5}, {type = 'item', name = 'iron-gear-wheel', amount = 5}, {type = 'item', name = 'iron-plate', amount = 10}},
@@ -120,6 +122,7 @@ if data.raw['electric-energy-interface'] and data.raw['electric-energy-interface
             name = item.name,
             energy_required = 2,
             enabled = true,
+            categories = {'crafting'},
             hidden = true,
             hidden_in_factoriopedia = true,
             ingredients = {{type = 'item', name = 'accumulator', amount = 1}},
diff --git a/PHI-CL/data/b/gm-sap.lua b/PHI-CL/data/b/gm-sap.lua
index e278c83..719cce1 100644
--- a/PHI-CL/data/b/gm-sap.lua
+++ b/PHI-CL/data/b/gm-sap.lua
@@ -34,18 +34,18 @@ end
 
 -- GM-SAP C 1 SPACE_AGE ENTITY
 if data.raw['space-platform-hub'] and data.raw['space-platform-hub']['space-platform-hub'] then
-    data.raw['space-platform-hub']['space-platform-hub'].platform_repair_speed_modifier = math.max(2, data.raw['space-platform-hub']['space-platform-hub'].platform_repair_speed_modifier)
-    data.raw['space-platform-hub']['space-platform-hub'].inventory_size = math.max(119, data.raw['space-platform-hub']['space-platform-hub'].inventory_size)
+    data.raw['space-platform-hub']['space-platform-hub'].platform_repair_speed_modifier = math.max(2, data.raw['space-platform-hub']['space-platform-hub'].platform_repair_speed_modifier or 0)
+    data.raw['space-platform-hub']['space-platform-hub'].inventory_size = math.max(119, data.raw['space-platform-hub']['space-platform-hub'].inventory_size or 0)
 end
 
 -- GM-SAP C 1 SPACE_AGE TILE
 if data.raw.tile['space-platform-foundation'] then
-    data.raw.tile['space-platform-foundation'].max_health = data.raw.tile['space-platform-foundation'].max_health * 2
+    data.raw.tile['space-platform-foundation'].max_health = (data.raw.tile['space-platform-foundation'].max_health or 0) * 2
 end
 
 -- GM-SAP C 1 SPACE_AGE ITEM
 if data.raw.item['space-platform-foundation'] then
-    data.raw.item['space-platform-foundation'].stack_size = math.max(100, data.raw.item['space-platform-foundation'].stack_size)
+    data.raw.item['space-platform-foundation'].stack_size = math.max(100, data.raw.item['space-platform-foundation'].stack_size or 0)
 end
 
 -- GM-SAP A 1 BASE RESEARCH
diff --git a/PHI-CL/data/b/gm-vp-c.lua b/PHI-CL/data/b/gm-vp-c.lua
index 3331483..8d3a0de 100644
--- a/PHI-CL/data/b/gm-vp-c.lua
+++ b/PHI-CL/data/b/gm-vp-c.lua
@@ -25,17 +25,15 @@ local items = {
         'rail-chain-signal',
         'straight-rail',
         -- BASE 20
-        'legacy-curved-rail',
-        'legacy-straight-rail',
         'curved-rail-a',
         'curved-rail-b',
         'half-diagonal-rail',
+        -- 3X
+        'container',
         -- BASE 25
         -- 5X
         'logistic-container',
         -- BASE 30
-        -- 3X
-        'container',
         -- ELEVATED_RAIL 0
         'rail-support',
         'rail-ramp',
@@ -433,7 +431,7 @@ local items = {
         },
     },
     ['recipe'] = {
-        -- QUALITY 0
+        -- RECYCLER 0
         ['recycler'] = true,
         -- SPACE_AGE 0
         ['lightning-collector'] = true,
@@ -502,7 +500,7 @@ local items = {
         ['advanced-metallic-asteroid-crushing'] = true,
     },
     ['item'] = {
-        -- QUALITY 0
+        -- RECYCLER 0
         ['recycler'] = true,
         -- SPACE_AGE 0
         ['artificial-yumako-soil'] = true,
@@ -580,7 +578,7 @@ local items = {
         'calcite',
     },
     ['hidden'] = {
-        -- QUALITY ENTITY 0
+        -- RECYCLER ENTITY 0
         ['recycler'] = 'furnace',
         -- SPACE_AGE ENTITY 0
         ['biochamber'] = 'assembling-machine',
diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua
index 4ee0212..99ac759 100644
--- a/PHI-CL/data/b/gm-vp.lua
+++ b/PHI-CL/data/b/gm-vp.lua
@@ -6,7 +6,7 @@ local resource_autoplace = require('resource-autoplace')
 
 mc.space_age()
 
--- GM-VP C 33 BASE ENTITY
+-- GM-VP C 31 BASE ENTITY
 -- GM-VP C 6 ELEVATED_RAILS ENTITY
 -- GM-VP C 17 SPACE_AGE ENTITY
 if items['entity_surface_conditions'] then
@@ -72,7 +72,7 @@ data:extend({
         name = 'satellite',
         energy_required = 5,
         enabled = false,
-        category = 'crafting',
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = 'low-density-structure', amount = 100}, {type = 'item', name = 'solar-panel', amount = 100}, {type = 'item', name = 'accumulator', amount = 100}, {type = 'item', name = 'radar', amount = 5}, {type = 'item', name = 'processing-unit', amount = 100}, {type = 'item', name = 'rocket-fuel', amount = 50}},
         results = {{type = 'item', name = 'satellite', amount = 1}},
         requester_paste_multiplier = 1
@@ -127,8 +127,8 @@ if data.raw['unit-spawner'] then
     end
 end
 
+-- GM-VP H 4 QUALITY QUALITY
 -- GM-VP H 20 SPACE_AGE ENTITY
--- GM-VP H 4 SPACE_AGE QUALITY
 -- GM-VP H 9 SPACE_AGE SPACE_CONNECTION
 -- GM-VP H 3 SPACE_AGE SPACE_LOCATION
 for _, c in pairs({'space-connection', 'space-location', 'asteroid', 'asteroid-chunk', 'quality'}) do
@@ -372,7 +372,7 @@ if data.raw.item['ice'] then
         energy_required = 0.5,
         enabled = true,
         icon = data.raw.item['ice'].icon,
-        category = 'chemistry',
+        categories = {'chemistry'},
         ingredients = {{type = 'fluid', name = 'water', amount = 10, fluidbox_multiplier = 10}},
         results = {{type = 'item', name = 'ice', amount = 1}},
         main_product = 'ice',
diff --git a/PHI-CL/data/b/gm.lua b/PHI-CL/data/b/gm.lua
index d2a07cb..f3cee3e 100644
--- a/PHI-CL/data/b/gm.lua
+++ b/PHI-CL/data/b/gm.lua
@@ -1,26 +1,27 @@
 
 -- GM C 1 SPACE_AGE ENTITY
 if data.raw['cargo-bay'] and data.raw['cargo-bay']['cargo-bay'] then
-    data.raw['cargo-bay']['cargo-bay'].inventory_size_bonus = math.max(40, data.raw['cargo-bay']['cargo-bay'].inventory_size_bonus)
+    data.raw['cargo-bay']['cargo-bay'].inventory_size_bonus = math.max(40, data.raw['cargo-bay']['cargo-bay'].inventory_size_bonus or 0)
 end
 
 -- GM C 1 BASE ENTITY
 if data.raw['rocket-silo'] and data.raw['rocket-silo']['rocket-silo'] then
-    data.raw['rocket-silo']['rocket-silo'].to_be_inserted_to_rocket_inventory_size = math.max(60, data.raw['rocket-silo']['rocket-silo'].to_be_inserted_to_rocket_inventory_size)
+    data.raw['rocket-silo']['rocket-silo'].to_be_inserted_to_rocket_inventory_size = math.max(60, data.raw['rocket-silo']['rocket-silo'].to_be_inserted_to_rocket_inventory_size or 0)
 end
 
 -- GM C 1 BASE ENTITY
 if data.raw['rocket-silo-rocket'] and data.raw['rocket-silo-rocket']['rocket-silo-rocket'] then
-    data.raw['rocket-silo-rocket']['rocket-silo-rocket'].inventory_size = math.max(60, data.raw['rocket-silo-rocket']['rocket-silo-rocket'].inventory_size)
+    data.raw['rocket-silo-rocket']['rocket-silo-rocket'].inventory_size = math.max(60, data.raw['rocket-silo-rocket']['rocket-silo-rocket'].inventory_size or 0)
 end
 
 -- GM C 1 BASE ENTITY
 if data.raw['cargo-wagon'] and data.raw['cargo-wagon']['cargo-wagon'] then
-    data.raw['cargo-wagon']['cargo-wagon'].inventory_size = math.max(80, data.raw['cargo-wagon']['cargo-wagon'].inventory_size)
+    data.raw['cargo-wagon']['cargo-wagon'].inventory_size = math.max(80, data.raw['cargo-wagon']['cargo-wagon'].inventory_size or 0)
 end
 
 -- GM C 1 SPACE_AGE RECIPE
 if data.raw.recipe['foundation'] then
+    data.raw.recipe['foundation'].categories = {'crafting'}
     data.raw.recipe['foundation'].ingredients = {{type = 'item', name = 'landfill', amount = 1}, {type = 'item', name = 'refined-concrete', amount = 10}, {type = 'item', name = 'steel-plate', amount = 10}}
     data.raw.recipe['foundation'].results = {{type = 'item', name = 'foundation', amount = 1}}
 end
diff --git a/PHI-CL/data/b/mbe.lua b/PHI-CL/data/b/mbe.lua
index 27fa668..68a3ff2 100644
--- a/PHI-CL/data/b/mbe.lua
+++ b/PHI-CL/data/b/mbe.lua
@@ -238,6 +238,7 @@ function main_recipe(source, tier)
         icons = table.deepcopy(data.raw.item[source.ref_name].icons),
         energy_required = 2,
         enabled = false,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = (tier > source.min and (source.name .. '-' .. (tier - 1))) or source.ref_name, amount = ((source.tech == 'compound-energy' and (source.type == 'solar-panel' or source.type == 'accumulator')) and tonumber(settings.startup['PHI-MB-ENERGY-SOLAR-RATIO'].value) or 4) or 2}},
         results = {{type = 'item', name = result_name, amount = 1}},
         main_product = result_name,
diff --git a/PHI-CL/data/b/mbm-c.lua b/PHI-CL/data/b/mbm-c.lua
index 8045b1a..2e128fa 100644
--- a/PHI-CL/data/b/mbm-c.lua
+++ b/PHI-CL/data/b/mbm-c.lua
@@ -181,9 +181,9 @@ return {
         tech = 'agriculture',
         max = settings.startup['PHI-MB-MACHINE'].value
     },
-    -- MBE A 2 QUALITY ENTITY,RECIPE,RESEARCH_EFFECT
+    -- MBE A 2 RECYCLER ENTITY,RECIPE,RESEARCH_EFFECT
     ['recycler'] = {
-        mod = 'quality',
+        mod = 'recycler',
         type = 'furnace',
         name = 'recycler',
         tech = 'agriculture',
diff --git a/PHI-CL/data/b/mbm.lua b/PHI-CL/data/b/mbm.lua
index e48c728..b263d65 100644
--- a/PHI-CL/data/b/mbm.lua
+++ b/PHI-CL/data/b/mbm.lua
@@ -1,7 +1,5 @@
 local items = require('mbm-c')
 
-
-
 local mod_tint = {
     [2] = {r=140, g=142, b=200},
     [3] = {r=242, g=161, b=26},
@@ -366,6 +364,7 @@ function main_recipe(source, tier)
         icons = table.deepcopy(data.raw.item[source.ref_name].icons),
         energy_required = 2,
         enabled = false,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = (tier > source.min and (source.name .. '-' .. (tier - 1))) or source.ref_name, amount = 2}},
         results = {{type = 'item', name = result_name, amount = 1}},
         main_product = result_name,
@@ -406,7 +405,7 @@ end
 
 -- MBE A 24 BASE ENTITY,RECIPE,RESEARCH_EFFECT
 -- MBE A 24 SPACE_AGE ENTITY,RECIPE,RESEARCH_EFFECT
--- MBE A 2 QUALITY ENTITY,RECIPE,RESEARCH_EFFECT
+-- MBE A 2 RECYCLER ENTITY,RECIPE,RESEARCH_EFFECT
 for _, v in pairs(items) do
     v.mod = v.mod or 'base'
     v.min = v.min or 2
diff --git a/PHI-CL/data/b/mbq.lua b/PHI-CL/data/b/mbq.lua
index 31bf5da..0fb04b5 100644
--- a/PHI-CL/data/b/mbq.lua
+++ b/PHI-CL/data/b/mbq.lua
@@ -42,6 +42,7 @@ if settings.startup['PHI-MB-EQUIPMENT-ARMOR'].value then
         name = armor.name,
         energy_required = 2,
         enabled = false,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = 'power-armor-mk2', amount = 2}},
         results = {{type = 'item', name = armor.name, amount = 1}},
         main_product = armor.name,
@@ -83,6 +84,7 @@ if settings.startup['PHI-MB-EQUIPMENT-ARMOR'].value then
             name = armor.name,
             energy_required = 2,
             enabled = false,
+            categories = {'crafting'},
             ingredients = {{type = 'item', name = 'mech-armor', amount = 2}},
             results = {{type = 'item', name = armor.name, amount = 1}},
             main_product = armor.name,
@@ -185,6 +187,7 @@ function main_recipe(source, tier)
         icons = table.deepcopy(data.raw.item[source.ref_name].icons),
         energy_required = 2,
         enabled = false,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = (tier == source.min and source.ref_name) or (source.name .. '-mk' .. (tier - 1) .. '-equipment'), amount = 2}},
         results = {{type = 'item', name = result_name, amount = 1}},
         main_product = result_name,
diff --git a/PHI-CL/data/b/mig-c.lua b/PHI-CL/data/b/mig-c.lua
index c74b7c5..eb28806 100644
--- a/PHI-CL/data/b/mig-c.lua
+++ b/PHI-CL/data/b/mig-c.lua
@@ -14,32 +14,32 @@ local items = {
             color = 'blue'
         },
         ['automation-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'red'
         },
         ['logistic-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'green'
         },
         -- BASE ITEM 5
         ['military-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'grey'
         },
         ['chemical-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'cyan'
         },
         ['production-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'pink'
         },
         ['utility-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'yellow'
         },
         ['space-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'white'
         },
         -- BASE ITEM 10
@@ -162,23 +162,23 @@ local items = {
         },
         -- SPACE_AGE ITEM 0
         ['metallurgic-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'yellow'
         },
         ['agricultural-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'green'
         },
         ['electromagnetic-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'pink'
         },
         ['cryogenic-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'blue'
         },
         ['promethium-science-pack'] = {
-            type = 'tool',
+            type = 'item',
             color = 'black'
         },
         -- SPACE_AGE ITEM 5
diff --git a/PHI-CL/data/b/mig.lua b/PHI-CL/data/b/mig.lua
index aaac184..f9cde2a 100644
--- a/PHI-CL/data/b/mig.lua
+++ b/PHI-CL/data/b/mig.lua
@@ -90,6 +90,7 @@ if data.raw['valve'] then
             name = v.name,
             energy_required = 1,
             enabled = true,
+            categories = {'crafting'},
             icon = data.raw.item[v.name].icon,
             icon_size = 64,
             order = 'zc',
@@ -150,6 +151,7 @@ if data.raw['offshore-pump'] and data.raw['offshore-pump']['offshore-pump'] then
         name = item.name,
         energy_required = 2,
         enabled = true,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = 'electronic-circuit', amount = 2}, {type = 'item', name = 'pipe', amount = 1}, {type = 'item', name = 'iron-gear-wheel', amount = 1}},
         results = {{type = 'item', name = item.name, amount = 1}},
         main_product = item.name,
@@ -211,7 +213,7 @@ for _, v in pairs(data.raw.fluid) do
         data:extend({{
             type = 'recipe',
             name = 'super-pump-' .. v.name,
-            category = 'super-pump-fluid',
+            categories = {'super-pump-fluid'},
             energy_required = 1,
             enabled = false,
             ingredients = {},
@@ -373,6 +375,7 @@ if data.raw['container'] and data.raw['container']['steel-chest'] then
         name = item.name,
         energy_required = 2,
         enabled = (data.raw.technology['steel-processing'] and false) or true,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = 'steel-chest', amount = 1}},
         results = {{type = 'item', name = item.name, amount = 1}},
         main_product = item.name,
@@ -422,6 +425,7 @@ if data.raw['pipe'] and data.raw['pipe']['pipe'] then
         name = item.name,
         energy_required = 2,
         enabled = (data.raw.technology['automation'] and false) or true,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = 'iron-plate', amount = 1}},
         results = {{type = 'item', name = item.name, amount = 1}},
         main_product = item.name,
@@ -471,6 +475,7 @@ if data.raw['boiler'] and data.raw['boiler']['boiler'] then
         name = item.name,
         energy_required = 2,
         enabled = true,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = 'boiler', amount = 1}, {type = 'item', name = 'electronic-circuit', amount = 1}},
         results = {{type = 'item', name = item.name, amount = 1}},
         main_product = item.name,
@@ -610,6 +615,7 @@ if data.raw['reactor'] and data.raw['reactor']['heating-tower'] then
         name = item.name,
         energy_required = 2,
         enabled = false,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = 'heating-tower', amount = 1}, {type = 'item', name = 'electronic-circuit', amount = 1}},
         results = {{type = 'item', name = item.name, amount = 1}},
         main_product = item.name,
@@ -639,6 +645,7 @@ if data.raw.item['depleted-uranium-fuel-cell'] and data.raw.item['nuclear-fuel']
         name = 'empty-train-battery',
         energy_required = 20,
         enabled = true,
+        categories = {'crafting'},
         icon = mod_graphic_location .. 'battery.png',
         icon_size = 64,
         subgroup = 'intermediate-product',
@@ -666,6 +673,7 @@ if data.raw.item['depleted-uranium-fuel-cell'] and data.raw.item['nuclear-fuel']
         name = 'charged-train-battery',
         energy_required = 30,
         enabled = true,
+        categories = {'crafting'},
         icon = mod_graphic_location .. 'battery.png',
         icon_size = 64,
         subgroup = 'intermediate-product',
@@ -716,6 +724,7 @@ if data.raw['container'] and data.raw['container']['steel-chest'] and data.raw['
         name = item.name,
         energy_required = 2,
         enabled = (data.raw.technology['rocket-silo'] and false) or true,
+        categories = {'crafting'},
         ingredients = {{type = 'item', name = 'steel-chest', amount = 1}},
         results = {{type = 'item', name = item.name, amount = 1}},
         main_product = item.name
diff --git a/PHI-CL/data/b/sa.lua b/PHI-CL/data/b/sa.lua
index e2d9162..65b9e37 100644
--- a/PHI-CL/data/b/sa.lua
+++ b/PHI-CL/data/b/sa.lua
@@ -27,7 +27,7 @@ local function spoil_freeze_handle(i)
         name = item.name,
         energy_required = 2,
         enabled = false,
-        category = 'cryogenics',
+        categories = {'cryogenics'},
         ingredients = {{type = 'item', name = i.name, amount = 1}, {type = 'fluid', name = 'fluoroketone-cold', amount = 2, ignored_by_stats = 2}},
         results = {{type = 'item', name = item.name, amount = 1}, {type = 'fluid', name = 'fluoroketone-hot', amount = 2, ignored_by_stats=2, ignored_by_productivity = 2}},
         allow_productivity = false,
@@ -40,7 +40,7 @@ local function spoil_freeze_handle(i)
         name = 'unfreeze-' .. i.name,
         energy_required = 2,
         enabled = false,
-        category = 'cryogenics',
+        categories = {'cryogenics'},
         ingredients = {{type = 'item', name = item.name, amount = 1}},
         results = {{type = 'item', name = i.name, amount = 1}},
         allow_productivity = false,
@@ -89,7 +89,7 @@ if (settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-SPOIL'].v
     data:extend({{
         type = 'recipe',
         name = 'spoilage-from-nutrients',
-        category = 'organic-or-assembling',
+        categories = {'organic'},
         subgroup = 'agriculture-processes',
         order = 'c[nutrients]-z',
         energy_required = 2,