diff --git a/.gitignore b/.gitignore
index e95134b8..b308b370 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *.db
 Thumbs.*
 .build/
-.vscode/
-stdlib_repo/
+.vscode/
\ No newline at end of file
diff --git a/changelog.txt b/changelog.txt
index e1ad156b..18b2aa53 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 2.4.16
+Date: 2024-??-??
+  Changes:
+    - Changed the name of lead dust to silver-lead dust.
+---------------------------------------------------------------------------------------------------
 Version: 2.4.15
 Date: 2024-3-24
   Changes:
diff --git a/control.lua b/control.lua
index d80fd50b..7e19a624 100644
--- a/control.lua
+++ b/control.lua
@@ -1 +1,5 @@
-require 'scripts/wiki/text-pages'
\ No newline at end of file
+require '__pypostprocessing__.lib'
+
+require 'scripts/wiki/text-pages'
+
+py.finalize_events()
\ No newline at end of file
diff --git a/data-updates.lua b/data-updates.lua
index 1a16591a..8a543a89 100644
--- a/data-updates.lua
+++ b/data-updates.lua
@@ -1,24 +1,21 @@
-require("__stdlib__/stdlib/data/data").Util.create_data_globals()
-local FUN = require("__pycoalprocessing__/prototypes/functions/functions")
-
-require("prototypes/updates/base-updates")
-require("prototypes/updates/pycoalprocessing-updates")
-require("prototypes/updates/pyindustry-updates")
+require 'prototypes/updates/base-updates'
+require 'prototypes/updates/pycoalprocessing-updates'
+require 'prototypes/updates/pyindustry-updates'
 
 if mods["pyfusionenergy"] then
-  require("prototypes/updates/pyfusionenergy-updates")
+  require 'prototypes/updates/pyfusionenergy-updates'
 end
 
 if mods["pyhightech"] then
-  require("prototypes/updates/pyhightech-updates")
+  require 'prototypes/updates/pyhightech-updates'
 end
 
 if mods["pypetroleumhandling"] then
-  require("prototypes/updates/pypetroleumhandling-updates")
+  require 'prototypes/updates/pypetroleumhandling-updates'
 end
 
 if mods["pyalienlife"] then
-  require("prototypes/updates/pyalienlife-updates")
+  require 'prototypes/updates/pyalienlife-updates'
 end
 
 --ADAPTATIONS
@@ -38,7 +35,7 @@ ITEM("copper-cable"):set("icon_mipmaps", nil)
 RECIPE("iron-plate"):remove_ingredient("iron-ore"):add_ingredient({type = "item", name = "iron-ore", amount = 8}):set_fields {energy_required = 10}
 RECIPE("copper-plate"):remove_ingredient("copper-ore"):add_ingredient({type = "item", name = "copper-ore", amount = 8}):set_fields {energy_required = 10}
 
-RECIPE("steel-plate"):remove_ingredient("iron-plate"):add_ingredient({type = "item", name = "coke",amount = 5}):add_ingredient({type = "item", name = "iron-ore",amount = 20}):add_ingredient({type = "item", name = "limestone",amount = 5}):change_category('advanced-foundry'):set_fields {energy_required = 15}
+RECIPE("steel-plate"):remove_ingredient("iron-plate"):add_ingredient({type = "item", name = "coke",amount = 5}):add_ingredient({type = "item", name = "iron-ore",amount = 20}):add_ingredient({type = "item", name = "limestone",amount = 5}):set_fields{energy_required = 15}.category = 'advanced-foundry'
 RECIPE("electronic-circuit"):set_fields {energy_required = 4}
 --RECIPE("electronic-circuit"):add_ingredient({type = "item", name = "solder", amount = 2})
 RECIPE("advanced-circuit"):add_ingredient({type = "item", name = "solder", amount = 4})
@@ -160,17 +157,9 @@ TECHNOLOGY("oil-processing"):remove_prereq("steel-processing")
 TECHNOLOGY("desulfurization"):remove_prereq("sulfur-processing")
 TECHNOLOGY("sulfur-processing"):remove_prereq("oil-processing")
 
-
 ITEM("sulfur").stack_size = 100
 ITEM("landfill").stack_size = 1000
 
-for _, player in DATA:pairs('character') do
-    player.crafting_categories = player.String_Array(player.crafting_categories or {}) + 'handcrafting'
-end
-for _, controller in DATA:pairs('god-controller') do
-    controller.crafting_categories = controller.String_Array(controller.crafting_categories or {}) + 'handcrafting'
-end
-
 local recipes_list =
 	{
   "acid-solvent",
@@ -219,7 +208,7 @@ local recipes_list =
 }
 
 --adding to module limitation list
-FUN.productivity(recipes_list)
+py.allow_productivity(recipes_list)
 
 if register_cache_file ~= nil then
     register_cache_file({"pycoalprocessing","pyindustry","pyrawores"}, "__pyrawores__/cached-configs/pycoalprocessing+pyindustry+pyrawores.lua")
diff --git a/data.lua b/data.lua
index 57751508..742fbd05 100644
--- a/data.lua
+++ b/data.lua
@@ -1,359 +1,356 @@
-require("__stdlib__/stdlib/data/data").Util.create_data_globals()
+require 'prototypes/item-groups'
+require 'prototypes/recipe-categories'
 
-require("prototypes/item-groups")
-require("prototypes/recipe-categories")
+require 'prototypes/items/items'
 
-require('prototypes/items/items')
+require 'prototypes/circuit-connector-definitions'
 
-require('prototypes/circuit-connector-definitions')
-
-if mods["pyalienlife"] then
-    require('prototypes/items/pyalienlife-items')
+if mods['pyalienlife'] then
+    require 'prototypes/items/pyalienlife-items'
 end
 
 --(( RESOURCES ))--
-require("prototypes.ores.quartz")
-require("prototypes.ores.raw-coal")
-require("prototypes.ores.aluminium")
-require("prototypes.ores.chromium")
-require("prototypes.ores.lead")
-require("prototypes.ores.nickel")
-require("prototypes.ores.tin")
-require("prototypes.ores.titanium")
-require("prototypes.ores.zinc")
-require("prototypes.ores.quartz-rock")
-require("prototypes.ores.chromium-rock")
-require("prototypes.ores.aluminium-rock")
-require("prototypes.ores.copper-rock")
-require("prototypes.ores.salt-rock")
-require("prototypes.ores.iron-rock")
-require("prototypes.ores.coal-rock")
-require("prototypes.ores.lead-rock")
-require("prototypes.ores.nexelit-rock")
-require("prototypes.ores.nickel-rock")
-require("prototypes.ores.tin-rock")
-require("prototypes.ores.titanium-rock")
-require("prototypes.ores.uranium-rock")
-require("prototypes.ores.zinc-rock")
+require 'prototypes.ores.quartz'
+require 'prototypes.ores.raw-coal'
+require 'prototypes.ores.aluminium'
+require 'prototypes.ores.chromium'
+require 'prototypes.ores.lead'
+require 'prototypes.ores.nickel'
+require 'prototypes.ores.tin'
+require 'prototypes.ores.titanium'
+require 'prototypes.ores.zinc'
+require 'prototypes.ores.quartz-rock'
+require 'prototypes.ores.chromium-rock'
+require 'prototypes.ores.aluminium-rock'
+require 'prototypes.ores.copper-rock'
+require 'prototypes.ores.salt-rock'
+require 'prototypes.ores.iron-rock'
+require 'prototypes.ores.coal-rock'
+require 'prototypes.ores.lead-rock'
+require 'prototypes.ores.nexelit-rock'
+require 'prototypes.ores.nickel-rock'
+require 'prototypes.ores.tin-rock'
+require 'prototypes.ores.titanium-rock'
+require 'prototypes.ores.uranium-rock'
+require 'prototypes.ores.zinc-rock'
 
 --(( Technology ))--
-require("prototypes/technologies/machines")
-require("prototypes/technologies/quartz")
-require("prototypes/technologies/aluminium")
-require("prototypes/technologies/chromium")
-require("prototypes/technologies/copper")
-require("prototypes/technologies/iron")
-require("prototypes/technologies/gold")
-require("prototypes/technologies/coke")
-require("prototypes/technologies/coal")
-require("prototypes/technologies/lead")
-require("prototypes/technologies/nexelit")
-require("prototypes/technologies/nickel")
-require("prototypes/technologies/tin")
-require("prototypes/technologies/titanium")
-require("prototypes/technologies/uranium")
-require("prototypes/technologies/zinc")
-require("prototypes/technologies/smelters")
-require("prototypes/technologies/solder")
-require("prototypes/technologies/casting")
-require("prototypes/technologies/electrolysis")
-require("prototypes/technologies/nichrome")
-require("prototypes/technologies/pyrite")
-require("prototypes/technologies/big-mines")
-require("prototypes/technologies/salts")
-require("prototypes/technologies/starch")
-require("prototypes/technologies/aramid")
-require("prototypes/technologies/nitrogen")
-require("prototypes/technologies/alloys")
-require("prototypes/technologies/steel")
-require("prototypes/technologies/stainless-steel")
-require("prototypes/technologies/super-steel")
-require("prototypes/technologies/silver")
-require("prototypes/technologies/additives")
-require("prototypes/technologies/fuel-production")
-require("prototypes/technologies/mibc")
-require("prototypes/technologies/drill-head")
+require 'prototypes/technologies/machines'
+require 'prototypes/technologies/quartz'
+require 'prototypes/technologies/aluminium'
+require 'prototypes/technologies/chromium'
+require 'prototypes/technologies/copper'
+require 'prototypes/technologies/iron'
+require 'prototypes/technologies/gold'
+require 'prototypes/technologies/coke'
+require 'prototypes/technologies/coal'
+require 'prototypes/technologies/lead'
+require 'prototypes/technologies/nexelit'
+require 'prototypes/technologies/nickel'
+require 'prototypes/technologies/tin'
+require 'prototypes/technologies/titanium'
+require 'prototypes/technologies/uranium'
+require 'prototypes/technologies/zinc'
+require 'prototypes/technologies/smelters'
+require 'prototypes/technologies/solder'
+require 'prototypes/technologies/casting'
+require 'prototypes/technologies/electrolysis'
+require 'prototypes/technologies/nichrome'
+require 'prototypes/technologies/pyrite'
+require 'prototypes/technologies/big-mines'
+require 'prototypes/technologies/salts'
+require 'prototypes/technologies/starch'
+require 'prototypes/technologies/aramid'
+require 'prototypes/technologies/nitrogen'
+require 'prototypes/technologies/alloys'
+require 'prototypes/technologies/steel'
+require 'prototypes/technologies/stainless-steel'
+require 'prototypes/technologies/super-steel'
+require 'prototypes/technologies/silver'
+require 'prototypes/technologies/additives'
+require 'prototypes/technologies/fuel-production'
+require 'prototypes/technologies/mibc'
+require 'prototypes/technologies/drill-head'
 
 --(( BUILDINGS ))--
-require("prototypes/buildings/quartz-mine")
-require("prototypes/buildings/aluminium-mine")
-require("prototypes/buildings/chromium-mine")
-require("prototypes/buildings/scrubber-mk01")
-require("prototypes/buildings/scrubber-mk02")
-require("prototypes/buildings/scrubber-mk03")
-require("prototypes/buildings/scrubber-mk04")
-require("prototypes/buildings/flotation-cell-mk01")
-require("prototypes/buildings/flotation-cell-mk02")
-require("prototypes/buildings/flotation-cell-mk03")
-require("prototypes/buildings/flotation-cell-mk04")
-require("prototypes/buildings/wet-scrubber-mk01")
-require("prototypes/buildings/wet-scrubber-mk02")
-require("prototypes/buildings/wet-scrubber-mk03")
-require("prototypes/buildings/wet-scrubber-mk04")
-require("prototypes/buildings/hydroclassifier-mk01")
-require("prototypes/buildings/hydroclassifier-mk02")
-require("prototypes/buildings/hydroclassifier-mk03")
-require("prototypes/buildings/hydroclassifier-mk04")
-require("prototypes/buildings/impact-crusher-mk01")
-require("prototypes/buildings/impact-crusher-mk02")
-require("prototypes/buildings/impact-crusher-mk03")
-require("prototypes/buildings/impact-crusher-mk04")
-require("prototypes/buildings/electrolyzer-mk01")
-require("prototypes/buildings/electrolyzer-mk02")
-require("prototypes/buildings/electrolyzer-mk03")
-require("prototypes/buildings/electrolyzer-mk04")
-require("prototypes/buildings/casting-unit-mk01")
-require("prototypes/buildings/casting-unit-mk02")
-require("prototypes/buildings/casting-unit-mk03")
-require("prototypes/buildings/casting-unit-mk04")
-require("prototypes/buildings/leaching-station-mk01")
-require("prototypes/buildings/leaching-station-mk02")
-require("prototypes/buildings/leaching-station-mk03")
-require("prototypes/buildings/leaching-station-mk04")
-require("prototypes/buildings/bof-mk01")
-require("prototypes/buildings/bof-mk02")
-require("prototypes/buildings/bof-mk03")
-require("prototypes/buildings/bof-mk04")
-require("prototypes/buildings/eaf-mk01")
-require("prototypes/buildings/eaf-mk02")
-require("prototypes/buildings/eaf-mk03")
-require("prototypes/buildings/eaf-mk04")
-require("prototypes/buildings/sinter-unit")
-require("prototypes/buildings/drp")
-require("prototypes/buildings/salt-mine")
-require("prototypes/buildings/copper-mine")
-require("prototypes/buildings/iron-mine")
-require("prototypes/buildings/coal-mine")
-require("prototypes/buildings/lead-mine")
-require("prototypes/buildings/nexelit-mine")
-require("prototypes/buildings/nickel-mine")
-require("prototypes/buildings/tin-mine")
-require("prototypes/buildings/titanium-mine")
-require("prototypes/buildings/uranium-mine")
-require("prototypes/buildings/zinc-mine")
-require("prototypes/buildings/smelter-mk01")
-require("prototypes/buildings/smelter-mk02")
-require("prototypes/buildings/smelter-mk03")
-require("prototypes/buildings/smelter-mk04")
+require 'prototypes/buildings/quartz-mine'
+require 'prototypes/buildings/aluminium-mine'
+require 'prototypes/buildings/chromium-mine'
+require 'prototypes/buildings/scrubber-mk01'
+require 'prototypes/buildings/scrubber-mk02'
+require 'prototypes/buildings/scrubber-mk03'
+require 'prototypes/buildings/scrubber-mk04'
+require 'prototypes/buildings/flotation-cell-mk01'
+require 'prototypes/buildings/flotation-cell-mk02'
+require 'prototypes/buildings/flotation-cell-mk03'
+require 'prototypes/buildings/flotation-cell-mk04'
+require 'prototypes/buildings/wet-scrubber-mk01'
+require 'prototypes/buildings/wet-scrubber-mk02'
+require 'prototypes/buildings/wet-scrubber-mk03'
+require 'prototypes/buildings/wet-scrubber-mk04'
+require 'prototypes/buildings/hydroclassifier-mk01'
+require 'prototypes/buildings/hydroclassifier-mk02'
+require 'prototypes/buildings/hydroclassifier-mk03'
+require 'prototypes/buildings/hydroclassifier-mk04'
+require 'prototypes/buildings/impact-crusher-mk01'
+require 'prototypes/buildings/impact-crusher-mk02'
+require 'prototypes/buildings/impact-crusher-mk03'
+require 'prototypes/buildings/impact-crusher-mk04'
+require 'prototypes/buildings/electrolyzer-mk01'
+require 'prototypes/buildings/electrolyzer-mk02'
+require 'prototypes/buildings/electrolyzer-mk03'
+require 'prototypes/buildings/electrolyzer-mk04'
+require 'prototypes/buildings/casting-unit-mk01'
+require 'prototypes/buildings/casting-unit-mk02'
+require 'prototypes/buildings/casting-unit-mk03'
+require 'prototypes/buildings/casting-unit-mk04'
+require 'prototypes/buildings/leaching-station-mk01'
+require 'prototypes/buildings/leaching-station-mk02'
+require 'prototypes/buildings/leaching-station-mk03'
+require 'prototypes/buildings/leaching-station-mk04'
+require 'prototypes/buildings/bof-mk01'
+require 'prototypes/buildings/bof-mk02'
+require 'prototypes/buildings/bof-mk03'
+require 'prototypes/buildings/bof-mk04'
+require 'prototypes/buildings/eaf-mk01'
+require 'prototypes/buildings/eaf-mk02'
+require 'prototypes/buildings/eaf-mk03'
+require 'prototypes/buildings/eaf-mk04'
+require 'prototypes/buildings/sinter-unit'
+require 'prototypes/buildings/drp'
+require 'prototypes/buildings/salt-mine'
+require 'prototypes/buildings/copper-mine'
+require 'prototypes/buildings/iron-mine'
+require 'prototypes/buildings/coal-mine'
+require 'prototypes/buildings/lead-mine'
+require 'prototypes/buildings/nexelit-mine'
+require 'prototypes/buildings/nickel-mine'
+require 'prototypes/buildings/tin-mine'
+require 'prototypes/buildings/titanium-mine'
+require 'prototypes/buildings/uranium-mine'
+require 'prototypes/buildings/zinc-mine'
+require 'prototypes/buildings/smelter-mk01'
+require 'prototypes/buildings/smelter-mk02'
+require 'prototypes/buildings/smelter-mk03'
+require 'prototypes/buildings/smelter-mk04'
 
 --(( FLUIDs ))--
-require("prototypes/fluids/quartz-pulp-01")
-require("prototypes/fluids/quartz-pulp-02")
-require("prototypes/fluids/prepared-quartz")
-require("prototypes/fluids/high-grade-quartz-pulp")
-require("prototypes/fluids/molten-glass")
-require("prototypes/fluids/al-pulp-01")
-require("prototypes/fluids/al-pulp-02")
-require("prototypes/fluids/al-pulp-03")
-require("prototypes/fluids/al-pulp-03")
-require("prototypes/fluids/al-pulp-04")
-require("prototypes/fluids/molten-aluminium")
-require("prototypes/fluids/chromite-pulp-01")
-require("prototypes/fluids/chromite-pulp-02")
-require("prototypes/fluids/chromite-pulp-03")
-require("prototypes/fluids/chromite-pulp-04")
-require("prototypes/fluids/chromite-pulp-05")
-require("prototypes/fluids/chromite-pulp-06")
-require("prototypes/fluids/chromite-pulp-07")
-require("prototypes/fluids/chromite-solution")
-require("prototypes/fluids/chromite-mix")
-require("prototypes/fluids/chromite-fines")
-require("prototypes/fluids/chromite-concentrate")
-require("prototypes/fluids/chromium-rejects")
-require("prototypes/fluids/prepared-chromium")
-require("prototypes/fluids/molten-chromium")
-require("prototypes/fluids/gold-solution")
-require("prototypes/fluids/al-tailings")
-require("prototypes/fluids/alamac")
-require("prototypes/fluids/cresylic-acid")
-require("prototypes/fluids/aerofloat-15")
-require("prototypes/fluids/hydrogen")
-require("prototypes/fluids/chlorine")
-require("prototypes/fluids/oxygen")
-require("prototypes/fluids/hydrogen-chloride")
-require("prototypes/fluids/purest-nitrogen-gas")
-require("prototypes/fluids/nitrogen")
-require("prototypes/fluids/acid-solvent")
-require("prototypes/fluids/copper-pulp-01")
-require("prototypes/fluids/copper-pulp-02")
-require("prototypes/fluids/copper-pulp-03")
-require("prototypes/fluids/copper-pulp-04")
-require("prototypes/fluids/copper-solution")
-require("prototypes/fluids/copper-pregnant-solution")
-require("prototypes/fluids/molten-copper")
-require("prototypes/fluids/coke-oven-gas")
-require("prototypes/fluids/outlet-gas-1")
-require("prototypes/fluids/outlet-gas-2")
-require("prototypes/fluids/outlet-gas-3")
-require("prototypes/fluids/outlet-gas-4")
-require("prototypes/fluids/iron-slime")
-require("prototypes/fluids/iron-pulp-01")
-require("prototypes/fluids/iron-pulp-02")
-require("prototypes/fluids/iron-pulp-03")
-require("prototypes/fluids/iron-pulp-04")
-require("prototypes/fluids/iron-pulp-05")
-require("prototypes/fluids/iron-pulp-06")
---require("prototypes/fluids/iron-pulp-06-thick")
-require("prototypes/fluids/iron-pulp-07")
-require("prototypes/fluids/molten-iron")
-require("prototypes/fluids/petroleum-sulfonates")
-require("prototypes/fluids/xylenol")
-require("prototypes/fluids/kerosene")
-require("prototypes/fluids/fines-pulp")
-require("prototypes/fluids/high-ash-fines")
-require("prototypes/fluids/thickened-coal-fines")
-require("prototypes/fluids/coal-fines")
-require("prototypes/fluids/conditioned-fines")
-require("prototypes/fluids/coal-slime-overflow")
-require("prototypes/fluids/coal-under-pulp")
-require("prototypes/fluids/coal-pulp-01")
-require("prototypes/fluids/coal-pulp-02")
-require("prototypes/fluids/coal-pulp-03")
-require("prototypes/fluids/coal-pulp-04")
-require("prototypes/fluids/coal-pulp-05")
-require("prototypes/fluids/molten-lead")
-require("prototypes/fluids/molten-silver")
-require("prototypes/fluids/slz-pulp-01")
-require("prototypes/fluids/slz-pulp-02")
-require("prototypes/fluids/sl-01")
-require("prototypes/fluids/sl-02")
-require("prototypes/fluids/sl-03")
-require("prototypes/fluids/z3-reagent")
-require("prototypes/fluids/nexelit-pulp-01")
-require("prototypes/fluids/nexelit-pulp-02")
-require("prototypes/fluids/nexelit-pulp-03")
-require("prototypes/fluids/nexelit-pulp-04")
-require("prototypes/fluids/nexelit-refined-pulp")
-require("prototypes/fluids/nexelit-slurry")
-require("prototypes/fluids/molten-nexelit")
-require("prototypes/fluids/armac-12")
-require("prototypes/fluids/prepared-nickel-pulp")
-require("prototypes/fluids/nickel-pulp-01")
-require("prototypes/fluids/nickel-pulp-02")
-require("prototypes/fluids/nickel-pulp-03")
-require("prototypes/fluids/nickel-pulp-04")
-require("prototypes/fluids/nickel-overflow")
-require("prototypes/fluids/nickel-slime")
-require("prototypes/fluids/nickel-tailings")
-require("prototypes/fluids/nickel-prepared-solution")
-require("prototypes/fluids/molten-nickel")
-require("prototypes/fluids/molten-steel")
-require("prototypes/fluids/molten-stainless-steel")
-require("prototypes/fluids/molten-super-steel")
-require("prototypes/fluids/tin-slime")
-require("prototypes/fluids/tin-slime-overflow")
-require("prototypes/fluids/tin-middle-pulp")
-require("prototypes/fluids/tin-bottom-pulp")
-require("prototypes/fluids/tin-pulp-01")
-require("prototypes/fluids/tin-pulp-02")
-require("prototypes/fluids/tin-pulp-03")
-require("prototypes/fluids/tin-solution")
-require("prototypes/fluids/molten-tin")
-require("prototypes/fluids/mibc")
-require("prototypes/fluids/ti-pulp-01")
-require("prototypes/fluids/ti-pulp-02")
-require("prototypes/fluids/ti-pulp-03")
-require("prototypes/fluids/ti-pulp-04")
-require("prototypes/fluids/ti-pulp-05")
-require("prototypes/fluids/ti-pulp-06")
-require("prototypes/fluids/purified-ti-pulp")
-require("prototypes/fluids/ti-overflow-waste")
-require("prototypes/fluids/ti-solution")
-require("prototypes/fluids/ti-solution-02")
-require("prototypes/fluids/molten-titanium")
-require("prototypes/fluids/u-pulp-01")
-require("prototypes/fluids/u-pulp-02")
-require("prototypes/fluids/u-pulp-03")
-require("prototypes/fluids/u-rich-pulp")
-require("prototypes/fluids/u-83")
-require("prototypes/fluids/u-81")
-require("prototypes/fluids/u-79")
-require("prototypes/fluids/u-75")
-require("prototypes/fluids/u-73")
-require("prototypes/fluids/u-70")
-require("prototypes/fluids/u-65")
-require("prototypes/fluids/u-50")
-require("prototypes/fluids/u-45")
-require("prototypes/fluids/u-43")
-require("prototypes/fluids/u-40")
-require("prototypes/fluids/u-35")
-require("prototypes/fluids/u-33")
-require("prototypes/fluids/u-30")
-require("prototypes/fluids/u-25")
-require("prototypes/fluids/u-23")
-require("prototypes/fluids/u-20")
-require("prototypes/fluids/u-15")
-require("prototypes/fluids/zinc-pulp-01")
-require("prototypes/fluids/zinc-pulp-02")
-require("prototypes/fluids/zinc-pulp-03")
-require("prototypes/fluids/zinc-pulp-04")
-require("prototypes/fluids/zinc-overflow")
-require("prototypes/fluids/zinc-waste")
-require("prototypes/fluids/molten-zinc")
-require("prototypes/fluids/molten-solder")
+require 'prototypes/fluids/quartz-pulp-01'
+require 'prototypes/fluids/quartz-pulp-02'
+require 'prototypes/fluids/prepared-quartz'
+require 'prototypes/fluids/high-grade-quartz-pulp'
+require 'prototypes/fluids/molten-glass'
+require 'prototypes/fluids/al-pulp-01'
+require 'prototypes/fluids/al-pulp-02'
+require 'prototypes/fluids/al-pulp-03'
+require 'prototypes/fluids/al-pulp-03'
+require 'prototypes/fluids/al-pulp-04'
+require 'prototypes/fluids/molten-aluminium'
+require 'prototypes/fluids/chromite-pulp-01'
+require 'prototypes/fluids/chromite-pulp-02'
+require 'prototypes/fluids/chromite-pulp-03'
+require 'prototypes/fluids/chromite-pulp-04'
+require 'prototypes/fluids/chromite-pulp-05'
+require 'prototypes/fluids/chromite-pulp-06'
+require 'prototypes/fluids/chromite-pulp-07'
+require 'prototypes/fluids/chromite-solution'
+require 'prototypes/fluids/chromite-mix'
+require 'prototypes/fluids/chromite-fines'
+require 'prototypes/fluids/chromite-concentrate'
+require 'prototypes/fluids/chromium-rejects'
+require 'prototypes/fluids/prepared-chromium'
+require 'prototypes/fluids/molten-chromium'
+require 'prototypes/fluids/gold-solution'
+require 'prototypes/fluids/al-tailings'
+require 'prototypes/fluids/alamac'
+require 'prototypes/fluids/cresylic-acid'
+require 'prototypes/fluids/aerofloat-15'
+require 'prototypes/fluids/hydrogen'
+require 'prototypes/fluids/chlorine'
+require 'prototypes/fluids/oxygen'
+require 'prototypes/fluids/hydrogen-chloride'
+require 'prototypes/fluids/purest-nitrogen-gas'
+require 'prototypes/fluids/nitrogen'
+require 'prototypes/fluids/acid-solvent'
+require 'prototypes/fluids/copper-pulp-01'
+require 'prototypes/fluids/copper-pulp-02'
+require 'prototypes/fluids/copper-pulp-03'
+require 'prototypes/fluids/copper-pulp-04'
+require 'prototypes/fluids/copper-solution'
+require 'prototypes/fluids/copper-pregnant-solution'
+require 'prototypes/fluids/molten-copper'
+require 'prototypes/fluids/coke-oven-gas'
+require 'prototypes/fluids/outlet-gas-1'
+require 'prototypes/fluids/outlet-gas-2'
+require 'prototypes/fluids/outlet-gas-3'
+require 'prototypes/fluids/outlet-gas-4'
+require 'prototypes/fluids/iron-slime'
+require 'prototypes/fluids/iron-pulp-01'
+require 'prototypes/fluids/iron-pulp-02'
+require 'prototypes/fluids/iron-pulp-03'
+require 'prototypes/fluids/iron-pulp-04'
+require 'prototypes/fluids/iron-pulp-05'
+require 'prototypes/fluids/iron-pulp-06'
+require 'prototypes/fluids/iron-pulp-07'
+require 'prototypes/fluids/molten-iron'
+require 'prototypes/fluids/petroleum-sulfonates'
+require 'prototypes/fluids/xylenol'
+require 'prototypes/fluids/kerosene'
+require 'prototypes/fluids/fines-pulp'
+require 'prototypes/fluids/high-ash-fines'
+require 'prototypes/fluids/thickened-coal-fines'
+require 'prototypes/fluids/coal-fines'
+require 'prototypes/fluids/conditioned-fines'
+require 'prototypes/fluids/coal-slime-overflow'
+require 'prototypes/fluids/coal-under-pulp'
+require 'prototypes/fluids/coal-pulp-01'
+require 'prototypes/fluids/coal-pulp-02'
+require 'prototypes/fluids/coal-pulp-03'
+require 'prototypes/fluids/coal-pulp-04'
+require 'prototypes/fluids/coal-pulp-05'
+require 'prototypes/fluids/molten-lead'
+require 'prototypes/fluids/molten-silver'
+require 'prototypes/fluids/slz-pulp-01'
+require 'prototypes/fluids/slz-pulp-02'
+require 'prototypes/fluids/sl-01'
+require 'prototypes/fluids/sl-02'
+require 'prototypes/fluids/sl-03'
+require 'prototypes/fluids/z3-reagent'
+require 'prototypes/fluids/nexelit-pulp-01'
+require 'prototypes/fluids/nexelit-pulp-02'
+require 'prototypes/fluids/nexelit-pulp-03'
+require 'prototypes/fluids/nexelit-pulp-04'
+require 'prototypes/fluids/nexelit-refined-pulp'
+require 'prototypes/fluids/nexelit-slurry'
+require 'prototypes/fluids/molten-nexelit'
+require 'prototypes/fluids/armac-12'
+require 'prototypes/fluids/prepared-nickel-pulp'
+require 'prototypes/fluids/nickel-pulp-01'
+require 'prototypes/fluids/nickel-pulp-02'
+require 'prototypes/fluids/nickel-pulp-03'
+require 'prototypes/fluids/nickel-pulp-04'
+require 'prototypes/fluids/nickel-overflow'
+require 'prototypes/fluids/nickel-slime'
+require 'prototypes/fluids/nickel-tailings'
+require 'prototypes/fluids/nickel-prepared-solution'
+require 'prototypes/fluids/molten-nickel'
+require 'prototypes/fluids/molten-steel'
+require 'prototypes/fluids/molten-stainless-steel'
+require 'prototypes/fluids/molten-super-steel'
+require 'prototypes/fluids/tin-slime'
+require 'prototypes/fluids/tin-slime-overflow'
+require 'prototypes/fluids/tin-middle-pulp'
+require 'prototypes/fluids/tin-bottom-pulp'
+require 'prototypes/fluids/tin-pulp-01'
+require 'prototypes/fluids/tin-pulp-02'
+require 'prototypes/fluids/tin-pulp-03'
+require 'prototypes/fluids/tin-solution'
+require 'prototypes/fluids/molten-tin'
+require 'prototypes/fluids/mibc'
+require 'prototypes/fluids/ti-pulp-01'
+require 'prototypes/fluids/ti-pulp-02'
+require 'prototypes/fluids/ti-pulp-03'
+require 'prototypes/fluids/ti-pulp-04'
+require 'prototypes/fluids/ti-pulp-05'
+require 'prototypes/fluids/ti-pulp-06'
+require 'prototypes/fluids/purified-ti-pulp'
+require 'prototypes/fluids/ti-overflow-waste'
+require 'prototypes/fluids/ti-solution'
+require 'prototypes/fluids/ti-solution-02'
+require 'prototypes/fluids/molten-titanium'
+require 'prototypes/fluids/u-pulp-01'
+require 'prototypes/fluids/u-pulp-02'
+require 'prototypes/fluids/u-pulp-03'
+require 'prototypes/fluids/u-rich-pulp'
+require 'prototypes/fluids/u-83'
+require 'prototypes/fluids/u-81'
+require 'prototypes/fluids/u-79'
+require 'prototypes/fluids/u-75'
+require 'prototypes/fluids/u-73'
+require 'prototypes/fluids/u-70'
+require 'prototypes/fluids/u-65'
+require 'prototypes/fluids/u-50'
+require 'prototypes/fluids/u-45'
+require 'prototypes/fluids/u-43'
+require 'prototypes/fluids/u-40'
+require 'prototypes/fluids/u-35'
+require 'prototypes/fluids/u-33'
+require 'prototypes/fluids/u-30'
+require 'prototypes/fluids/u-25'
+require 'prototypes/fluids/u-23'
+require 'prototypes/fluids/u-20'
+require 'prototypes/fluids/u-15'
+require 'prototypes/fluids/zinc-pulp-01'
+require 'prototypes/fluids/zinc-pulp-02'
+require 'prototypes/fluids/zinc-pulp-03'
+require 'prototypes/fluids/zinc-pulp-04'
+require 'prototypes/fluids/zinc-overflow'
+require 'prototypes/fluids/zinc-waste'
+require 'prototypes/fluids/molten-zinc'
+require 'prototypes/fluids/molten-solder'
 
 if mods['pyfusionenergy'] then
-    require("prototypes/fluids/u-waste")
-    require("prototypes/fluids/vanadium-mixture")
+    require 'prototypes/fluids/u-waste'
+    require 'prototypes/fluids/vanadium-mixture'
 end
 
 --Pycoal fluids
-require("__pycoalprocessing__/prototypes/fluids/diesel")
+require '__pycoalprocessing__/prototypes/fluids/diesel'
 
 --pyfusion fluids
-if mods["pyfusionenergy"] then
-require("__pyfusionenergy__/prototypes/fluids/liquid-nitrogen")
+if mods['pyfusionenergy'] then
+require '__pyfusionenergy__/prototypes/fluids/liquid-nitrogen'
 end
 
 --(( RECIPES ))--
-require("prototypes/recipes/recipes")
-require("prototypes/recipes/recipes-quartz")
-require("prototypes/recipes/recipes-aluminium")
-require("prototypes/recipes/recipes-chromium")
-require("prototypes/recipes/recipes-copper")
-require("prototypes/recipes/recipes-iron")
-require("prototypes/recipes/recipes-gold")
-require("prototypes/recipes/recipes-coke")
-require("prototypes/recipes/recipes-coal")
-require("prototypes/recipes/recipes-lead")
-require("prototypes/recipes/recipes-silver")
-require("prototypes/recipes/recipes-nexelit")
-require("prototypes/recipes/recipes-nickel")
-require("prototypes/recipes/recipes-steel")
-require("prototypes/recipes/recipes-tin")
-require("prototypes/recipes/recipes-titanium")
-require("prototypes/recipes/recipes-uranium")
-require("prototypes/recipes/recipes-zinc")
-require("prototypes/recipes/recipes-casting")
-require("prototypes/recipes/recipes-solder")
+require 'prototypes/recipes/recipes'
+require 'prototypes/recipes/recipes-quartz'
+require 'prototypes/recipes/recipes-aluminium'
+require 'prototypes/recipes/recipes-chromium'
+require 'prototypes/recipes/recipes-copper'
+require 'prototypes/recipes/recipes-iron'
+require 'prototypes/recipes/recipes-gold'
+require 'prototypes/recipes/recipes-coke'
+require 'prototypes/recipes/recipes-coal'
+require 'prototypes/recipes/recipes-lead'
+require 'prototypes/recipes/recipes-silver'
+require 'prototypes/recipes/recipes-nexelit'
+require 'prototypes/recipes/recipes-nickel'
+require 'prototypes/recipes/recipes-steel'
+require 'prototypes/recipes/recipes-tin'
+require 'prototypes/recipes/recipes-titanium'
+require 'prototypes/recipes/recipes-uranium'
+require 'prototypes/recipes/recipes-zinc'
+require 'prototypes/recipes/recipes-casting'
+require 'prototypes/recipes/recipes-solder'
 
-if mods["pyfusionenergy"] then
-    require("prototypes/recipes/pyfusionenergy-recipes")
+if mods['pyfusionenergy'] then
+    require 'prototypes/recipes/pyfusionenergy-recipes'
 end
 
-if mods["pyhightech"] then
-    require("prototypes/recipes/pyhightech-recipes")
+if mods['pyhightech'] then
+    require 'prototypes/recipes/pyhightech-recipes'
 end
 
 --(( OTHERS ))--
 
-require("prototypes/robots/py-construction-robot-02")
-require("prototypes/robots/py-logistic-robot-02")
+require 'prototypes/robots/py-construction-robot-02'
+require 'prototypes/robots/py-logistic-robot-02'
 
-data.raw.fluid["coke-oven-gas"].fuel_value = "1MJ"
-data.raw.fluid["kerosene"].fuel_value = "1.5MJ"
-data.raw.fluid["hydrogen"].fuel_value = "20KJ"
-data.raw.fluid["outlet-gas-01"].fuel_value = "0.5MJ"
-data.raw.fluid["outlet-gas-02"].fuel_value = "0.5MJ"
-data.raw.fluid["outlet-gas-03"].fuel_value = "0.5MJ"
-data.raw.fluid["outlet-gas-04"].fuel_value = "0.5MJ"
-data.raw.fluid["high-ash-fines"].fuel_value = "0.5MJ"
+data.raw.fluid['coke-oven-gas'].fuel_value = '1MJ'
+data.raw.fluid['kerosene'].fuel_value = '1.5MJ'
+data.raw.fluid['hydrogen'].fuel_value = '20KJ'
+data.raw.fluid['outlet-gas-01'].fuel_value = '0.5MJ'
+data.raw.fluid['outlet-gas-02'].fuel_value = '0.5MJ'
+data.raw.fluid['outlet-gas-03'].fuel_value = '0.5MJ'
+data.raw.fluid['outlet-gas-04'].fuel_value = '0.5MJ'
+data.raw.fluid['high-ash-fines'].fuel_value = '0.5MJ'
 data.raw.fluid['diesel'].fuel_value = '1.5MJ'
 
 table.insert(data.raw['fluid-turret']['flamethrower-turret'].attack_parameters.fluids, {type = 'diesel', damage_modifier = 2})
 table.insert(data.raw['fluid-turret']['flamethrower-turret'].attack_parameters.fluids, {type = 'kerosene', damage_modifier = 2})
 
-if mods["pyhightech"] then
-    require("prototypes.ores.phosphate-rock-02")
-    require("prototypes/buildings/phosphate-mine-02")
+if mods['pyhightech'] then
+    require 'prototypes.ores.phosphate-rock-02'
+    require 'prototypes/buildings/phosphate-mine-02'
 end
diff --git a/locale/en/locale.cfg b/locale/en/locale.cfg
index 69b3e9c6..faecf8a2 100644
--- a/locale/en/locale.cfg
+++ b/locale/en/locale.cfg
@@ -89,10 +89,10 @@ grade-1-lead=Lead (grade 1)
 grade-2-lead=Lead (grade 2)
 grade-3-lead=Lead (grade 3)
 grade-4-lead=Lead (grade 4)
-lead-dust=Lead dust
-lead-refined-dust=Refined lead dust (stage 1)
-lead-refined-dust-02=Refined lead dust (stage 2)
-lead-refined-dust-03=Refined lead dust (stage 3)
+lead-dust=Silver-lead dust
+lead-refined-dust=Refined silver-lead dust (stage 1)
+lead-refined-dust-02=Refined silver-lead dust (stage 2)
+lead-refined-dust-03=Refined silver-lead dust (stage 3)
 sl-concentrate=Silver-lead concentrate
 high-grade-lead=High-grade lead
 high-grade-silver=High-grade silver
diff --git a/prototypes/buildings/bof-mk01.lua b/prototypes/buildings/bof-mk01.lua
index 23ab5e41..61dd2c19 100644
--- a/prototypes/buildings/bof-mk01.lua
+++ b/prototypes/buildings/bof-mk01.lua
@@ -83,12 +83,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/bof-mk01/off.png",
-                --priority = "high",
                 width = 256,
                 height = 288,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(17, -32)
             },
         }
@@ -130,47 +127,47 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {3.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-3.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 4.0}}}
         },
diff --git a/prototypes/buildings/bof-mk02.lua b/prototypes/buildings/bof-mk02.lua
index 66564d5d..629e28aa 100644
--- a/prototypes/buildings/bof-mk02.lua
+++ b/prototypes/buildings/bof-mk02.lua
@@ -84,12 +84,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/bof-mk01/off-mk02.png",
-                --priority = "high",
                 width = 256,
                 height = 288,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(17, -32)
             },
         }
@@ -131,47 +128,47 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {3.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-3.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 4.0}}}
         },
diff --git a/prototypes/buildings/bof-mk03.lua b/prototypes/buildings/bof-mk03.lua
index 4f64ab19..c2b88dad 100644
--- a/prototypes/buildings/bof-mk03.lua
+++ b/prototypes/buildings/bof-mk03.lua
@@ -85,12 +85,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/bof-mk01/off-mk03.png",
-                --priority = "high",
                 width = 256,
                 height = 288,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(17, -32)
             },
         }
@@ -132,47 +129,47 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {3.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-3.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 4.0}}}
         },
diff --git a/prototypes/buildings/bof-mk04.lua b/prototypes/buildings/bof-mk04.lua
index 108621d8..022d13e6 100644
--- a/prototypes/buildings/bof-mk04.lua
+++ b/prototypes/buildings/bof-mk04.lua
@@ -84,12 +84,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/bof-mk01/off-mk04.png",
-                --priority = "high",
                 width = 256,
                 height = 288,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(17, -32)
             },
         }
@@ -131,47 +128,47 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {3.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-3.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 4.0}}}
         },
diff --git a/prototypes/buildings/casting-unit-mk01.lua b/prototypes/buildings/casting-unit-mk01.lua
index 356d04e9..b880b1cf 100644
--- a/prototypes/buildings/casting-unit-mk01.lua
+++ b/prototypes/buildings/casting-unit-mk01.lua
@@ -57,12 +57,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/casting-unit-mk01/off.png",
-                --priority = "high",
                 width = 238,
                 height = 234,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(7, -5)
             },
         }
@@ -88,40 +85,40 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, 4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {4.0, 0.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {4.0, 2.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-4.0, 0.0}}}
         },
diff --git a/prototypes/buildings/casting-unit-mk02.lua b/prototypes/buildings/casting-unit-mk02.lua
index 04475e21..fa5caa62 100644
--- a/prototypes/buildings/casting-unit-mk02.lua
+++ b/prototypes/buildings/casting-unit-mk02.lua
@@ -58,12 +58,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/casting-unit-mk01/off-mk02.png",
-                --priority = "high",
                 width = 238,
                 height = 234,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(7, -5)
             },
         }
@@ -89,40 +86,40 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, 4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {4.0, 0.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {4.0, 2.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-4.0, 0.0}}}
         },
diff --git a/prototypes/buildings/casting-unit-mk03.lua b/prototypes/buildings/casting-unit-mk03.lua
index 0f24b608..57eb8a1f 100644
--- a/prototypes/buildings/casting-unit-mk03.lua
+++ b/prototypes/buildings/casting-unit-mk03.lua
@@ -59,12 +59,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/casting-unit-mk01/off-mk03.png",
-                --priority = "high",
                 width = 238,
                 height = 234,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(7, -5)
             },
         }
@@ -90,40 +87,40 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, 4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {4.0, 0.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {4.0, 2.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-4.0, 0.0}}}
         },
diff --git a/prototypes/buildings/casting-unit-mk04.lua b/prototypes/buildings/casting-unit-mk04.lua
index be272ab3..8d329ef7 100644
--- a/prototypes/buildings/casting-unit-mk04.lua
+++ b/prototypes/buildings/casting-unit-mk04.lua
@@ -58,12 +58,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/casting-unit-mk01/off-mk04.png",
-                --priority = "high",
                 width = 238,
                 height = 234,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(7, -5)
             },
         }
@@ -89,40 +86,40 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, 4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {4.0, 0.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {4.0, 2.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-4.0, 0.0}}}
         },
diff --git a/prototypes/buildings/drp.lua b/prototypes/buildings/drp.lua
index ccbf6015..0ef47fbc 100644
--- a/prototypes/buildings/drp.lua
+++ b/prototypes/buildings/drp.lua
@@ -56,7 +56,6 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/drp/down.png",
-                --priority = "high",
                 width = 160,
                 height = 160,
                 line_length = 12,
@@ -66,7 +65,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/drp/up.png",
-                --priority = "high",
                 width = 160,
                 height = 160,
                 line_length = 12,
@@ -76,7 +74,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/drp/sh.png",
-                --priority = "high",
                 width = 192,
                 height = 128,
                 line_length = 10,
@@ -91,31 +88,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {0.0, -3.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {0.0, 3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {3.0, 0.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-3.0, 0.0}}}
         },
diff --git a/prototypes/buildings/eaf-mk01.lua b/prototypes/buildings/eaf-mk01.lua
index 5c62cd93..402807c1 100644
--- a/prototypes/buildings/eaf-mk01.lua
+++ b/prototypes/buildings/eaf-mk01.lua
@@ -71,12 +71,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/eaf-mk01/off.png",
-                --priority = "high",
                 width = 160,
                 height = 192,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -16)
             },
         }
@@ -102,31 +99,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -3.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 3.0}}}
         },
diff --git a/prototypes/buildings/eaf-mk02.lua b/prototypes/buildings/eaf-mk02.lua
index c519b0ca..5c18124c 100644
--- a/prototypes/buildings/eaf-mk02.lua
+++ b/prototypes/buildings/eaf-mk02.lua
@@ -72,12 +72,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/eaf-mk01/off-mk02.png",
-                --priority = "high",
                 width = 160,
                 height = 192,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -16)
             },
         }
@@ -103,31 +100,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -3.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 3.0}}}
         },
diff --git a/prototypes/buildings/eaf-mk03.lua b/prototypes/buildings/eaf-mk03.lua
index 0ed0d760..a8937313 100644
--- a/prototypes/buildings/eaf-mk03.lua
+++ b/prototypes/buildings/eaf-mk03.lua
@@ -72,12 +72,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/eaf-mk01/off-mk03.png",
-                --priority = "high",
                 width = 160,
                 height = 192,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -16)
             },
         }
@@ -103,31 +100,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -3.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 3.0}}}
         },
diff --git a/prototypes/buildings/eaf-mk04.lua b/prototypes/buildings/eaf-mk04.lua
index 163bccc7..fc19ef41 100644
--- a/prototypes/buildings/eaf-mk04.lua
+++ b/prototypes/buildings/eaf-mk04.lua
@@ -71,12 +71,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/eaf-mk01/off-mk04.png",
-                --priority = "high",
                 width = 160,
                 height = 192,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -16)
             },
         }
@@ -102,31 +99,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -3.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 3.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 3.0}}}
         },
diff --git a/prototypes/buildings/electrolyzer-mk01.lua b/prototypes/buildings/electrolyzer-mk01.lua
index 37a35fd5..488111c4 100644
--- a/prototypes/buildings/electrolyzer-mk01.lua
+++ b/prototypes/buildings/electrolyzer-mk01.lua
@@ -59,19 +59,14 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/electrolyzer-mk01/off.png",
                 width = 189,
                 height = 192,
-                --line_length = 9,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, 0)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/electrolyzer-mk01/shadow.png",
-                --priority = "high",
                 width = 29,
                 height = 192,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(94, 0)
             }
@@ -81,46 +76,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/electrolyzer-mk02.lua b/prototypes/buildings/electrolyzer-mk02.lua
index 7bd4dbf5..938efcf3 100644
--- a/prototypes/buildings/electrolyzer-mk02.lua
+++ b/prototypes/buildings/electrolyzer-mk02.lua
@@ -59,19 +59,14 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/electrolyzer-mk01/off-mk02.png",
                 width = 189,
                 height = 192,
-                --line_length = 9,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, 0)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/electrolyzer-mk01/shadow.png",
-                --priority = "high",
                 width = 29,
                 height = 192,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(94, 0)
             }
@@ -81,46 +76,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/electrolyzer-mk03.lua b/prototypes/buildings/electrolyzer-mk03.lua
index e0625ee2..a34c9bb4 100644
--- a/prototypes/buildings/electrolyzer-mk03.lua
+++ b/prototypes/buildings/electrolyzer-mk03.lua
@@ -60,19 +60,14 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/electrolyzer-mk01/off-mk03.png",
                 width = 189,
                 height = 192,
-                --line_length = 9,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, 0)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/electrolyzer-mk01/shadow.png",
-                --priority = "high",
                 width = 29,
                 height = 192,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(94, 0)
             }
@@ -82,46 +77,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/electrolyzer-mk04.lua b/prototypes/buildings/electrolyzer-mk04.lua
index 706defa2..022d6741 100644
--- a/prototypes/buildings/electrolyzer-mk04.lua
+++ b/prototypes/buildings/electrolyzer-mk04.lua
@@ -59,19 +59,14 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/electrolyzer-mk01/off-mk04.png",
                 width = 189,
                 height = 192,
-                --line_length = 9,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, 0)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/electrolyzer-mk01/shadow.png",
-                --priority = "high",
                 width = 29,
                 height = 192,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(94, 0)
             }
@@ -81,46 +76,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/flotation-cell-mk01.lua b/prototypes/buildings/flotation-cell-mk01.lua
index ff881416..8773c572 100644
--- a/prototypes/buildings/flotation-cell-mk01.lua
+++ b/prototypes/buildings/flotation-cell-mk01.lua
@@ -56,22 +56,16 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/flotation-cell-mk01/off-mk01.png",
-                --priority = "high",
                 width = 192,
                 height = 229,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(-1, -19)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/flotation-cell-mk01/sh.png",
-                --priority = "high",
                 width = 143,
                 height = 172,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(42, 10)
             }
@@ -98,46 +92,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/flotation-cell-mk02.lua b/prototypes/buildings/flotation-cell-mk02.lua
index 2a3036f7..cf813a96 100644
--- a/prototypes/buildings/flotation-cell-mk02.lua
+++ b/prototypes/buildings/flotation-cell-mk02.lua
@@ -59,22 +59,16 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/flotation-cell-mk01/off-mk02.png",
-                --priority = "high",
                 width = 192,
                 height = 229,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(-1, -19)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/flotation-cell-mk01/sh.png",
-                --priority = "high",
                 width = 143,
                 height = 172,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(42, 10)
             }
@@ -101,46 +95,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/flotation-cell-mk03.lua b/prototypes/buildings/flotation-cell-mk03.lua
index b9bdb3e9..f7553f2b 100644
--- a/prototypes/buildings/flotation-cell-mk03.lua
+++ b/prototypes/buildings/flotation-cell-mk03.lua
@@ -59,22 +59,16 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/flotation-cell-mk01/off-mk03.png",
-                --priority = "high",
                 width = 192,
                 height = 229,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(-1, -19)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/flotation-cell-mk01/sh.png",
-                --priority = "high",
                 width = 143,
                 height = 172,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(42, 10)
             }
@@ -101,46 +95,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/flotation-cell-mk04.lua b/prototypes/buildings/flotation-cell-mk04.lua
index 5e330517..875365b3 100644
--- a/prototypes/buildings/flotation-cell-mk04.lua
+++ b/prototypes/buildings/flotation-cell-mk04.lua
@@ -58,22 +58,16 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/flotation-cell-mk01/off-mk04.png",
-                --priority = "high",
                 width = 192,
                 height = 229,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(-1, -19)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/flotation-cell-mk01/sh.png",
-                --priority = "high",
                 width = 143,
                 height = 172,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(42, 10)
             }
@@ -100,46 +94,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/hydroclassifier-mk01.lua b/prototypes/buildings/hydroclassifier-mk01.lua
index 185bbb71..629f7338 100644
--- a/prototypes/buildings/hydroclassifier-mk01.lua
+++ b/prototypes/buildings/hydroclassifier-mk01.lua
@@ -57,7 +57,6 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h1.png",
-                --priority = "high",
                 width = 96,
                 height = 227,
                 line_length = 21,
@@ -67,7 +66,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h2.png",
-                --priority = "high",
                 width = 96,
                 height = 227,
                 line_length = 21,
@@ -77,7 +75,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h3.png",
-                --priority = "high",
                 width = 32,
                 height = 227,
                 line_length = 21,
@@ -87,7 +84,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/shadow.png",
-                --priority = "high",
                 width = 96,
                 height = 222,
                 line_length = 21,
@@ -102,46 +98,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {2.0, 4.0}}}
         },
diff --git a/prototypes/buildings/hydroclassifier-mk02.lua b/prototypes/buildings/hydroclassifier-mk02.lua
index ed418808..36558f14 100644
--- a/prototypes/buildings/hydroclassifier-mk02.lua
+++ b/prototypes/buildings/hydroclassifier-mk02.lua
@@ -57,7 +57,6 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h1-mk02.png",
-                --priority = "high",
                 width = 96,
                 height = 227,
                 line_length = 21,
@@ -67,7 +66,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h2-mk02.png",
-                --priority = "high",
                 width = 96,
                 height = 227,
                 line_length = 21,
@@ -77,7 +75,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h3-mk03.png",
-                --priority = "high",
                 width = 32,
                 height = 227,
                 line_length = 21,
@@ -87,7 +84,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/shadow.png",
-                --priority = "high",
                 width = 96,
                 height = 222,
                 line_length = 21,
@@ -102,46 +98,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {2.0, 4.0}}}
         },
diff --git a/prototypes/buildings/hydroclassifier-mk03.lua b/prototypes/buildings/hydroclassifier-mk03.lua
index 82bf3895..447620ed 100644
--- a/prototypes/buildings/hydroclassifier-mk03.lua
+++ b/prototypes/buildings/hydroclassifier-mk03.lua
@@ -58,7 +58,6 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h1-mk03.png",
-                --priority = "high",
                 width = 96,
                 height = 227,
                 line_length = 21,
@@ -68,7 +67,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h2-mk03.png",
-                --priority = "high",
                 width = 96,
                 height = 227,
                 line_length = 21,
@@ -78,7 +76,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h3-mk03.png",
-                --priority = "high",
                 width = 32,
                 height = 227,
                 line_length = 21,
@@ -88,7 +85,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/shadow.png",
-                --priority = "high",
                 width = 96,
                 height = 222,
                 line_length = 21,
@@ -103,46 +99,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {2.0, 4.0}}}
         },
diff --git a/prototypes/buildings/hydroclassifier-mk04.lua b/prototypes/buildings/hydroclassifier-mk04.lua
index 1b2c24a1..4cd34f8b 100644
--- a/prototypes/buildings/hydroclassifier-mk04.lua
+++ b/prototypes/buildings/hydroclassifier-mk04.lua
@@ -57,7 +57,6 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h1-mk04.png",
-                --priority = "high",
                 width = 96,
                 height = 227,
                 line_length = 21,
@@ -67,7 +66,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h2-mk04.png",
-                --priority = "high",
                 width = 96,
                 height = 227,
                 line_length = 21,
@@ -77,7 +75,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/h3-mk04.png",
-                --priority = "high",
                 width = 32,
                 height = 227,
                 line_length = 21,
@@ -87,7 +84,6 @@ ENTITY {
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/hydroclassifier-mk01/shadow.png",
-                --priority = "high",
                 width = 96,
                 height = 222,
                 line_length = 21,
@@ -102,46 +98,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {2.0, 4.0}}}
         },
diff --git a/prototypes/buildings/impact-crusher-mk01.lua b/prototypes/buildings/impact-crusher-mk01.lua
index e839412f..64ac2369 100644
--- a/prototypes/buildings/impact-crusher-mk01.lua
+++ b/prototypes/buildings/impact-crusher-mk01.lua
@@ -60,18 +60,14 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/impact-crusher-mk01/off.png",
                 width = 192,
                 height = 224,
-                --line_length = 9,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -16)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/impact-crusher-mk01/shadow.png",
                 width = 202,
                 height = 170,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 2,
                 draw_as_shadow = true,
                 shift = util.by_pixel(8, 10)
             }
diff --git a/prototypes/buildings/impact-crusher-mk02.lua b/prototypes/buildings/impact-crusher-mk02.lua
index da1cbb40..4e68394f 100644
--- a/prototypes/buildings/impact-crusher-mk02.lua
+++ b/prototypes/buildings/impact-crusher-mk02.lua
@@ -60,18 +60,14 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/impact-crusher-mk01/off-mk02.png",
                 width = 192,
                 height = 224,
-                --line_length = 9,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -16)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/impact-crusher-mk01/shadow.png",
                 width = 202,
                 height = 170,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 2,
                 draw_as_shadow = true,
                 shift = util.by_pixel(8, 10)
             }
diff --git a/prototypes/buildings/impact-crusher-mk03.lua b/prototypes/buildings/impact-crusher-mk03.lua
index d7ef815b..9d18d7c5 100644
--- a/prototypes/buildings/impact-crusher-mk03.lua
+++ b/prototypes/buildings/impact-crusher-mk03.lua
@@ -60,18 +60,14 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/impact-crusher-mk01/off-mk03.png",
                 width = 192,
                 height = 224,
-                --line_length = 9,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -16)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/impact-crusher-mk01/shadow.png",
                 width = 202,
                 height = 170,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 2,
                 draw_as_shadow = true,
                 shift = util.by_pixel(8, 10)
             }
diff --git a/prototypes/buildings/impact-crusher-mk04.lua b/prototypes/buildings/impact-crusher-mk04.lua
index c5faecd6..e838d87b 100644
--- a/prototypes/buildings/impact-crusher-mk04.lua
+++ b/prototypes/buildings/impact-crusher-mk04.lua
@@ -58,18 +58,14 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/impact-crusher-mk01/off-mk04.png",
                 width = 192,
                 height = 224,
-                --line_length = 9,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -16)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/impact-crusher-mk01/shadow.png",
                 width = 202,
                 height = 170,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 2,
                 draw_as_shadow = true,
                 shift = util.by_pixel(8, 10)
             }
diff --git a/prototypes/buildings/leaching-station-mk01.lua b/prototypes/buildings/leaching-station-mk01.lua
index caa07d76..e9ff5e43 100644
--- a/prototypes/buildings/leaching-station-mk01.lua
+++ b/prototypes/buildings/leaching-station-mk01.lua
@@ -56,12 +56,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/leaching-station-mk01/off.png",
-                --priority = "high",
                 width = 224,
                 height = 233,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -5)
             },
         }
@@ -76,7 +73,6 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/leaching-station-mk01/on.png",
                 --priority = "extra-high",
                 frame_count = 1,
-                --line_length = 2,
                 width = 224,
                 height = 233,
                 --animation_speed = 0.4
@@ -87,31 +83,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {4.0, -2.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-4.0, 2.0}}}
         },
diff --git a/prototypes/buildings/leaching-station-mk02.lua b/prototypes/buildings/leaching-station-mk02.lua
index 690d9ad7..5898424f 100644
--- a/prototypes/buildings/leaching-station-mk02.lua
+++ b/prototypes/buildings/leaching-station-mk02.lua
@@ -58,12 +58,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/leaching-station-mk01/off-mk02.png",
-                --priority = "high",
                 width = 224,
                 height = 233,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -5)
             },
         }
@@ -78,7 +75,6 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/leaching-station-mk01/on-mk02.png",
                 --priority = "extra-high",
                 frame_count = 1,
-                --line_length = 2,
                 width = 224,
                 height = 233,
                 --animation_speed = 0.4
@@ -89,31 +85,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {4.0, -2.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-4.0, 2.0}}}
         },
diff --git a/prototypes/buildings/leaching-station-mk03.lua b/prototypes/buildings/leaching-station-mk03.lua
index 7e06133e..fbddc0d6 100644
--- a/prototypes/buildings/leaching-station-mk03.lua
+++ b/prototypes/buildings/leaching-station-mk03.lua
@@ -58,12 +58,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/leaching-station-mk01/off-mk03.png",
-                --priority = "high",
                 width = 224,
                 height = 233,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -5)
             },
         }
@@ -78,7 +75,6 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/leaching-station-mk01/on-mk03.png",
                 --priority = "extra-high",
                 frame_count = 1,
-                --line_length = 2,
                 width = 224,
                 height = 233,
                 --animation_speed = 0.4
@@ -89,31 +85,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {4.0, -2.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-4.0, 2.0}}}
         },
diff --git a/prototypes/buildings/leaching-station-mk04.lua b/prototypes/buildings/leaching-station-mk04.lua
index d99eb670..19fef09d 100644
--- a/prototypes/buildings/leaching-station-mk04.lua
+++ b/prototypes/buildings/leaching-station-mk04.lua
@@ -57,12 +57,9 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/leaching-station-mk01/off-mk04.png",
-                --priority = "high",
                 width = 224,
                 height = 233,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -5)
             },
         }
@@ -77,7 +74,6 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/leaching-station-mk01/on-mk04.png",
                 --priority = "extra-high",
                 frame_count = 1,
-                --line_length = 2,
                 width = 224,
                 height = 233,
                 --animation_speed = 0.4
@@ -88,31 +84,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {4.0, -2.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-4.0, 2.0}}}
         },
diff --git a/prototypes/buildings/scrubber-mk01.lua b/prototypes/buildings/scrubber-mk01.lua
index f30afd67..d07b8934 100644
--- a/prototypes/buildings/scrubber-mk01.lua
+++ b/prototypes/buildings/scrubber-mk01.lua
@@ -79,46 +79,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {2.0, 4.0}}}
         },
diff --git a/prototypes/buildings/scrubber-mk02.lua b/prototypes/buildings/scrubber-mk02.lua
index 72b17ff9..4daba742 100644
--- a/prototypes/buildings/scrubber-mk02.lua
+++ b/prototypes/buildings/scrubber-mk02.lua
@@ -81,46 +81,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {2.0, 4.0}}}
         },
diff --git a/prototypes/buildings/scrubber-mk03.lua b/prototypes/buildings/scrubber-mk03.lua
index b0be76aa..ef49c2e8 100644
--- a/prototypes/buildings/scrubber-mk03.lua
+++ b/prototypes/buildings/scrubber-mk03.lua
@@ -81,46 +81,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {2.0, 4.0}}}
         },
diff --git a/prototypes/buildings/scrubber-mk04.lua b/prototypes/buildings/scrubber-mk04.lua
index 9b96e38d..b2464605 100644
--- a/prototypes/buildings/scrubber-mk04.lua
+++ b/prototypes/buildings/scrubber-mk04.lua
@@ -79,46 +79,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {2.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {2.0, 4.0}}}
         },
diff --git a/prototypes/buildings/sinter-unit.lua b/prototypes/buildings/sinter-unit.lua
index 7ece76e3..7c4fad55 100644
--- a/prototypes/buildings/sinter-unit.lua
+++ b/prototypes/buildings/sinter-unit.lua
@@ -82,22 +82,16 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/sinter-unit/off.png",
-                --priority = "high",
                 width = 224,
                 height = 384,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 shift = util.by_pixel(0, -80)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/sinter-unit/shadow.png",
-                --priority = "high",
                 width = 96,
                 height = 384,
-                --line_length = 1,
                 frame_count = 1,
-                --animation_speed = 2,
                 draw_as_shadow = true,
                 shift = util.by_pixel(158, -80)
             },
@@ -169,31 +163,31 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.0, -4.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-1.0, -4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.0, 4.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-1.0, 4.0}}}
         },
diff --git a/prototypes/buildings/smelter-mk01.lua b/prototypes/buildings/smelter-mk01.lua
index 08237344..317aa925 100644
--- a/prototypes/buildings/smelter-mk01.lua
+++ b/prototypes/buildings/smelter-mk01.lua
@@ -63,8 +63,8 @@ ENTITY {
 		{
 			{type = "input", position = {0, -7.0}}
 		},
-		pipe_covers = DATA.Pipes.covers(false, true, true, true),
-		pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+		pipe_covers = py.pipe_covers(false, true, true, true),
+		pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
 		production_type = "input",
 		},
 	effectivity = 1,
@@ -264,64 +264,64 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-3.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-5.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {3.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {5.0, -7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {3.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {5.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {-3.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {-5.0, 7.0}}}
diff --git a/prototypes/buildings/smelter-mk02.lua b/prototypes/buildings/smelter-mk02.lua
index 82126a99..7a9e9628 100644
--- a/prototypes/buildings/smelter-mk02.lua
+++ b/prototypes/buildings/smelter-mk02.lua
@@ -62,8 +62,8 @@ ENTITY {
 		{
 			{type = "input", position = {0, -7.0}}
 		},
-		pipe_covers = DATA.Pipes.covers(false, true, true, true),
-		pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+		pipe_covers = py.pipe_covers(false, true, true, true),
+		pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
 		production_type = "input",
 		},
 	effectivity = 1,
@@ -263,64 +263,64 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-3.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-5.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {3.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {5.0, -7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {3.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {5.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {-3.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {-5.0, 7.0}}}
diff --git a/prototypes/buildings/smelter-mk03.lua b/prototypes/buildings/smelter-mk03.lua
index 33f2cc63..cc8f7ce9 100644
--- a/prototypes/buildings/smelter-mk03.lua
+++ b/prototypes/buildings/smelter-mk03.lua
@@ -63,8 +63,8 @@ ENTITY {
 		{
 			{type = "input", position = {0, -7.0}}
 		},
-		pipe_covers = DATA.Pipes.covers(false, true, true, true),
-		pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+		pipe_covers = py.pipe_covers(false, true, true, true),
+		pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
 		production_type = "input",
 		},
 	effectivity = 1,
@@ -264,64 +264,64 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-3.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-5.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {3.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {5.0, -7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {3.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {5.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {-3.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {-5.0, 7.0}}}
diff --git a/prototypes/buildings/smelter-mk04.lua b/prototypes/buildings/smelter-mk04.lua
index 6044d915..c0fb24ab 100644
--- a/prototypes/buildings/smelter-mk04.lua
+++ b/prototypes/buildings/smelter-mk04.lua
@@ -60,8 +60,8 @@ ENTITY {
 		{
 			{type = "input", position = {0, -7.0}}
 		},
-		pipe_covers = DATA.Pipes.covers(false, true, true, true),
-		pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+		pipe_covers = py.pipe_covers(false, true, true, true),
+		pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
 		production_type = "input",
 		},
 	effectivity = 1,
@@ -261,64 +261,64 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-3.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-5.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {3.0, -7.0}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {5.0, -7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {3.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {5.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {-3.0, 7.0}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = 1,
             pipe_connections = {{type = "output", position = {-5.0, 7.0}}}
diff --git a/prototypes/buildings/wet-scrubber-mk01.lua b/prototypes/buildings/wet-scrubber-mk01.lua
index bd09fdfc..c6b2e192 100644
--- a/prototypes/buildings/wet-scrubber-mk01.lua
+++ b/prototypes/buildings/wet-scrubber-mk01.lua
@@ -57,32 +57,23 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/wet-scrubber-base.png",
-                --priority = "high",
                 width = 192,
                 height = 224,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -17)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/top-off.png",
-                --priority = "high",
                 width = 192,
                 height = 128,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -190)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/shadow.png",
-                --priority = "high",
                 width = 224,
                 height = 192,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(32, 0)
             }
@@ -98,7 +89,6 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/anim.png",
                 --priority = "extra-high",
                 frame_count = 2,
-                --line_length = 2,
                 width = 192,
                 height = 128,
                 animation_speed = 0.2
@@ -109,46 +99,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/wet-scrubber-mk02.lua b/prototypes/buildings/wet-scrubber-mk02.lua
index 833697e7..f0a20de6 100644
--- a/prototypes/buildings/wet-scrubber-mk02.lua
+++ b/prototypes/buildings/wet-scrubber-mk02.lua
@@ -58,32 +58,23 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/wet-scrubber-base-mk02.png",
-                --priority = "high",
                 width = 192,
                 height = 224,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -17)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/top-off-mk02.png",
-                --priority = "high",
                 width = 192,
                 height = 128,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -190)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/shadow.png",
-                --priority = "high",
                 width = 224,
                 height = 192,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(32, 0)
             }
@@ -99,7 +90,6 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/anim-mk02.png",
                 --priority = "extra-high",
                 frame_count = 2,
-                --line_length = 2,
                 width = 192,
                 height = 128,
                 animation_speed = 0.2
@@ -110,46 +100,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/wet-scrubber-mk03.lua b/prototypes/buildings/wet-scrubber-mk03.lua
index 06d5a0f3..046b6b56 100644
--- a/prototypes/buildings/wet-scrubber-mk03.lua
+++ b/prototypes/buildings/wet-scrubber-mk03.lua
@@ -59,32 +59,23 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/wet-scrubber-base-mk03.png",
-                --priority = "high",
                 width = 192,
                 height = 224,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -17)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/top-off-mk03.png",
-                --priority = "high",
                 width = 192,
                 height = 128,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -190)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/shadow.png",
-                --priority = "high",
                 width = 224,
                 height = 192,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(32, 0)
             }
@@ -100,7 +91,6 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/anim-mk03.png",
                 --priority = "extra-high",
                 frame_count = 2,
-                --line_length = 2,
                 width = 192,
                 height = 128,
                 animation_speed = 0.2
@@ -111,46 +101,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/buildings/wet-scrubber-mk04.lua b/prototypes/buildings/wet-scrubber-mk04.lua
index 7e47b1ec..f8144c33 100644
--- a/prototypes/buildings/wet-scrubber-mk04.lua
+++ b/prototypes/buildings/wet-scrubber-mk04.lua
@@ -57,32 +57,23 @@ ENTITY {
         layers = {
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/wet-scrubber-base-mk04.png",
-                --priority = "high",
                 width = 192,
                 height = 224,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -17)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/top-off-mk04.png",
-                --priority = "high",
                 width = 192,
                 height = 128,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 shift = util.by_pixel(0, -190)
             },
             {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/shadow.png",
-                --priority = "high",
                 width = 224,
                 height = 192,
-                --line_length = 10,
                 frame_count = 1,
-                --animation_speed = 0.4,
                 draw_as_shadow = true,
                 shift = util.by_pixel(32, 0)
             }
@@ -98,7 +89,6 @@ ENTITY {
                 filename = "__pyraworesgraphics__/graphics/entity/wet-scrubber-mk01/anim-mk04.png",
                 --priority = "extra-high",
                 frame_count = 2,
-                --line_length = 2,
                 width = 192,
                 height = 128,
                 animation_speed = 0.2
@@ -109,46 +99,46 @@ ENTITY {
         --1
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-2.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {-0.5, -3.5}}}
         },
         {
             production_type = "input",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_area = 10,
             base_level = -1,
             pipe_connections = {{type = "input", position = {1.5, -3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-0.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {-2.5, 3.5}}}
         },
         {
             production_type = "output",
-            pipe_picture = DATA.Pipes.pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
-            pipe_covers = DATA.Pipes.covers(false, true, true, true),
+            pipe_picture = py.pipe_pictures("assembling-machine-2", nil, {0.0, -0.96}, nil, nil),
+            pipe_covers = py.pipe_covers(false, true, true, true),
             base_level = 1,
             pipe_connections = {{type = "output", position = {1.5, 3.5}}}
         },
diff --git a/prototypes/fluids/iron-pulp-06-thick.lua b/prototypes/fluids/iron-pulp-06-thick.lua
deleted file mode 100644
index 6816d4b9..00000000
--- a/prototypes/fluids/iron-pulp-06-thick.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-
-FLUID {
-    type = "fluid",
-    name = "iron-pulp-06-thick",
-    icon = "__pyraworesgraphics__/graphics/icons/iron-pulp-06.png",
-    icon_size = 32,
-    default_temperature = 10, -- less than 15 = liquid / equal a 15 = gas
-    base_color = {r = 0.086, g = 0.180, b = 0.254},
-    flow_color = {r = 1, g = 1, b = 1},
-    max_temperature = 100,
-    gas_temperature = 15,
-    subgroup = "py-rawores-fluids",
-    order = "c"
-}
diff --git a/prototypes/ores/aluminium-rock.lua b/prototypes/ores/aluminium-rock.lua
index f981e1d1..12a7ef77 100644
--- a/prototypes/ores/aluminium-rock.lua
+++ b/prototypes/ores/aluminium-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "aluminium-rock",
     richness = true,
     order = "r-a"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "aluminium-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "aluminium-rock",
     category = "aluminium-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/aluminium.lua b/prototypes/ores/aluminium.lua
index fae48033..65263072 100644
--- a/prototypes/ores/aluminium.lua
+++ b/prototypes/ores/aluminium.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "ore-aluminium",
     richness = true,
     order = "p-alum"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "ore-aluminium"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/ores/chromium-rock.lua b/prototypes/ores/chromium-rock.lua
index c40ad0ca..f6e1f638 100644
--- a/prototypes/ores/chromium-rock.lua
+++ b/prototypes/ores/chromium-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "chromium-rock",
     richness = true,
     order = "r-ch"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "chromium-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "chromium-rock",
     category = "chromium-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/chromium.lua b/prototypes/ores/chromium.lua
index d3130aad..692358bc 100644
--- a/prototypes/ores/chromium.lua
+++ b/prototypes/ores/chromium.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "ore-chromium",
     richness = true,
     order = "p-chro"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "ore-chromium"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/ores/coal-rock.lua b/prototypes/ores/coal-rock.lua
index 4d1e04f4..010433db 100644
--- a/prototypes/ores/coal-rock.lua
+++ b/prototypes/ores/coal-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "coal-rock",
     richness = true,
     order = "r-co"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "coal-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "coal-rock",
     category = "coal-rock",
@@ -79,4 +79,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/copper-rock.lua b/prototypes/ores/copper-rock.lua
index 2458e9f7..7327e8e7 100644
--- a/prototypes/ores/copper-rock.lua
+++ b/prototypes/ores/copper-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "copper-rock",
     richness = true,
     order = "r-cop"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "copper-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "copper-rock",
     category = "copper-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/iron-rock.lua b/prototypes/ores/iron-rock.lua
index 852f588b..d2eef07e 100644
--- a/prototypes/ores/iron-rock.lua
+++ b/prototypes/ores/iron-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "iron-rock",
     richness = true,
     order = "r-ir"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "iron-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "iron-rock",
     category = "iron-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/lead-rock.lua b/prototypes/ores/lead-rock.lua
index 332374b7..d064d3be 100644
--- a/prototypes/ores/lead-rock.lua
+++ b/prototypes/ores/lead-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "lead-rock",
     richness = true,
     order = "r-le"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "lead-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "lead-rock",
     category = "lead-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/lead.lua b/prototypes/ores/lead.lua
index abdd4c96..ed8ee556 100644
--- a/prototypes/ores/lead.lua
+++ b/prototypes/ores/lead.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "ore-lead",
     richness = true,
     order = "p-lead"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "ore-lead"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/ores/nexelit-rock.lua b/prototypes/ores/nexelit-rock.lua
index 85e5f1fc..5edde12e 100644
--- a/prototypes/ores/nexelit-rock.lua
+++ b/prototypes/ores/nexelit-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "nexelit-rock",
     richness = true,
     order = "r-ne"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "nexelit-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "nexelit-rock",
     category = "nexelit-rock",
@@ -76,4 +76,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/nickel-rock.lua b/prototypes/ores/nickel-rock.lua
index aa1339ac..e553a140 100644
--- a/prototypes/ores/nickel-rock.lua
+++ b/prototypes/ores/nickel-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "nickel-rock",
     richness = true,
     order = "r-ni"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "nickel-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "nickel-rock",
     category = "nickel-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/nickel.lua b/prototypes/ores/nickel.lua
index a4a7a700..65398f3d 100644
--- a/prototypes/ores/nickel.lua
+++ b/prototypes/ores/nickel.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "ore-nickel",
     richness = true,
     order = "p-nick"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "ore-nickel"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/ores/phosphate-rock-02.lua b/prototypes/ores/phosphate-rock-02.lua
index aef6bc2e..8d82dbf5 100644
--- a/prototypes/ores/phosphate-rock-02.lua
+++ b/prototypes/ores/phosphate-rock-02.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "phosphate-rock-02",
     richness = true,
     order = "r-pho-b"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "phosphate-rock-02"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "phosphate-rock-02",
     category = "phosphate-rock-02",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/quartz-rock.lua b/prototypes/ores/quartz-rock.lua
index 7bb33c08..41ad72a4 100644
--- a/prototypes/ores/quartz-rock.lua
+++ b/prototypes/ores/quartz-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "quartz-rock",
     richness = true,
     order = "r-qu"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "quartz-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "quartz-rock",
     category = "quartz-rock",
@@ -79,4 +79,4 @@ DATA {
             shift = util.by_pixel(3, -10)
         }
     }
-}
+}}
diff --git a/prototypes/ores/quartz.lua b/prototypes/ores/quartz.lua
index 3a63aaec..4d5bc689 100644
--- a/prototypes/ores/quartz.lua
+++ b/prototypes/ores/quartz.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "ore-quartz",
     richness = true,
     order = "p-quar"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "ore-quartz"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/ores/raw-coal.lua b/prototypes/ores/raw-coal.lua
index f7857a93..b4429d4e 100644
--- a/prototypes/ores/raw-coal.lua
+++ b/prototypes/ores/raw-coal.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "raw-coal",
     richness = true,
     order = "p-raw"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "raw-coal"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/ores/salt-rock.lua b/prototypes/ores/salt-rock.lua
index a7bad1cf..70ae8441 100644
--- a/prototypes/ores/salt-rock.lua
+++ b/prototypes/ores/salt-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "salt-rock",
     richness = true,
     order = "r-su"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "salt-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "salt-rock",
     category = "salt-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/tin-rock.lua b/prototypes/ores/tin-rock.lua
index 572f8c5a..5a53b8c4 100644
--- a/prototypes/ores/tin-rock.lua
+++ b/prototypes/ores/tin-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "tin-rock",
     richness = true,
     order = "r-tin"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "tin-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "tin-rock",
     category = "tin-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/tin.lua b/prototypes/ores/tin.lua
index 8eb0c59f..0a1b4d40 100644
--- a/prototypes/ores/tin.lua
+++ b/prototypes/ores/tin.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "ore-tin",
     richness = true,
     order = "p-tin"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "ore-tin"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/ores/titanium-rock.lua b/prototypes/ores/titanium-rock.lua
index 20de88a1..f7c3580b 100644
--- a/prototypes/ores/titanium-rock.lua
+++ b/prototypes/ores/titanium-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "titanium-rock",
     richness = true,
     order = "r-tit"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "titanium-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "titanium-rock",
     category = "titanium-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/titanium.lua b/prototypes/ores/titanium.lua
index 09741158..7003df6d 100644
--- a/prototypes/ores/titanium.lua
+++ b/prototypes/ores/titanium.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "ore-titanium",
     richness = true,
     order = "p-tit"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "ore-titanium"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/ores/uranium-rock.lua b/prototypes/ores/uranium-rock.lua
index 560dfff3..a44972a7 100644
--- a/prototypes/ores/uranium-rock.lua
+++ b/prototypes/ores/uranium-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "uranium-rock",
     richness = true,
     order = "r-ur"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "uranium-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "uranium-rock",
     category = "uranium-rock",
@@ -79,4 +79,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/zinc-rock.lua b/prototypes/ores/zinc-rock.lua
index 4294a300..623b5c58 100644
--- a/prototypes/ores/zinc-rock.lua
+++ b/prototypes/ores/zinc-rock.lua
@@ -1,19 +1,19 @@
-local noise = require("noise")
+local noise = require 'noise'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "zinc-rock",
     richness = true,
     order = "r-zi"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "zinc-rock"
-}
+}}
 
-DATA {
+data:extend{{
     type = "resource",
     name = "zinc-rock",
     category = "zinc-rock",
@@ -77,4 +77,4 @@ DATA {
             shift = util.by_pixel(0, 0)
         }
     }
-}
+}}
diff --git a/prototypes/ores/zinc.lua b/prototypes/ores/zinc.lua
index 17c42f7c..64fa7230 100644
--- a/prototypes/ores/zinc.lua
+++ b/prototypes/ores/zinc.lua
@@ -1,17 +1,17 @@
-local resource_autoplace = require("resource-autoplace")
+local resource_autoplace = require 'resource-autoplace'
 
-DATA {
+data:extend{{
     type = "autoplace-control",
     category = "resource",
     name = "ore-zinc",
     richness = true,
     order = "p-zinc"
-}
+}}
 
-DATA {
+data:extend{{
     type = "noise-layer",
     name = "ore-zinc"
-}
+}}
 
 ENTITY {
     type = "resource",
diff --git a/prototypes/recipes/recipes-titanium.lua b/prototypes/recipes/recipes-titanium.lua
index 43ba4290..514c8779 100644
--- a/prototypes/recipes/recipes-titanium.lua
+++ b/prototypes/recipes/recipes-titanium.lua
@@ -1,5 +1,3 @@
-local FUN = require("__pycoalprocessing__/prototypes/functions/functions")
-
 RECIPE {
     type = "recipe",
     name = "grade-1-ti",
@@ -243,7 +241,7 @@ RECIPE {
         {type = "fluid", name = "molten-titanium", amount = 40}
     },
     main_product = "molten-titanium",
-    icons = FUN.composite_molten_icon("molten-titanium", "ti-enriched-dust"),
+    icons = py.composite_molten_icon("molten-titanium", "ti-enriched-dust"),
     subgroup = "py-rawores-titanium",
     order = "bae"
 }:add_unlock("titanium-mk02")
@@ -263,7 +261,7 @@ RECIPE {
         {type = "fluid", name = "molten-titanium", amount = 510}
     },
     main_product = "molten-titanium",
-    icons = FUN.composite_molten_icon("molten-titanium", "concentrated-ti"),
+    icons = py.composite_molten_icon("molten-titanium", "concentrated-ti"),
     subgroup = "py-rawores-titanium",
     order = "bac"
 }:add_unlock("titanium-mk02")
@@ -283,7 +281,7 @@ RECIPE {
         {type = "fluid", name = "molten-titanium", amount = 600}
     },
     main_product = "molten-titanium",
-    icons = FUN.composite_molten_icon("molten-titanium", "high-grade-ti"),
+    icons = py.composite_molten_icon("molten-titanium", "high-grade-ti"),
     subgroup = "py-rawores-titanium",
     order = "bab"
 }:add_unlock("titanium-mk03")
@@ -303,7 +301,7 @@ RECIPE {
         {type = "fluid", name = "molten-titanium", amount = 650}
     },
     main_product = "molten-titanium",
-    icons = FUN.composite_molten_icon("molten-titanium", "reduced-ti"),
+    icons = py.composite_molten_icon("molten-titanium", "reduced-ti"),
     subgroup = "py-rawores-titanium",
     order = "baa"
 }:add_unlock("titanium-mk04")
@@ -323,7 +321,7 @@ RECIPE {
         {type = "fluid", name = "molten-titanium", amount = 400}
     },
     main_product = "molten-titanium",
-    icons = FUN.composite_molten_icon("molten-titanium", "sintered-ti"),
+    icons = py.composite_molten_icon("molten-titanium", "sintered-ti"),
     subgroup = "py-rawores-titanium",
     order = "bad"
 }:add_unlock("titanium-mk05")
diff --git a/prototypes/recipes/recipes-uranium.lua b/prototypes/recipes/recipes-uranium.lua
index fbfb99c8..8bb60a50 100644
--- a/prototypes/recipes/recipes-uranium.lua
+++ b/prototypes/recipes/recipes-uranium.lua
@@ -72,7 +72,7 @@ RECIPE {
     icon = "__pyraworesgraphics__/graphics/icons/powdered-u-screening.png",
     icon_size = 32,
     subgroup = "py-rawores-uranium",
-}:add_unlock("uranium-mk01")--:change_category('screener') TODO: move to something with a fluid box
+}:add_unlock("uranium-mk01")--.category = 'screener' TODO: move to something with a fluid box
 
 RECIPE {
     type = "recipe",
diff --git a/prototypes/robots/py-construction-robot-02.lua b/prototypes/robots/py-construction-robot-02.lua
index b4522658..56c5bb05 100644
--- a/prototypes/robots/py-construction-robot-02.lua
+++ b/prototypes/robots/py-construction-robot-02.lua
@@ -1,4 +1,4 @@
-local sounds = require("__base__/prototypes/entity/sounds")
+local sounds = require '__base__/prototypes/entity/sounds'
 
 RECIPE {
     type = 'recipe',
diff --git a/prototypes/robots/py-logistic-robot-02.lua b/prototypes/robots/py-logistic-robot-02.lua
index 9615ae0a..c1e260d9 100644
--- a/prototypes/robots/py-logistic-robot-02.lua
+++ b/prototypes/robots/py-logistic-robot-02.lua
@@ -1,4 +1,4 @@
-local sounds = require("__base__/prototypes/entity/sounds")
+local sounds = require '__base__/prototypes/entity/sounds'
 
 local cargo_bot =
     RECIPE {
diff --git a/prototypes/technologies/fuel-production.lua b/prototypes/technologies/fuel-production.lua
index da61a4e4..ff776916 100644
--- a/prototypes/technologies/fuel-production.lua
+++ b/prototypes/technologies/fuel-production.lua
@@ -1,17 +1,15 @@
-local table = require('__stdlib__/stdlib/utils/table')
-
 local fp = TECHNOLOGY('fuel-production')
 
 TECHNOLOGY {
-    type = "technology",
-    name = "fuel-production-mk02",
-    icon = "__pycoalprocessinggraphics__/graphics/technology/fuel-production-mk02.png",
+    type = 'technology',
+    name = 'fuel-production-mk02',
+    icon = '__pycoalprocessinggraphics__/graphics/technology/fuel-production-mk02.png',
     icon_size = fp.icon_size,
-    order = "c-a",
+    order = 'c-a',
     prerequisites = { 'fuel-production' },
     dependencies = { 'fuel-production' },
-    effects = table.deep_copy(fp.effects),
-    unit = table.deep_copy(fp.unit)
+    effects = table.deepcopy(fp.effects),
+    unit = table.deepcopy(fp.unit)
 }
 
 fp:remove_pack('chemical-science-pack')
diff --git a/prototypes/updates/base-updates.lua b/prototypes/updates/base-updates.lua
index 7f625aa7..db61adf9 100644
--- a/prototypes/updates/base-updates.lua
+++ b/prototypes/updates/base-updates.lua
@@ -31,7 +31,7 @@ RECIPE("centrifuge"):remove_unlock('uranium-processing'):add_unlock('nuclear-fue
 RECIPE('atomic-bomb'):remove_ingredient('uranium-235'):add_ingredient({type = "item", name = "yellow-cake", amount = 5})
 RECIPE("kovarex-enrichment-process"):set_fields{energy_required = 5}
 RECIPE('electric-engine-unit'):remove_ingredient('copper-cable'):add_ingredient({type = "item", name = "copper-cable", amount = 150}):add_ingredient({type = "item", name = "aluminium-plate", amount = 10}):add_ingredient({type = "item", name = "bolts", amount = 20})--:remove_ingredient("engine-unit")
-RECIPE('low-density-structure'):change_category('py-rawores-smelter')
+RECIPE('low-density-structure').category = 'py-rawores-smelter'
 
 -- ENTITY CHANGES
 data.raw.reactor['nuclear-reactor'].use_fuel_glow_color = true
diff --git a/prototypes/updates/pycoalprocessing-updates.lua b/prototypes/updates/pycoalprocessing-updates.lua
index ce597d8d..10a17aba 100644
--- a/prototypes/updates/pycoalprocessing-updates.lua
+++ b/prototypes/updates/pycoalprocessing-updates.lua
@@ -1,5 +1,3 @@
-local FUN = require('__pycoalprocessing__/prototypes/functions/functions')
-
 -- TECH CHANGES
 TECHNOLOGY('crusher'):remove_pack('logistic-science-pack'):remove_prereq('coal-processing-2')
 TECHNOLOGY('excavation-1'):remove_pack('chemical-science-pack'):remove_prereq('coal-processing-3'):remove_prereq('niobium')
@@ -78,12 +76,12 @@ RECIPE('drill-head'):remove_unlock('niobium'):add_unlock('drill-head-mk01')
 RECIPE('richdust-separation'):add_unlock('fluid-separation')
 
 -- RECIPE CHANGES
-FUN.results_replacer('richdust-separation', 'chromite-sand', 'chromite-sand',3)
-FUN.results_replacer('coal-fawogae', 'coal', 'raw-coal',3)
-FUN.results_replacer('oleochemicals-distilation', 'coal', 'raw-coal',4)
-RECIPE('boric-acid'):change_category('electrolyzer')
-RECIPE('copper-coating'):change_category('electrolyzer')
-RECIPE('nbfe-alloy'):change_category('py-rawores-smelter')
+RECIPE('richdust-separation'):replace_result('chromite-sand', 'chromite-sand',3)
+RECIPE('coal-fawogae'):replace_result('coal', 'raw-coal',3)
+RECIPE('oleochemicals-distilation'):replace_result('coal', 'raw-coal',4)
+RECIPE('boric-acid').category = 'electrolyzer'
+RECIPE('copper-coating').category = 'electrolyzer'
+RECIPE('nbfe-alloy').category = 'py-rawores-smelter'
 RECIPE('copper-coating'):replace_ingredient('organic-solvent', {'water-saline', 100})
 RECIPE('empty-gas-canister'):replace_ingredient('steel-plate', 'aluminium-plate')
 RECIPE('methanol-from-syngas'):replace_ingredient('iron-plate', 'zinc-plate')
@@ -91,17 +89,17 @@ RECIPE('flying-robot-frame'):replace_ingredient('steel-plate', 'niobium-plate')
 RECIPE('ralesia'):replace_ingredient('water', 'hydrogen')
 RECIPE('equipment-chassi'):replace_ingredient('copper-plate', 'tin-plate')
 RECIPE('lens'):remove_ingredient('molten-glass'):add_ingredient({type = 'fluid', name = 'molten-glass', amount = 100, fluidbox_index = 2})
-RECIPE('diborane'):replace_ingredient('water', 'hydrogen'):change_category('electrolyzer')
+RECIPE('diborane'):replace_ingredient('water', 'hydrogen').category = 'electrolyzer'
 RECIPE('oleochemicals-distilation'):replace_ingredient('water', 'oxygen')
 RECIPE('oleo-gasification'):replace_ingredient('water', 'oxygen')
 RECIPE('dedicated-oleochemicals'):replace_ingredient('chromium', 'titanium-plate')
-RECIPE('ppd'):replace_ingredient('water', 'hydrogen'):change_category('electrolyzer'):add_ingredient({type = 'fluid', name = 'chlorine', amount = 400})
+RECIPE('ppd'):replace_ingredient('water', 'hydrogen'):add_ingredient({type = 'fluid', name = 'chlorine', amount = 400}).category = 'electrolyzer'
 RECIPE('aromatics2'):replace_ingredient('water', 'hydrogen')
 RECIPE('niobium-complex'):replace_ingredient('water', 'hydrogen-chloride')
 RECIPE('chemical-science-pack'):replace_ingredient('copper-cable', 'tinned-cable')
 RECIPE('tailings-classification'):replace_ingredient('copper-ore', 'ore-lead') --result
 RECIPE('tailings-classification'):replace_ingredient('iron-ore', 'ore-tin') --result
-RECIPE('niobium-plate'):replace_ingredient('coal', 'salt'):change_category('electrolyzer')
+RECIPE('niobium-plate'):replace_ingredient('coal', 'salt').category = 'electrolyzer'
 --RECIPE('sulfur-crudeoil'):replace_ingredient('iron-ore', 'salt')
 --RECIPE('sulfur-heavyoil'):add_ingredient({type = 'item', name = 'salt', amount = 10})
 --RECIPE('sulfur-lightoil'):add_ingredient({type = 'item', name = 'salt', amount = 10})
diff --git a/prototypes/updates/pyfusionenergy-updates.lua b/prototypes/updates/pyfusionenergy-updates.lua
index cca787f0..762380ea 100644
--- a/prototypes/updates/pyfusionenergy-updates.lua
+++ b/prototypes/updates/pyfusionenergy-updates.lua
@@ -1,5 +1,3 @@
-local FUN = require("__pycoalprocessing__/prototypes/functions/functions")
-
 TECHNOLOGY("advanced-mining-facilities"):remove_pack("chemical-science-pack"):remove_prereq("diamond-mining"):remove_prereq('uranium-processing')
 TECHNOLOGY("molybdenum-processing"):remove_pack("chemical-science-pack"):remove_pack('production-science-pack'):remove_prereq('production-science-pack')
 TECHNOLOGY("fluid-pressurization"):remove_pack("chemical-science-pack"):remove_pack("logistic-science-pack")
@@ -15,7 +13,7 @@ RECIPE("titanium-plate-1"):remove_unlock("coal-processing-1"):add_unlock('alloys
 
 ITEM("molybdenum-plate").stack_size = 100
 
-RECIPE("aramid"):add_ingredient({type = 'item', name = 'molybdenum-plate', amount = 5}):change_category('nmf')
+RECIPE("aramid"):add_ingredient({type = 'item', name = 'molybdenum-plate', amount = 5}).category = 'nmf'
 RECIPE("methyl-acrylate"):replace_ingredient("iron-plate", "nickel-plate")
 
 RECIPE("steam-heating"):remove_ingredient("fuelrod-mk01"):add_ingredient({type = "item", name = "fuelrod-mk01", amount = 1})
@@ -34,29 +32,29 @@ RECIPE("jig-mk01"):remove_unlock("diamond-mining"):add_unlock("titanium-mk02")
 RECIPE("jig-mk01"):add_ingredient({type = "item", name = "stainless-steel", amount = 20}):replace_ingredient('advanced-circuit', 'electronic-circuit'):replace_ingredient('electric-engine-unit','engine-unit')
 RECIPE("control-unit"):replace_ingredient("iron-plate", "stainless-steel")
 
-FUN.results_replacer("u-79", "dirty-water-heavy", "u-waste")
+RECIPE('u-79'):replace_result("dirty-water-heavy", "u-waste")
 
 RECIPE("centrifugal-pan-mk01"):remove_unlock("diamond-mining"):add_unlock("machines-mk03"):replace_ingredient("advanced-circuit", "electronic-circuit")
 
 RECIPE("gas-separator-mk01"):remove_unlock("helium-processing-mk02"):add_unlock("coke-mk02")
 
-RECIPE("sodium-chlorate"):remove_unlock("vanadium-processing"):add_unlock("salts"):change_category("electrolyzer"):remove_ingredient("water-saline"):add_ingredient({type = "item", name = "salt", amount = 10})
+RECIPE("sodium-chlorate"):remove_unlock("vanadium-processing"):add_unlock("salts"):remove_ingredient('water-saline'):add_ingredient({type = "item", name = "salt", amount = 10}).category = 'electrolyzer'
 
-RECIPE("purified-quartz"):change_category("pan")
-RECIPE("prepared-quartz"):change_category("pan")
-RECIPE("quartz-pulp-01"):change_category("hydrocyclone")
-RECIPE("al-pulp-01"):change_category("mixer")
-RECIPE("al-pulp-02"):change_category("agitator")
-RECIPE("al-pulp-04"):change_category("agitator")
+RECIPE("purified-quartz").category = 'pan'
+RECIPE("prepared-quartz").category = 'pan'
+RECIPE("quartz-pulp-01").category = 'hydrocyclone'
+RECIPE("al-pulp-01").category = 'mixer'
+RECIPE("al-pulp-02").category = 'agitator'
+RECIPE("al-pulp-04").category = 'agitator'
 RECIPE("crystalized-sodium-aluminate"):remove_ingredient("steam"):add_ingredient({type = "fluid", name = "pressured-air", amount = 500})
 RECIPE("cold-clean-air"):replace_ingredient("filtration-media", "biofilm")
 RECIPE("tin-concentrate-3"):remove_ingredient("heavy-oil"):add_ingredient({type = "fluid", name = "grease", amount = 50})
 RECIPE("ti-pulp-02"):remove_ingredient("heavy-oil"):add_ingredient({type = "fluid", name = "grease", amount = 50})
-RECIPE("unslimed-iron-2"):change_category("hydrocyclone")
+RECIPE("unslimed-iron-2").category = 'hydrocyclone'
 
-RECIPE("grade-4-chromite"):change_category("hydrocyclone")
+RECIPE("grade-4-chromite").category = 'hydrocyclone'
 
-RECIPE("molybdenum-plate"):add_ingredient({type = "fluid", name = "hydrogen", amount = 100}):change_category("electrolyzer")
+RECIPE("molybdenum-plate"):add_ingredient({type = "fluid", name = "hydrogen", amount = 100}).category = 'electrolyzer'
 RECIPE("agitator-mk01"):replace_ingredient("iron-plate", "glass")
 RECIPE("mixer-mk01"):replace_ingredient("steel-plate", "titanium-plate")
 RECIPE("diamond-mine"):replace_ingredient("iron-plate", "titanium-plate")
@@ -79,7 +77,7 @@ RECIPE("phytoplankton"):replace_ingredient("iron-ore", {"grade-1-tin", 1})
 RECIPE("molybdenum-oxide"):add_ingredient({type = "fluid", name = "oxygen", amount = 100})
 RECIPE("vpulp3"):replace_ingredient("petroleum-gas", "ammonia")
 RECIPE("vpulp-precip"):replace_ingredient("water", "ammonia"):add_ingredient({type = "item", name = "sodium-bisulfate", amount = 1})
-RECIPE("super-alloy"):replace_ingredient("steel-plate", "nickel-plate"):add_ingredient({type = "item", name = "aramid", amount = 1}):change_category('py-rawores-smelter')
+RECIPE("super-alloy"):replace_ingredient("steel-plate", "nickel-plate"):add_ingredient({type = "item", name = "aramid", amount = 1}).category = 'py-rawores-smelter'
 RECIPE("calcinate-separation"):add_result({type = "item", name = "ore-quartz", amount = 1, probability = 0.6})
 
 RECIPE("grease-table-mk01"):add_ingredient({type = "item", name = "stainless-steel", amount = 20})
@@ -88,7 +86,7 @@ RECIPE("py-turbine"):add_ingredient({type = "item", name = "super-steel", amount
  --RECIPES
 RECIPE("kmauts-ration"):replace_ingredient("iron-plate", "tin-plate")
 RECIPE("helium"):add_ingredient({type = "fluid", name = "hydrogen", amount = 10})
-RECIPE("nbti-alloy"):replace_ingredient("steel-plate", "titanium-plate"):add_ingredient({type = "fluid", name = "nitrogen", amount = 150}):change_category('py-rawores-smelter'):remove_unlock("nenbit-matrix"):add_unlock("alloys-mk03")
+RECIPE("nbti-alloy"):replace_ingredient("steel-plate", "titanium-plate"):add_ingredient({type = "fluid", name = "nitrogen", amount = 150}):remove_unlock("nenbit-matrix"):add_unlock("alloys-mk03").category = 'py-rawores-smelter'
 RECIPE("sc-wire"):replace_ingredient("iron-plate", "tin-plate"):add_ingredient({type = "item", name = "optical-fiber", amount = 5})
 RECIPE("ferrite"):add_ingredient({type = "item", name = "zinc-plate", amount = 10})
 RECIPE("sc-unit"):add_ingredient({type = "fluid", name = "liquid-nitrogen", amount = 600})
@@ -99,7 +97,7 @@ RECIPE("blanket"):add_ingredient({type = "item", name = "lead-plate", amount = 4
 RECIPE("blanket"):add_ingredient({type = "item", name = "super-steel", amount = 40})
 RECIPE("lead-container"):replace_ingredient("iron-plate", "lead-plate"):add_ingredient({type = "item", name = "aramid", amount = 3}):remove_unlock("coated-container"):add_unlock("aramid")
 RECIPE("science-coating"):replace_ingredient("steel-plate", "titanium-plate")
-RECIPE("agzn-alloy"):replace_ingredient("iron-plate", "silver-plate"):replace_ingredient("stone", "zinc-plate"):change_category('py-rawores-smelter')
+RECIPE("agzn-alloy"):replace_ingredient("iron-plate", "silver-plate"):replace_ingredient("stone", "zinc-plate").category = 'py-rawores-smelter'
 RECIPE("silver-foam"):replace_ingredient("water", "hydrogen-chloride")
 RECIPE("tar-gasification"):remove_ingredient("water"):add_ingredient({type = "fluid", name = "pressured-air", amount = 50})
 RECIPE("tpa"):remove_ingredient("steam"):add_ingredient({type = "fluid", name = "liquid-nitrogen", amount = 50})
@@ -116,15 +114,15 @@ RECIPE("molybdenum-filtration"):remove_ingredient("vacuum")
 RECIPE("low-density-structure"):replace_ingredient("niobium-plate", "super-steel"):remove_ingredient("steel-plate")
 RECIPE("automated-screener-mk01"):replace_ingredient("electric-engine-unit", "engine-unit"):replace_ingredient("ground-borer", "electric-mining-drill"):replace_ingredient("advanced-circuit", "electronic-circuit"):remove_ingredient("niobium-plate")
 RECIPE("py-heat-exchanger"):replace_ingredient("processing-unit", "advanced-circuit")
-RECIPE("sodium-bisulfate"):change_category("mixer")
-RECIPE("mibc"):change_category("mixer")
+RECIPE("sodium-bisulfate").category = 'mixer'
+RECIPE("mibc").category = 'mixer'
 RECIPE("thickener-mk01"):remove_unlock("advanced-mining-facilities"):add_unlock("molybdenum-processing"):replace_ingredient("electric-engine-unit","engine-unit")
---RECIPE("bricks-to-stone"):change_category("secondary-crusher")
+--RECIPE("bricks-to-stone").category = 'secondary-crusher'
 
 ----PYFE---
 
 RECIPE("py-heat-exchanger-mk03"):add_ingredient({type = "item", name = "super-steel", amount = 10}):add_ingredient({type = "item", name = "agitator-mk01", amount = 1})
-RECIPE("py-heat-exchanger-mk04"):add_ingredient({type = "item", name = "seper-alloy", amount = 20}):add_ingredient({type = "item", name = "boron-carbide", amount = 30}):add_ingredient({type = "item", name = "science-coating", amount = 1}):add_ingredient({type = "item", name = "control-unit", amount = 5})
+RECIPE("py-heat-exchanger-mk04"):add_ingredient({type = "item", name = "super-alloy", amount = 20}):add_ingredient({type = "item", name = "boron-carbide", amount = 30}):add_ingredient({type = "item", name = "science-coating", amount = 1}):add_ingredient({type = "item", name = "control-unit", amount = 5})
 RECIPE('borax-mine'):remove_unlock('boron')
 
 -----PYCP---
@@ -258,7 +256,7 @@ RECIPE("sinter-unit"):add_ingredient({type = "item", name = "super-alloy", amoun
 
 RECIPE("gasoline"):add_ingredient({type = "fluid", name = "hydrogen", amount = 50})
 
-RECIPE('acetylene'):change_category('gasifier')
+RECIPE('acetylene').category = 'gasifier'
 
 --pyfusion mk02 unlocks
 
@@ -326,51 +324,51 @@ RECIPE("sodium-aluminate"):add_ingredient({type = "item", name = "sodium-chlorat
 RECIPE("reduction-aluminium"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sinter-aluminium-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
-RECIPE("grade-2-chromite-beneficiation"):change_category("screener")
+RECIPE("grade-2-chromite-beneficiation").category = 'screener'
 RECIPE("high-chromite"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
-RECIPE("recrush-processed-chromite"):change_category("secondary-crusher")
+RECIPE("recrush-processed-chromite").category = 'secondary-crusher'
 RECIPE("sinter-chromium"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("reduction-chromium"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
-RECIPE("crushed-coal"):change_category('secondary-crusher')
-RECIPE("coarse-coal-to-coal"):change_category('secondary-crusher')
-RECIPE("coarse-coal"):change_category('screener')
+RECIPE("crushed-coal").category = 'secondary-crusher'
+RECIPE("coarse-coal-to-coal").category = 'secondary-crusher'
+RECIPE("coarse-coal").category = 'screener'
 RECIPE("coal-pulp-02"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
-RECIPE("coal-slime-overflow"):change_category('thickener'):replace_ingredient('organic-solvent', 'industrial-solvent')
+RECIPE("coal-slime-overflow"):replace_ingredient('organic-solvent', 'industrial-solvent').category = 'thickener'
 RECIPE("coal-pulp-05-refining"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
 
 RECIPE("quench-redcoke"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
 
-RECIPE("grade-2-copper"):change_category("screener")
-RECIPE("grade-3-copper"):change_category("screener")
-RECIPE("grade-4-copper"):change_category("screener")
-RECIPE("high-grade-copper"):change_category("agitator")
+RECIPE("grade-2-copper").category = 'screener'
+RECIPE("grade-3-copper").category = 'screener'
+RECIPE("grade-4-copper").category = 'screener'
+RECIPE("high-grade-copper").category = 'agitator'
 RECIPE("reduction-copper"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sinter-copper-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
-RECIPE("gold-precipitate"):change_category("agitator")
+RECIPE("gold-precipitate").category = 'agitator'
 
-RECIPE("grade-2-iron"):change_category('screener')
-RECIPE("grade-3-iron-processing"):change_category('secondary-crusher')
-RECIPE("iron-concentrate"):change_category('jig')
-RECIPE("iron-pulp-06-thickener"):change_category('thickener')
+RECIPE("grade-2-iron").category = 'screener'
+RECIPE("grade-3-iron-processing").category = 'secondary-crusher'
+RECIPE("iron-concentrate").category = 'jig'
+RECIPE("iron-pulp-06-thickener").category = 'thickener'
 RECIPE("reduction-iron"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sinter-iron-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
-RECIPE("grade-1-lead"):change_category("screener")
-RECIPE("grade-2-lead"):change_category("screener")
-RECIPE("grade-2-crush-lead"):change_category("secondary-crusher")
-RECIPE("lead-refined-dust-03"):change_category("screener")
+RECIPE("grade-1-lead").category = 'screener'
+RECIPE("grade-2-lead").category = 'screener'
+RECIPE("grade-2-crush-lead").category = 'secondary-crusher'
+RECIPE("lead-refined-dust-03").category = 'screener'
 RECIPE("reduction-lead"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sinter-lead-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
-RECIPE("grade-3-nexelit"):change_category("screener")
-RECIPE("nex-grade-2-crush"):change_category("secondary-crusher")
+RECIPE("grade-3-nexelit").category = 'screener'
+RECIPE("nex-grade-2-crush").category = 'secondary-crusher'
 RECIPE("reduction-nexelit"):add_ingredient({type = "fluid", name = "pressured-air", amount = 450})
 RECIPE("sinter-nexelit-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
-RECIPE("grade-3-nickel"):change_category("screener")
-RECIPE("nickel-rejects-recrush"):change_category("secondary-crusher")
+RECIPE("grade-3-nickel").category = 'screener'
+RECIPE("nickel-rejects-recrush").category = 'secondary-crusher'
 RECIPE("reduction-nickel"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sinter-nickel-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
@@ -383,100 +381,100 @@ RECIPE("molten-super-steel"):add_ingredient({type = "item", name = "molybdenum-p
 RECIPE("full-molten-super-steel-2"):add_ingredient({type = "item", name = "vanadium-oxide", amount =3})
 RECIPE("full-molten-super-steel-3"):add_ingredient({type = "item", name = "molybdenum-oxide", amount = 4})
 
-RECIPE("grade-1-tin"):change_category('screener')
-RECIPE("grade-3-tin"):change_category('screener')
-RECIPE("tin-ore-rejects"):change_category('secondary-crusher')
-RECIPE("tin-concentrate"):change_category('jig')
-RECIPE("powdered-tin"):change_category('screener')
-RECIPE("tin-concentrate-3"):change_category('grease')
+RECIPE("grade-1-tin").category = 'screener'
+RECIPE("grade-3-tin").category = 'screener'
+RECIPE("tin-ore-rejects").category = 'secondary-crusher'
+RECIPE("tin-concentrate").category = 'jig'
+RECIPE("powdered-tin").category = 'screener'
+RECIPE("tin-concentrate-3").category = 'grease'
 RECIPE("reduction-tin"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sinter-tin-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
-RECIPE("grade-1-ti"):change_category("screener")
-RECIPE("grade-3-ti"):change_category("screener")
-RECIPE("ti-rejects-recrush"):change_category("secondary-crusher")
-RECIPE("powdered-ti"):change_category("jig")
-RECIPE("ti-enriched-dust"):change_category("screener")
+RECIPE("grade-1-ti").category = 'screener'
+RECIPE("grade-3-ti").category = 'screener'
+RECIPE("ti-rejects-recrush").category = 'secondary-crusher'
+RECIPE("powdered-ti").category = 'jig'
+RECIPE("ti-enriched-dust").category = 'screener'
 RECIPE("reduction-titanium"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sinter-titanium-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
-RECIPE("grade-2-u-crush"):change_category('secondary-crusher')
+RECIPE("grade-2-u-crush").category = 'secondary-crusher'
 
-RECIPE("powdered-zinc"):change_category("screener")
-RECIPE("purified-zinc"):change_category("grease"):add_ingredient({type = "fluid", name = "grease", amount = 25})
+RECIPE("powdered-zinc").category = 'screener'
+RECIPE("purified-zinc"):add_ingredient({type = "fluid", name = "grease", amount = 25}).category = 'grease'
 RECIPE("reduced-zinc"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sinter-zinc-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 
 RECIPE("mega-drill-head"):add_ingredient({type = 'item', name = 'diamond', amount = 3}):add_ingredient({type = 'item', name = 'boron-carbide', amount = 5}):replace_ingredient("super-steel", "super-alloy"):replace_ingredient("nitrogen", "helium")
 RECIPE("glycerol-hydrogen"):replace_ingredient("water", "liquid-nitrogen")
 
-RECIPE("acid-solvent"):change_category("mixer")
-RECIPE("armac-12"):change_category('mixer')
-RECIPE("chromite-mix"):change_category('mixer')
-RECIPE("chromite-pulp-01"):change_category('agitator')
-RECIPE("chromite-pulp-02"):change_category('pan')
+RECIPE("acid-solvent").category = 'mixer'
+RECIPE("armac-12").category = 'mixer'
+RECIPE("chromite-mix").category = 'mixer'
+RECIPE("chromite-pulp-01").category = 'agitator'
+RECIPE("chromite-pulp-02").category = 'pan'
 RECIPE("chromite-pulp-04"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
 RECIPE("chromite-pulp-05"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
 RECIPE("chromite-pulp-06"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
-RECIPE("chromite-pulp-07"):change_category('thickener')
-RECIPE("coal-fines"):change_category('jig')
+RECIPE("chromite-pulp-07").category = 'thickener'
+RECIPE("coal-fines").category = 'jig'
 RECIPE("coal-pulp-01"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
-RECIPE("coal-pulp-04"):change_category('jig')
+RECIPE("coal-pulp-04").category = 'jig'
 RECIPE("coal-pulp-05"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
-RECIPE("conditioned-fines"):change_category('pan')
+RECIPE("conditioned-fines").category = 'pan'
 RECIPE("copper-pulp-01"):add_ingredient({type = "fluid", name = "grease", amount =10})
-RECIPE("copper-solution"):change_category("mixer")
-RECIPE("cresylic-acid"):change_category("mixer")
-RECIPE("fines-pulp"):change_category("jig")
-RECIPE("iron-pulp-02"):change_category("pan")
+RECIPE("copper-solution").category = 'mixer'
+RECIPE("cresylic-acid").category = 'mixer'
+RECIPE("fines-pulp").category = 'jig'
+RECIPE("iron-pulp-02").category = 'pan'
 RECIPE("iron-pulp-04"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
 RECIPE("iron-pulp-05"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
 RECIPE("iron-pulp-06"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
-RECIPE("iron-slime"):change_category("mixer")
-RECIPE("nexelit-pulp-01"):change_category('pan'):add_ingredient({type = 'item', name = 'sodium-chlorate', amount = 2})
+RECIPE("iron-slime").category = 'mixer'
+RECIPE("nexelit-pulp-01"):add_ingredient({type = 'item', name = 'sodium-chlorate', amount = 2}).category = 'pan'
 RECIPE("nexelit-pulp-04"):add_ingredient({type = "fluid", name = "pressured-air", amount = 75})
-RECIPE("nickel-overflow-2"):change_category('pan')
-RECIPE("nickel-pulp-01"):change_category('agitator')
+RECIPE("nickel-overflow-2").category = 'pan'
+RECIPE("nickel-pulp-01").category = 'agitator'
 RECIPE("nickel-pulp-02"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
-RECIPE("outlet-gas-02"):change_category('gas-separator')
-RECIPE("prepared-nickel-pulp"):change_category('hydrocyclone')
+RECIPE("outlet-gas-02").category = 'gas-separator'
+RECIPE("prepared-nickel-pulp").category = 'hydrocyclone'
 RECIPE("purest-nitrogen-gas"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("sl-01"):add_ingredient({type = "fluid", name = "pressured-air", amount = 50})
 RECIPE("sl-01-2"):add_ingredient({type = "fluid", name = "pressured-air", amount = 350})
-RECIPE("sl-02"):change_category('hydrocyclone')
-RECIPE("sl-03"):change_category('thickener')
+RECIPE("sl-02").category = 'hydrocyclone'
+RECIPE("sl-03").category = 'thickener'
 RECIPE("slz-pulp-02"):replace_ingredient("organic-solvent", "soda-ash")
 RECIPE("ti-overflow-waste"):add_ingredient({type = "fluid", name = "pressured-air", amount = 350})
 RECIPE("ti-pulp-01"):replace_ingredient('sodium-carbonate', 'sodium-chlorate')
-RECIPE("ti-pulp-02"):change_category('grease')
-RECIPE("ti-pulp-03"):change_category('grease'):replace_ingredient("heavy-oil", "grease")
-RECIPE("ti-pulp-04"):change_category('thickener')
-RECIPE("ti-pulp-05"):change_category('hydrocyclone')
-RECIPE("ti-pulp-06"):change_category('pan')
+RECIPE("ti-pulp-02").category = 'grease'
+RECIPE("ti-pulp-03"):replace_ingredient("heavy-oil", "grease").category = 'grease'
+RECIPE("ti-pulp-04").category = 'thickener'
+RECIPE("ti-pulp-05").category = 'hydrocyclone'
+RECIPE("ti-pulp-06").category = 'pan'
 RECIPE("ti-solution-02"):add_ingredient({type = "fluid", name = "pressured-air", amount = 150})
-RECIPE("ti-solution"):change_category('agitator')
-RECIPE("tin-pulp-01"):change_category('pan'):replace_ingredient("nitrogen", "soda-ash")
+RECIPE("ti-solution").category = 'agitator'
+RECIPE("tin-pulp-01"):replace_ingredient("nitrogen", "soda-ash").category = 'pan'
 RECIPE("tin-pulp-02"):add_ingredient({type = 'fluid', name = 'pressured-air', amount = 250})
-RECIPE("tin-slime-overflow"):change_category('thickener')
-RECIPE("tin-slime"):change_category('hydrocyclone')
-RECIPE("u-15-2"):change_category('thickener')
-RECIPE("u-23"):change_category("thickener")
-RECIPE("u-33"):change_category("thickener")
-RECIPE("u-50"):change_category('hydrocyclone')
-RECIPE("u-65"):change_category('hydrocyclone')
-RECIPE("u-70"):change_category("thickener")
-RECIPE("u-73"):change_category("mixer")
+RECIPE("tin-slime-overflow").category = 'thickener'
+RECIPE("tin-slime").category = 'hydrocyclone'
+RECIPE("u-15-2").category = 'thickener'
+RECIPE("u-23").category = 'thickener'
+RECIPE("u-33").category = 'thickener'
+RECIPE("u-50").category = 'hydrocyclone'
+RECIPE("u-65").category = 'hydrocyclone'
+RECIPE("u-70").category = 'thickener'
+RECIPE("u-73").category = 'mixer'
 RECIPE("u-79"):replace_ingredient("organic-solvent", "industrial-solvent")
 RECIPE("u-81"):replace_ingredient("water", "soda-ash")
-RECIPE("u-83"):change_category('agitator')
-RECIPE("u-pulp-02"):change_category('agitator')
-RECIPE("u-rich-pulp"):change_category('agitator')
-RECIPE("zinc-overflow"):change_category('jig')
+RECIPE("u-83").category = 'agitator'
+RECIPE("u-pulp-02").category = 'agitator'
+RECIPE("u-rich-pulp").category = 'agitator'
+RECIPE("zinc-overflow").category = 'jig'
 RECIPE("zinc-pulp-01"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("zinc-pulp-02"):add_ingredient({type = "fluid", name = "pressured-air", amount = 100})
 RECIPE("zinc-pulp-03"):add_ingredient({type = "fluid", name = "pressured-air", amount = 250})
-RECIPE("zinc-pulp-04"):change_category('agitator'):add_ingredient({type = 'fluid', name = 'soda-ash', amount = 300})
-RECIPE("zinc-pulp-04-2"):change_category('thickener')
+RECIPE("zinc-pulp-04"):add_ingredient({type = 'fluid', name = 'soda-ash', amount = 300}).category = 'agitator'
+RECIPE("zinc-pulp-04-2").category = 'thickener'
 
 RECIPE("fuelrod-mk01-1"):replace_ingredient("titanium-plate", {type = "item", name = "lead-container", amount = 1})
 RECIPE("fuelrod-mk01-2"):replace_ingredient("niobium-plate", {type = "item", name = "lead-container", amount = 1})
@@ -487,6 +485,6 @@ RECIPE("fuelrod-mk04"):replace_ingredient("zinc-plate", {type = "item", name = "
 RECIPE("fuelrod-mk05"):replace_ingredient("stainless-steel", {type = "item", name = "coated-container", amount = 1})
 
 if mods["pyhightech"] then
-    RECIPE("aramid-2"):add_ingredient({type = "item", name = "molybdenum-plate", amount = 5}):change_category("nmf")
-    RECIPE("xylenol-3"):change_category("mixer")
+    RECIPE("aramid-2"):add_ingredient({type = "item", name = "molybdenum-plate", amount = 5}).category = 'nmf'
+    RECIPE("xylenol-3").category = 'mixer'
 end
diff --git a/prototypes/updates/pyhightech-updates.lua b/prototypes/updates/pyhightech-updates.lua
index b2bfe6d3..4d6c9376 100644
--- a/prototypes/updates/pyhightech-updates.lua
+++ b/prototypes/updates/pyhightech-updates.lua
@@ -7,7 +7,7 @@ if mods['pyhightech'] and not mods["pyalienlife"] then
 end
 
 RECIPE("al-pulp-01"):replace_ingredient("boric-acid", "phosphoric-acid")
-RECIPE("powdered-ralesia-seeds"):change_category("pulp")
+RECIPE("powdered-ralesia-seeds").category = 'pulp'
 RECIPE("glass-fiber"):add_ingredient({type = "item", name = "sodium-sulfate", amount = 1}):add_ingredient({type = "fluid", name = "molten-glass", amount = 100, fluidbox_index = 2})
 RECIPE("phosphate-glass"):add_ingredient({type = "item", name = "sodium-sulfate", amount = 1}):replace_ingredient("glass-fiber", "crushed-quartz")
 RECIPE("nexelit-matrix"):replace_ingredient("wood", "epoxy")
@@ -39,7 +39,7 @@ RECIPE("colloidal-silica"):replace_ingredient("niobium-plate", "lead-plate")
 RECIPE("resorcinol"):replace_ingredient("phenol", "sodium-hydroxide")
 RECIPE("carbon-aerogel"):remove_ingredient("silicon"):add_ingredient({type = "item", name = "purified-quartz", amount = 1}):remove_ingredient("syngas"):add_ingredient({type = "fluid", name = "nitrogen", amount = 50})
 RECIPE("zinc-acetate"):replace_ingredient("stone-brick", "zinc-plate")
-RECIPE("ndfeb-alloy"):replace_ingredient("carbon-dioxide", "oxygen"):change_category('py-rawores-smelter')
+RECIPE("ndfeb-alloy"):replace_ingredient("carbon-dioxide", "oxygen").category = 'py-rawores-smelter'
 RECIPE("supercapacitor-shell"):replace_ingredient("iron-plate", "aluminium-plate")
 RECIPE("lithium-chloride"):replace_ingredient("sulfuric-acid", "hydrogen-chloride")
 RECIPE("lithium-niobate"):replace_ingredient("chromium", "lithium-chloride")
@@ -96,11 +96,11 @@ RECIPE("ht-generic-wagon"):replace_ingredient("steel-plate", "aluminium-plate"):
 RECIPE("ht-generic-fluid-wagon"):replace_ingredient("steel-plate", "aluminium-plate"):add_ingredient({type = "item", name = "glass", amount = 20}):add_ingredient({type = "item", name = "nickel-plate", amount = 10})
 
 RECIPE("cresylic-acid"):remove_ingredient("aromatics"):add_ingredient({type = "item", name = "phenol", amount = 10})
-RECIPE("outlet-gas-02"):change_category("fbreactor")
-RECIPE("fecr-alloy"):change_category('py-rawores-smelter'):add_ingredient({type = "item", name = "graphite", amount = 3}):remove_unlock("basic-electronics"):add_unlock("stainless-steel-mk01")
-RECIPE("ndfeb-alloy"):change_category('py-rawores-smelter')
-RECIPE("crco-alloy"):change_category('py-rawores-smelter')
-RECIPE("re-tin"):change_category('py-rawores-smelter')
+RECIPE("outlet-gas-02").category = 'fbreactor'
+RECIPE("fecr-alloy"):add_ingredient({type = "item", name = "graphite", amount = 3}):remove_unlock("basic-electronics"):add_unlock("stainless-steel-mk01").category = 'py-rawores-smelter'
+RECIPE("ndfeb-alloy").category = 'py-rawores-smelter'
+RECIPE("crco-alloy").category = 'py-rawores-smelter'
+RECIPE("re-tin").category = 'py-rawores-smelter'
 
 RECIPE("ppd"):replace_ingredient("aromatics", "nitrobenzene")
 
@@ -347,9 +347,9 @@ RECIPE("molten-lead-05"):add_ingredient({type = "item", name = "graphite", amoun
 RECIPE("molten-nickel-00"):add_ingredient({type = "item", name = "graphite", amount = 3})
 RECIPE("molten-steel-02"):add_ingredient({type = "item", name = "graphite", amount = 3})
 RECIPE("molten-tin-01"):add_ingredient({type = "item", name = "graphite", amount = 6})
-RECIPE("molten-tin-02"):add_ingredient({type = "item", name = "graphite", amount = 3})
+--RECIPE("molten-tin-02"):add_ingredient({type = "item", name = "graphite", amount = 3})
 RECIPE("molten-tin-03"):add_ingredient({type = "item", name = "graphite", amount = 3})
-RECIPE("molten-tin-02-2"):add_ingredient({type = "item", name = "graphite", amount = 10})
+--RECIPE("molten-tin-02-2"):add_ingredient({type = "item", name = "graphite", amount = 10})
 RECIPE("molten-tin-04"):add_ingredient({type = "item", name = "graphite", amount = 3})
 RECIPE("molten-tin-05"):add_ingredient({type = "item", name = "graphite", amount = 2})
 RECIPE("nexelit-refined-pulp"):add_ingredient({type = "item", name = "graphite", amount = 3})
@@ -365,7 +365,7 @@ RECIPE("starch"):add_ingredient({type = 'item', name = 'fiberboard', amount = 1}
 RECIPE("starch-2"):add_ingredient({type = 'item', name = 'fiberboard', amount = 1})
 RECIPE("p2s5"):remove_ingredient("stone"):add_ingredient({type = "item", name = "phosphate-rock", amount = 5})
 RECIPE("p2s5-2"):remove_ingredient("stone"):add_ingredient({type = "item", name = "phosphate-rock", amount = 5})
-RECIPE("ammonium-chloride"):change_category('fbreactor'):replace_ingredient("water", "ammonia")
+RECIPE("ammonium-chloride"):replace_ingredient("water", "ammonia").category = 'fbreactor'
 RECIPE("battery-1"):add_ingredient({type = 'item', name = 'rayon', amount = 2})
 RECIPE("battery-2"):add_ingredient({type = 'item', name = 'rayon', amount = 2})
 RECIPE("armac-12"):replace_ingredient('chlorine','ammonia')
diff --git a/scripts/wiki/text-pages.lua b/scripts/wiki/text-pages.lua
index d8ef2155..593490d9 100644
--- a/scripts/wiki/text-pages.lua
+++ b/scripts/wiki/text-pages.lua
@@ -1,6 +1,4 @@
-local Event = require('__stdlib__/stdlib/event/event')
-
-Event.register(Event.core_events.init_and_config, function()
+py.on_event('on_init', function()
     remote.call('pywiki', 'add_section', 'rawores')
 
     remote.call('pywiki', 'add_page', {