diff --git a/.gitignore b/.gitignore
index c4a61b45a..dc77040df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 *.dat
 mod-list.json
 .idea/
+.vscode/
diff --git a/angelsaddons-cab/changelog.txt b/angelsaddons-cab/changelog.txt
index d098a90ad..31582a9e9 100644
--- a/angelsaddons-cab/changelog.txt
+++ b/angelsaddons-cab/changelog.txt
@@ -1,4 +1,9 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.2.7
+Date:??
+  Changes:
+    - Changed and expanded locale strings and text descriptions (489)
+---------------------------------------------------------------------------------------------------
 Version: 0.2.6
 Date: 27.11.2020
   Changes:
diff --git a/angelsaddons-cab/info.json b/angelsaddons-cab/info.json
index deb61f628..57bf48932 100644
--- a/angelsaddons-cab/info.json
+++ b/angelsaddons-cab/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-cab",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "factorio_version": "1.1",
   "title": "Angel's Addons - C.A.B.",
   "author": "Arch666Angel, lovely_santa",
diff --git a/angelsaddons-cab/locale/en/cab.cfg b/angelsaddons-cab/locale/en/cab.cfg
index cbd3c93ba..ff04d6140 100644
--- a/angelsaddons-cab/locale/en/cab.cfg
+++ b/angelsaddons-cab/locale/en/cab.cfg
@@ -2,7 +2,7 @@
 angels-cab=C.A.B.
 
 [entity-description]
-angels-cab=Crawler Autonomous Base
+angels-cab=Crawler Autonomous Base. Enter the vehicle and activate deployment charges to deploy the __ENTITY__angels-cab__. When deployed it will provide electric energy from its own grid to nearby buildings.
 
 [item-name]
 angels-cab-deploy=__ENTITY__angels-cab__ deploy
diff --git a/angelsaddons-mobility/changelog.txt b/angelsaddons-mobility/changelog.txt
index 02bcef2e2..4362b565c 100644
--- a/angelsaddons-mobility/changelog.txt
+++ b/angelsaddons-mobility/changelog.txt
@@ -1,4 +1,15 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.0.7
+Date: ??
+  Changes:
+    - Added HQ tier numbering icons
+    - Changed and expanded locale strings and text descriptions (489)
+---------------------------------------------------------------------------------------------------
+Version: 0.0.6
+Date: 20.01.2021
+  Bugfixes:
+    - Fixed that braking force was not increasing per tier
+---------------------------------------------------------------------------------------------------
 Version: 0.0.5
 Date: 27.11.2020
   Bugfixes:
diff --git a/angelsaddons-mobility/graphics/icons/num_1.png b/angelsaddons-mobility/graphics/icons/num_1.png
deleted file mode 100644
index 4c74e0341..000000000
Binary files a/angelsaddons-mobility/graphics/icons/num_1.png and /dev/null differ
diff --git a/angelsaddons-mobility/graphics/icons/num_2.png b/angelsaddons-mobility/graphics/icons/num_2.png
deleted file mode 100644
index 58601a0f8..000000000
Binary files a/angelsaddons-mobility/graphics/icons/num_2.png and /dev/null differ
diff --git a/angelsaddons-mobility/graphics/icons/num_3.png b/angelsaddons-mobility/graphics/icons/num_3.png
deleted file mode 100644
index 291e844b7..000000000
Binary files a/angelsaddons-mobility/graphics/icons/num_3.png and /dev/null differ
diff --git a/angelsaddons-mobility/graphics/icons/num_4.png b/angelsaddons-mobility/graphics/icons/num_4.png
deleted file mode 100644
index ef93f45aa..000000000
Binary files a/angelsaddons-mobility/graphics/icons/num_4.png and /dev/null differ
diff --git a/angelsaddons-mobility/graphics/icons/num_5.png b/angelsaddons-mobility/graphics/icons/num_5.png
deleted file mode 100644
index 6bdfe44e0..000000000
Binary files a/angelsaddons-mobility/graphics/icons/num_5.png and /dev/null differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-1-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-1-outline.png
new file mode 100644
index 000000000..c5ed12047
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-1-outline.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-1.png b/angelsaddons-mobility/graphics/icons/numerals/num-1.png
new file mode 100644
index 000000000..6f25a75da
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-1.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-2-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-2-outline.png
new file mode 100644
index 000000000..e733c5567
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-2-outline.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-2.png b/angelsaddons-mobility/graphics/icons/numerals/num-2.png
new file mode 100644
index 000000000..aac23f47c
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-2.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-3-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-3-outline.png
new file mode 100644
index 000000000..137cbb67a
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-3-outline.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-3.png b/angelsaddons-mobility/graphics/icons/numerals/num-3.png
new file mode 100644
index 000000000..693fe81a1
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-3.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-4-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-4-outline.png
new file mode 100644
index 000000000..4df5a8984
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-4-outline.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-4.png b/angelsaddons-mobility/graphics/icons/numerals/num-4.png
new file mode 100644
index 000000000..7c0d40c55
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-4.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-5-outline.png b/angelsaddons-mobility/graphics/icons/numerals/num-5-outline.png
new file mode 100644
index 000000000..e8216997a
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-5-outline.png differ
diff --git a/angelsaddons-mobility/graphics/icons/numerals/num-5.png b/angelsaddons-mobility/graphics/icons/numerals/num-5.png
new file mode 100644
index 000000000..53fb265d1
Binary files /dev/null and b/angelsaddons-mobility/graphics/icons/numerals/num-5.png differ
diff --git a/angelsaddons-mobility/info.json b/angelsaddons-mobility/info.json
index 0dd0392d4..9fd5ec915 100644
--- a/angelsaddons-mobility/info.json
+++ b/angelsaddons-mobility/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsaddons-mobility",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "factorio_version": "1.1",
   "title": "Angel's Addons - Mass Transit",
   "author": "Arch666Angel, lovely_santa",
@@ -9,6 +9,7 @@
   "description": "A combination mod of the various themed trains.",
   "dependencies": [
     "base >= 1.1.0",
+    "(?) angelsrefining >= 0.11.20",
     "? angelsindustries >= 0.4.9"
   ]
 }
diff --git a/angelsaddons-mobility/locale/en/crawlertrain.cfg b/angelsaddons-mobility/locale/en/crawlertrain.cfg
index 162dba0d5..8ba809d9b 100644
--- a/angelsaddons-mobility/locale/en/crawlertrain.cfg
+++ b/angelsaddons-mobility/locale/en/crawlertrain.cfg
@@ -25,8 +25,21 @@ crawler-wagon=Crawler cargo wagon
 [technology-name]
 angels-crawler-train=Crawler train
 
+[entity-description]
+crawler-locomotive=Locomotive with the "Crawler" aesthetic.
+crawler-locomotive-wagon=Locomotive with the air resistance of a cargo wagon.
+crawler-bot-wagon=Can be equipped with a vehicle roboport for mobile construction works.
+
+crawler-locomotive-1-2=Locomotive with the "Crawler" aesthetic.
+crawler-locomotive-wagon-2=Locomotive with the air resistance of a cargo wagon.
+crawler-bot-wagon-2=Can be equipped with a vehicle roboport for mobile construction works.
+
+crawler-locomotive-1-3=Locomotive with the "Crawler" aesthetic.
+crawler-locomotive-wagon-3=Locomotive with the air resistance of a cargo wagon.
+crawler-bot-wagon-3=Can be equipped with a vehicle roboport for mobile construction works.
+
 [technology-description]
-angels-crawler-train=Crawler construction trains.
+angels-crawler-train=Trains with the "Crawler" aesthetic, come with robot wagons for mobile construction works.
 
 [mod-setting-name]
 angels-crawlertrain-tier-amount=Crawler train tiers (0 for off)
diff --git a/angelsaddons-mobility/locale/en/petrotrain.cfg b/angelsaddons-mobility/locale/en/petrotrain.cfg
index ecd7ca5b0..5701488e1 100644
--- a/angelsaddons-mobility/locale/en/petrotrain.cfg
+++ b/angelsaddons-mobility/locale/en/petrotrain.cfg
@@ -22,6 +22,22 @@ petro-tank2=PetroChem oil fluid wagon
 [technology-name]
 angels-petro-train=PetroChem trains
 
+[entity-description]
+petro-locomotive-1=Locomotive with the "Petrochemical" aesthetic.
+petro-tank1=High-capacity fluid wagon with an aesthetic suitable for gasses.
+petro-tank2=High-capacity fluid wagon with an aesthetic suitable for liquids.
+
+petro-locomotive-1-2=Locomotive with the "Petrochemical" aesthetic.
+petro-tank1-2=High-capacity fluid wagon with an aesthetic suitable for gasses.
+petro-tank2-2=High-capacity fluid wagon with an aesthetic suitable for liquids.
+
+petro-locomotive-1-3=Locomotive with the "Petrochemical" aesthetic.
+petro-tank1-3=High-capacity fluid wagon with an aesthetic suitable for gasses.
+petro-tank2-3=High-capacity fluid wagon with an aesthetic suitable for liquids.
+
+[technology-description]
+angels-petro-train=Trains with the "Petrochemical" aesthetic, come with high-capacity fluid wagons for liquids or gasses.
+
 [mod-setting-name]
 angels-petrotrain-tier-amount=Petrochem train tiers (0 for off)
 
diff --git a/angelsaddons-mobility/locale/en/smeltingtrain.cfg b/angelsaddons-mobility/locale/en/smeltingtrain.cfg
index 00e10faab..49bbc0c80 100644
--- a/angelsaddons-mobility/locale/en/smeltingtrain.cfg
+++ b/angelsaddons-mobility/locale/en/smeltingtrain.cfg
@@ -22,6 +22,19 @@ smelting-wagon-1=Smelting cargo wagon
 [technology-name]
 angels-smelting-train=Smelting trains
 
+[entity-description]
+smelting-locomotive-1=Locomotive with the "Smelting" aesthetic.
+smelting-locomotive-tender=Locomotive with the air resistance of a cargo wagon.
+
+smelting-locomotive-1-2=Locomotive with the "Smelting" aesthetic.
+smelting-locomotive-tender-2=Locomotive with the air resistance of a cargo wagon.
+
+smelting-locomotive-1-3=Locomotive with the "Smelting" aesthetic.
+smelting-locomotive-tender-3=Locomotive with the air resistance of a cargo wagon.
+
+[technology-description]
+angels-smelting-train=Trains with the "Smelting" aesthetic, come with high-capacity cargo wagons.
+
 [mod-setting-name]
 angels-smeltingtrain-tier-amount=Smelting train tiers (0 for off)
 
diff --git a/angelsaddons-mobility/prototypes/train-functions.lua b/angelsaddons-mobility/prototypes/train-functions.lua
index a30c11bd6..021e8a150 100644
--- a/angelsaddons-mobility/prototypes/train-functions.lua
+++ b/angelsaddons-mobility/prototypes/train-functions.lua
@@ -163,6 +163,26 @@ local function generate_train_recipe(item, add_unlock)
   data:extend(entries)
 end
 
+local add_tier_number = mods["angelsrefining"] and
+  angelsmods.functions.add_number_icon_layer or
+  function(icon_layers, number_tier, number_tint)
+    local icon_size_scale = ((icon_layers[1] or {}).icon_size or 32) * ((icon_layers[1] or {}).scale or 1) / 32
+    local new_icon_layers = util.table.deepcopy(icon_layers)
+    table.insert(new_icon_layers, {
+      icon = "__angelsaddons-mobility__/graphics/icons/numerals/num-"..number_tier.."-outline.png",
+      icon_size = 64, icon_mipmaps = 2,
+      tint = {0, 0, 0, 255},
+      scale = 0.5 * icon_size_scale
+    })
+    table.insert(new_icon_layers, {
+      icon = "__angelsaddons-mobility__/graphics/icons/numerals/num-"..number_tier..".png",
+      icon_size = 64, icon_mipmaps = 2,
+      tint = number_tint,
+      scale = 0.5 * icon_size_scale
+    })
+    return new_icon_layers
+  end
+
 local function generate_train_items(item)
   local entries = {}
   local type = set_type(item.name)
@@ -179,19 +199,17 @@ local function generate_train_items(item)
       copy.localised_name = {"", {"item-name." .. item.name}, " MK" .. i}
       copy.localised_description = {"item-description." .. item.name}
       copy.place_result = name
-      copy.icons = {
+      copy.icons = item.icons or {
         {
           icon = item.icon,
-          icon_size = item.icon_size
-        },
-        {
-          icon = "__angelsaddons-mobility__/graphics/icons/num_" .. i .. ".png",
-          tint = angelsmods.addons.mobility[type].number_tint,
-          scale = 0.32,
-          shift = {12, -12}
+          icon_size = item.icon_size,
+          icon_mipmaps = item.icon_mipmaps
         }
       }
       copy.icon = nil
+      copy.icon_size = nil
+      copy.icon_mipmaps = nil
+      copy.icons = add_tier_number(copy.icons, i, angelsmods.addons.mobility[type].number_tint)
       table.insert(entries, copy)
     end
   else
@@ -219,25 +237,24 @@ local function generate_train_entities(item)
 
       copy.name = name
       copy.localised_name = {"", {"entity-name." .. item.name}, " MK" .. i}
-      copy.icons = {
+      copy.icons = item.icons or {
         {
           icon = item.icon,
-          icon_size = item.icon_size
-        },
-        {
-          icon = "__angelsaddons-mobility__/graphics/icons/num_" .. i .. ".png",
-          tint = angelsmods.addons.mobility[type].number_tint,
-          scale = 0.32,
-          shift = {12, -12}
+          icon_size = item.icon_size,
+          icon_mipmaps = item.icon_mipmaps
         }
       }
       copy.icon = nil
+      copy.icon_size = nil
+      copy.icon_mipmaps = nil
+      copy.icons = add_tier_number(copy.icons, i, angelsmods.addons.mobility[type].number_tint)
       copy.minable.result = name
       copy.max_health = item.max_health * multiplier
       copy.max_speed = item.max_speed * multiplier
       copy.friction_force = item.friction_force / multiplier
       copy.air_resistance = item.air_resistance / multiplier
       copy.weight = item.weight * multiplier
+      copy.braking_force = item.braking_force * (multiplier * 2 - 1)
       if item.type == "locomotive" then
         copy.max_power = (tonumber(item.max_power:match("%d[%d.]*")) * multiplier) .. "kW"
         copy.reversing_power_modifier = item.reversing_power_modifier * multiplier
diff --git a/angelsaddons-storage/changelog.txt b/angelsaddons-storage/changelog.txt
index 8b2860097..e56396bba 100644
--- a/angelsaddons-storage/changelog.txt
+++ b/angelsaddons-storage/changelog.txt
@@ -8,6 +8,9 @@ Date: ??
     - Changed recipes of ore silos when playing with angels refining (340)
     - Changed some recipes of logistics silos when playing with angels industries (340)
     - Changed some recipes of logistics warehouses when playing with angels industries (340)
+    - Changed slot count for active providers to match the storage variant
+    - Changed ore silo pick-up result to be just the regular silo (541)
+    - Changed and expanded locale strings and text descriptions (489)
 ---------------------------------------------------------------------------------------------------
 Version: 0.0.4
 Date: 27.11.2020
diff --git a/angelsaddons-storage/locale/en/storage.cfg b/angelsaddons-storage/locale/en/storage.cfg
index 44ff41313..e8390251d 100644
--- a/angelsaddons-storage/locale/en/storage.cfg
+++ b/angelsaddons-storage/locale/en/storage.cfg
@@ -61,10 +61,40 @@ pressure-tanks=Pressure tanks
 
 [mod-setting-name]
 angels-enable-storage-icon-scaling=Enable icon scaling on silos and warehouses
-angels-enable-silos=Enable Angel's logistic silos
+angels-enable-silos=Enable Angel's silos
 angels-enable-oresilos=Enable Angel's ore themed silos
-angels-enable-warehouses=Enable Angel's logistic warehouses
+angels-enable-warehouses=Enable Angel's warehouses
 angels-enable-pressure-tank=Enable pressure fluid tanks
 
 [mod-setting-description]
 angels-enable-storage-icon-scaling=Icons on silos and warehouses scale to size of the silos and warehouses, instead of being small.
+
+[technology-description]
+ore-silos=Large containers for long-term storage.
+logistic-silos=Silos for the logistic network.
+
+angels-warehouses=Huge containers for long-term storage.
+angels-logistic-warehouses=Warehouses for the logistic network.
+
+pressure-tanks=Pressurized storage tank with high capacity for liquids or gasses.
+
+[entity-description]
+silo-ore1=Silo with a "Saphirite" aesthetic.
+silo-ore2=Silo with a "Jivolite" aesthetic.
+silo-ore3=Silo with a "Stiratite" aesthetic.
+silo-ore4=Silo with a "Crotinnium" aesthetic.
+silo-ore5=Silo with a "Rubyte" aesthetic.
+silo-ore6=Silo with a "Bobmonium" aesthetic.
+silo-coal=Silo with a "Coal" aesthetic.
+
+silo-active-provider=Sends its content to the logistic network.
+silo-passive-provider=Makes its content available to the logistic network.
+silo-requester=Requests specified items from the logistic network.
+silo-storage=Long-term storage for the logistic network.
+silo-buffer=Requests specified items to be available for personal logistics and automated construction.
+
+angels-warehouse-passive-provider=Sends its content to the logistic network.
+angels-warehouse-active-provider=Makes its content available to the logistic network.
+angels-warehouse-storage=Long-term storage for the logistic network.
+angels-warehouse-requester=Requests specified items from the logistic network.
+angels-warehouse-buffer=Requests specified items to be available for personal logistics and automated construction.
diff --git a/angelsaddons-storage/prototypes/buildings/silos.lua b/angelsaddons-storage/prototypes/buildings/silos.lua
index 90868e3dd..1ee48e291 100644
--- a/angelsaddons-storage/prototypes/buildings/silos.lua
+++ b/angelsaddons-storage/prototypes/buildings/silos.lua
@@ -65,7 +65,7 @@ if angelsmods.addons.storage.oresilos then
     cont_add.name = "silo-"..name
     cont_add.icon = "__angelsaddons-storage__/graphics/icons/silo-"..name..".png"
     cont_add.picture.filename = "__angelsaddons-storage__/graphics/entity/silo-"..name..".png"
-    cont_add.minable.result = "silo-"..name
+    --cont_add.minable.result = "silo-"..name --want to actually return the silo
 
     item_add = table.deepcopy(data.raw.item.silo)
     item_add.name = "silo-"..name
@@ -85,11 +85,11 @@ if angelsmods.addons.storage.silos then
   -- LOGISTIC SILOS -----------------------------------------------------------
   -----------------------------------------------------------------------------
   local log_names = {
-    ["aprovider"] = {order = "i", stacks = 209, mode = "active-provider"},
+    ["aprovider"] = {order = "i", stacks = 384, mode = "active-provider"},
     ["pprovider"] = {order = "j", stacks = 256, mode = "passive-provider"},
     ["storage"]   = {order = "k", stacks = 384, mode = "storage", slots = 1},
-    ["buffer"]    = {order = "l", stacks = 256, mode = "buffer", slots = 12},
-    ["requester"] = {order = "m", stacks = 209, mode = "requester", slots = 12}
+    ["buffer"]    = {order = "l", stacks = 256, mode = "buffer"},
+    ["requester"] = {order = "m", stacks = 209, mode = "requester"}
   }
   local silo_add = {}
   for name,stat in pairs(log_names) do
@@ -116,4 +116,4 @@ if angelsmods.addons.storage.silos then
     silo_add[#silo_add+1] = item_add
   end
   data:extend(silo_add)
-end
\ No newline at end of file
+end
diff --git a/angelsaddons-storage/prototypes/buildings/warehouses.lua b/angelsaddons-storage/prototypes/buildings/warehouses.lua
index 186be258c..1eefdd356 100644
--- a/angelsaddons-storage/prototypes/buildings/warehouses.lua
+++ b/angelsaddons-storage/prototypes/buildings/warehouses.lua
@@ -56,11 +56,11 @@ if angelsmods.addons.storage.warehouses then
   -- LOGISTIC WAREHOUSES ------------------------------------------------------
   -----------------------------------------------------------------------------
   local log_names = {
-    ["aprovider"] = {order = "i", stacks = 418, mode = "active-provider"},
+    ["aprovider"] = {order = "i", stacks = 768, mode = "active-provider"},
     ["pprovider"] = {order = "j", stacks = 512, mode = "passive-provider"},
     ["storage"]   = {order = "k", stacks = 768, mode = "storage", slots = 1},
-    ["buffer"]    = {order = "l", stacks = 512, mode = "buffer", slots = 20},
-    ["requester"] = {order = "m", stacks = 418, mode = "requester", slots = 20}
+    ["buffer"]    = {order = "l", stacks = 512, mode = "buffer"},
+    ["requester"] = {order = "m", stacks = 418, mode = "requester"}
   }
   local warehouse_add = {}
   for name,stat in pairs(log_names) do
@@ -87,4 +87,4 @@ if angelsmods.addons.storage.warehouses then
     warehouse_add[#warehouse_add+1] = item_add
   end
   data:extend(warehouse_add)
-end
\ No newline at end of file
+end
diff --git a/angelsaddons-storage/settings-updates.lua b/angelsaddons-storage/settings-updates.lua
index 7ab601174..3548e5a90 100644
--- a/angelsaddons-storage/settings-updates.lua
+++ b/angelsaddons-storage/settings-updates.lua
@@ -1,12 +1,3 @@
-local function hide_setting(setting_type, setting_name, setting_default)
-  if data.raw[setting_type] and data.raw[setting_type][setting_name] then
-    data.raw[setting_type][setting_name].hidden = true
-    if setting_default ~= nil then
-      data.raw[setting_type][setting_name].default_value = setting_default
-    end
-  end
-end
-
 if mods["angelspetrochem"] then
-  hide_setting("bool-setting", "angels-enable-inline-tank")
+  angelsmods.settings.hide_setting("bool-setting", "angels-enable-inline-tank")
 end
\ No newline at end of file
diff --git a/angelsbioprocessing/changelog.txt b/angelsbioprocessing/changelog.txt
index 2b029f64b..559bf735b 100644
--- a/angelsbioprocessing/changelog.txt
+++ b/angelsbioprocessing/changelog.txt
@@ -14,6 +14,8 @@ Date: ??
     - Moved algae farms 2 and 3 deeper into the tech tree (503)
     - In component mode, decreased the cost of algae farm 2 from tier 3 to tier 2 blocks (503)
     - Split plant and fish pressing in two techs to account for the ceramic filter (428)
+    - Hide unused items (plant milk and bio wooden board) (523)
+    - Changed and expanded locale strings and text descriptions (489)
   Bugfixes:
     - Fixed bob modules category icon did not fit the category box size (483)
     - Fixed bob modules tech icons did not fit the tech box (483)
@@ -21,6 +23,9 @@ Date: ??
     - Fixed agricultural modules would not upgrade correctly
     - Fixed agricultural modules all used the same tech icon (493)
     - Fixed angels fishes were not set as consumable items (490)
+    - Fixed with bobs modules that the module 2 and 3 technologies would have wrong icon_size (508)
+    - Added bio-tile to this mod from industries
+      - Still needs recipe and tech-unlock
 ---------------------------------------------------------------------------------------------------
 Version: 0.7.17
 Date: 26.11.2020
diff --git a/angelsbioprocessing/control.lua b/angelsbioprocessing/control.lua
index cdbb7167f..06e19ce7b 100644
--- a/angelsbioprocessing/control.lua
+++ b/angelsbioprocessing/control.lua
@@ -108,9 +108,9 @@ end)
 script.on_event(defines.events.on_player_cursor_stack_changed, function(event)
   local player = game.get_player(event.player_index)
   local opened_entity = player.opened
-  if not (opened_entity and opened_entity.valid and
+  if not (opened_entity and opened_entity.valid and opened_entity.object_name ~= 'LuaEquipmentGrid' and
         (opened_entity.type == "lab" or opened_entity.type == "mining-drill")) then return end
-  
+
   local player_cursor_stack = player.cursor_stack
   if not player_cursor_stack then return end
 
@@ -157,9 +157,9 @@ end)
 script.on_event(defines.events.on_player_main_inventory_changed, function(event)
   local player = game.get_player(event.player_index)
   local opened_entity = player.opened
-  if not (opened_entity and opened_entity.valid and
+  if not (opened_entity and opened_entity.valid and opened_entity.object_name ~= 'LuaEquipmentGrid' and
          (opened_entity.type == "lab" or opened_entity.type == "mining-drill")) then return end
-  
+
   local module_inventory = opened_entity.get_module_inventory()
   if not module_inventory then return end
 
@@ -182,4 +182,4 @@ script.on_event(defines.events.on_player_main_inventory_changed, function(event)
       end
     end
   end
-end)
\ No newline at end of file
+end)
diff --git a/angelsbioprocessing/data-updates.lua b/angelsbioprocessing/data-updates.lua
index e8a1d5c73..ba50ed6fa 100644
--- a/angelsbioprocessing/data-updates.lua
+++ b/angelsbioprocessing/data-updates.lua
@@ -8,5 +8,22 @@ angelsmods.functions.add_flag("bio-hogger-3", "hidden")
 angelsmods.functions.add_flag("bio-hogger-4", "hidden")
 angelsmods.functions.add_flag("bio-hogger-5", "hidden")
 angelsmods.functions.add_flag("bio-refugium-hogger", "hidden")
+angelsmods.functions.OV.hide_recipe({
+  "hogger-hogging-1",
+  "hogger-hogging-2",
+  "hogger-hogging-3",
+  "hogger-hogging-4",
+  "hogger-hogging-5",
+  "hogger-breeding-1",
+  "hogger-breeding-2",
+  "hogger-breeding-3",
+  "hogger-breeding-4",
+  "hogger-breeding-5",
+  "bio-refugium-hogger",
+  "hogger-butchery-1",
+  "hogger-butchery-2",
+  "hogger-butchery-3",
+  "hogger-butchery-4",
+  "hogger-butchery-5"})
 
 angelsmods.functions.OV.execute()
diff --git a/angelsbioprocessing/data.lua b/angelsbioprocessing/data.lua
index 9a401efb4..49dae690d 100644
--- a/angelsbioprocessing/data.lua
+++ b/angelsbioprocessing/data.lua
@@ -67,6 +67,7 @@ require("prototypes.buildings.hatchery")
 require("prototypes.buildings.butchery")
 require("prototypes.buildings.gardens")
 require("prototypes.buildings.trees")
+require("prototypes.buildings.bio-tile")
 --require("prototypes.buildings.puffer-spawner")
 require("prototypes.buildings.puffer-nest")
 require("prototypes.buildings.alien-fish")
diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-corner-inner.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-inner.png
similarity index 100%
rename from angelsindustries/graphics/entity/tile-bio/bio-tile-corner-inner.png
rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-inner.png
diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-corner-o.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-o.png
similarity index 100%
rename from angelsindustries/graphics/entity/tile-bio/bio-tile-corner-o.png
rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-o.png
diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-corner-outer.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-outer.png
similarity index 100%
rename from angelsindustries/graphics/entity/tile-bio/bio-tile-corner-outer.png
rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-outer.png
diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-corner-u.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-u.png
similarity index 100%
rename from angelsindustries/graphics/entity/tile-bio/bio-tile-corner-u.png
rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-corner-u.png
diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-side.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-side.png
similarity index 100%
rename from angelsindustries/graphics/entity/tile-bio/bio-tile-side.png
rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-side.png
diff --git a/angelsindustries/graphics/entity/tile-bio/bio-tile-small.png b/angelsbioprocessing/graphics/entity/tile-bio/bio-tile-small.png
similarity index 100%
rename from angelsindustries/graphics/entity/tile-bio/bio-tile-small.png
rename to angelsbioprocessing/graphics/entity/tile-bio/bio-tile-small.png
diff --git a/angelsbioprocessing/info.json b/angelsbioprocessing/info.json
index 95e7976b7..9f55cd57a 100644
--- a/angelsbioprocessing/info.json
+++ b/angelsbioprocessing/info.json
@@ -2,7 +2,7 @@
   "name": "angelsbioprocessing",
   "version": "0.7.18",
   "factorio_version": "1.1",
-  "title": "Angel's Bio Processing",
+  "title": "Angel's Bioprocessing",
   "author": "Arch666Angel",
   "contact": "https://discord.gg/ff5p6KE",
   "homepage": "https://forums.factorio.com/viewforum.php?f=185",
diff --git a/angelsbioprocessing/locale/en/bio-processing.cfg b/angelsbioprocessing/locale/en/bio-processing.cfg
index 14d73f4b0..d091a481b 100644
--- a/angelsbioprocessing/locale/en/bio-processing.cfg
+++ b/angelsbioprocessing/locale/en/bio-processing.cfg
@@ -8,10 +8,10 @@ temperate-farm=Temperate-environment farm
 desert-farm=Desert-environment farm
 swamp-farm=Swamp-environment farm
 
-composter=Composter
 seed-extractor=Seed extractor
-bio-press=Press
-bio-processor=Bio processor
+composter=Composter
+bio-processor=Bioprocessor
+bio-press=Oil press
 nutrient-extractor=Nutrient extractor
 
 temperate-garden=Temperate garden
@@ -42,6 +42,43 @@ alien-fish-1=Levac fish
 alien-fish-2=Dorflurp jellyfish
 alien-fish-3=Santa ray
 
+[entity-description]
+algae-farm=A place to grow algae in a controlled aquaculture.
+algae-farm-2=A place to grow algae in a controlled aquaculture.
+algae-farm-3=A place to grow algae in a controlled aquaculture.
+
+crop-farm=A field to sow seeds and grow crops as well as gardens.
+temperate-farm=A field to sow seeds and grow crops as well as gardens. Maintains temperate climate conditions for specialized plants.
+desert-farm=A field to sow seeds and grow crops as well as gardens. Maintains dry climate conditions for specialized plants.
+swamp-farm=A field to sow seeds and grow crops as well as gardens. Maintains wet climate conditions for specialized plants.
+
+seed-extractor=Extracts seeds from plants, as well as gardens. Can also produce alien plant-life samples from gardens.
+composter=Turns any organic material into compost.
+bio-processor=Turns harvested plants into organic intermeditate products.
+bio-press=Extracts oil from organic material.
+nutrient-extractor=Produces nutrient pulp from organic material.
+
+temperate-garden=Source of alien plant-life samples and of seeds specialized for temperate climate.
+desert-garden=Source of alien plant-life samples and of seeds specialized for dry climate.
+swamp-garden=Source of alien plant-life samples and of seeds specialized for wet climate.
+puffer-nest=The puffers native to this planet exhale useful gasses.
+
+temperate-tree=Rare type of tree rich in organic resin.
+desert-tree=Rare type of tree rich in organic rubber.
+swamp-tree=Rare type of tree rich in organic polymers.
+
+bio-generator-temperate-1=Turns seedlings into tree seeds. Specialized for temperate climate conditions.
+bio-generator-desert-1=Turns seedlings into tree seeds. Specialized for dry climate conditions.
+bio-generator-swamp-1=Turns seedlings into tree seeds. Specialized for wet climate conditions.
+bio-arboretum-1=Protected place to grow and harvest trees.
+
+bio-hatchery=A cozy place where puffer eggs can hatch.
+bio-refugium-biter=Fenced in safely from the outside world, biters can be grown here.
+bio-refugium-fish=More than just decoration, can be made home to a variety of fish.
+bio-refugium-hogger=Dirt digging hogger feel right at home here.
+bio-refugium-puffer=It stinks, but puffers feel right at home in this gas filled tower.
+bio-butchery=Slaughters animals and thus produces meat.
+
 [item-name]
 algae-green=Green algae
 cellulose-fiber=Cellulose fiber
@@ -53,6 +90,7 @@ solid-saw=Timborer's saw blade
 solid-crystal-tipped-saw=Crystal-tipped saw blade
 solid-crystal-full-saw=Crystal saw blade
 solid-tree=Tree
+bio-tile=Biologically active tile
 
 algae-brown=Brown algae
 solid-alginic-acid=Alginic acid
@@ -70,7 +108,7 @@ solid-calcium-carbonate=Calcium carbonate
 petri-dish=Petri dish
 alien-bacteria=Alien bacteria
 alien-pre-artifact=Alien pre-artifact
-substrate-dish=Substrate dish
+substrate-dish=Petri dish with growth medium
 
 paste-silver=Silver paste
 paste-titanium=Titanium paste
@@ -160,19 +198,19 @@ swamp-5=Mushredtato
 swamp-5-seed=Mushredtato seed
 swamp-5-seed-dormant=Dormant mushredtato seed
 
-token-bio=Alien plant life sample
+token-bio=Alien plant-life sample
 
 solid-beans=Beans
 solid-corn=Corn
-solid-leafs=Leafs
+solid-leafs=Leaves
 solid-nuts=Nuts
 solid-pips=Pips
 solid-fruit=Fruits
 solid-flour=Flour
 
-temperate-upgrade=Temperate environment kit
-desert-upgrade=Desert environment kit
-swamp-upgrade=Swamp environment kit
+temperate-upgrade=Temperate-environment kit
+desert-upgrade=Desert-environment kit
+swamp-upgrade=Swamp-environment kit
 
 bio-puffer-1=Gaseous puffer
 bio-puffer-2=Rancid puffer
@@ -185,8 +223,8 @@ bio-puffer-egg-2=Rancid puffer egg
 bio-puffer-egg-3=Blazing puffer egg
 bio-puffer-egg-4=Acidic puffer egg
 bio-puffer-egg-5=Corrosive puffer egg
-bio-puffer-egg-shell=Puffer egg shell remains
-bio-puffer-egg-shell-powder=Puffer egg shell powder
+bio-puffer-egg-shell=Puffer egg-shell remains
+bio-puffer-egg-shell-powder=Puffer egg-shell powder
 
 bio-hogger-1=AA hogger
 bio-hogger-2=BB hogger
@@ -215,7 +253,7 @@ biter-big-egg=Big biter egg
 bio-raw-meat=Raw meat
 bio-alien-processed-meat=Alien-processed meat
 
-seeded-dish=Seeded dish
+seeded-dish=Inoculated Petri dish
 crystal-seed=Crystal seed
 crystal-enhancer=Crystal enhancer
 crystal-grindstone=Crystal grindstone
@@ -258,6 +296,42 @@ angels-bio-yield-module-6=Agriculture module 6
 angels-bio-yield-module-7=Agriculture module 7
 angels-bio-yield-module-8=Agriculture module 8
 
+[item-description]
+solid-saw="He saw, he cut, and he shattered."
+
+temperate-1=Wil. Plant from a place where no man has gone before.
+temperate-2=Fluffy. Makes you want to go to bed.
+temperate-3=Sour. Best served in a hot sauce.
+temperate-4=Adaptive. Can be used for a variety of things.
+temperate-5=Tasty. Very generous range of flavours.
+
+desert-1=Sweet. Gets you all fuzzy and warm around your heart.
+desert-2=Organized. Grows in ordered lines.
+desert-3=Productive. Will always arrange itself in orderly lines.
+desert-4=Zealous. Always dynamic.
+desert-5=Salty. Has to be handled with care.
+
+swamp-1=Nutty. Makes you slightly mad.
+swamp-2=Lively. Seem to be growing disregarding the conditions.
+swamp-3=Commanding. Don't use too much.
+swamp-4=Binary. It grows or it does not, nothing in between.
+swamp-5=Spicy. Seems to yell at you.
+
+solid-nuclear-fertilizer=This doesn't sound healty... we might start to glow at night!
+
+raw-fish=A friendly reminder to those who knew Factorio before an Angel stopped by.
+alien-fish-1-raw=The least deadly fish on this alien planet.
+alien-fish-2-raw=Oblivious of their surroundings, very frugal beings.
+alien-fish-3-raw=Lovely fish at first sight, but don't anger them.
+
+bio-raw-meat=It tastes like chicken...
+
+bio-tile=A biologically active tile which gives fast run speed and absorbs pollution
+
+angels-bio-yield-module=A module that increases productivity, but only usable for agricultural processes.
+angels-bio-yield-module-2=A module that increases productivity, but only usable for agricultural processes.
+angels-bio-yield-module-3=A module that increases productivity, but only usable for agricultural processes.
+
 [fluid-name]
 alien-spores=Alien spores
 alien-goo=Alien goo
@@ -289,7 +363,7 @@ liquid-fish-oil=Fish oil
 
 [recipe-name]
 algae-green=Green algae farming
-algae-green-simple=Basic green algae farming
+algae-green-simple=Basic algae farming
 cellulose-fiber-algae=Cellulose fiber extraction
 paste-from-sodium-hydroxide=Paste from sodium hydroxide
 paste-from-gas-chlor-methane=Paste from chloromethane gas
@@ -301,13 +375,14 @@ wood-pellets=Wood pellets
 wood-bricks=Wood bricks
 gas-carbon-dioxide-from-wood=Carbon dioxide gas from wood
 gas-methanol-from-wood=Methanol gas from wood
-sulfite-pulping=Sulfite pulping: cellulose pulp, brown liquor
-brown-liquor-recovery=Brown liquor recovery: sodium sulfate, nitric waste water
-kraft-cooking-washing=Kraft process pulping: cellulose pulp, black liquor
-kraft-causting=Kraft process causting: limestone, white liquor
-paper-bleaching-1=Paper bleaching 1: paper
-paper-bleaching-2=Paper bleaching 2: paper, sodium hypochlorate
-paper-bleaching-3=Paper bleaching 3: paper, sodium carbonate, sulfuric waste water
+sulfite-pulping=Sulfite pulping
+brown-liquor-recovery=Brown liquor recycling
+kraft-cooking-washing=Kraft process pulping
+kraft-recovery=Kraft process recovery
+kraft-causting=Kraft process causting
+paper-bleaching-1=Paper bleaching 1
+paper-bleaching-2=Paper bleaching 2
+paper-bleaching-3=Paper bleaching 3
 
 tree-arboretum-0=Rare tree cultivation
 temperate-tree-arboretum-1=Temperate tree cultivation
@@ -356,21 +431,21 @@ sorting-swamp-3=Saundsrcress processing
 sorting-swamp-4=Nexeflax processing
 sorting-swamp-5=Mushredtato processing
 
-nutrients-refining-1=Biomass refining 1: fuel oil, acetone, synthesis gas
-nutrients-refining-2=Biomass refining 2: fuel oil, glycerol
-nutrients-refining-3=Biomass refining 3: acetone, ethanol, butane
+nutrients-refining-1=Biomass refining 1
+nutrients-refining-2=Biomass refining 2
+nutrients-refining-3=Biomass refining 3
 
 liquid-raw-vegetable-oil-filtering-1=Vegetable oil filtration 1
 liquid-raw-vegetable-oil-filtering-2=Vegetable oil filtration 2
-liquid-vegetable-oil-refining=Vegetable oil refining: fuel oil, mineral oil
+liquid-vegetable-oil-refining=Vegetable oil refining
 
 liquid-raw-fish-oil-filtering-1=Fish oil filtration 1
 liquid-raw-fish-oil-filtering-2=Fish oil filtration 2
-liquid-fish-oil-refining=Fish oil refining: fermentation base, lubricant
-advanced-liquid-fish-oil-refining=Advanced fish oil refining: fermentation base, mineral oil
+liquid-fish-oil-refining=Fish oil refining
+advanced-liquid-fish-oil-refining=Advanced fish oil refining
 
-anaerobic-fermentation=Anaerobic fermentation: ethanol, compost
-aerobic-fermentation=Aerobic fermentation: acetic acid, compost
+anaerobic-fermentation=Anaerobic fermentation
+aerobic-fermentation=Aerobic fermentation
 
 puffer-puffing-1=Gaseous puffing
 puffer-puffing-2=Rancid puffing
@@ -450,20 +525,23 @@ crystal-powder-from-splinter=Crystal splinter milling
 crystal-powder-from-shard=Crystal shard milling
 crystal-powder-from-full=Crystal milling
 
+[tile-name]
+bio-tile=Biologically active tile
+
 [recipe-category-name]
-bio-processing=Bio processing
+bio-processing=Bioprocessing
 
 [item-group-name]
-bio-processing-nauvis=Bio processing nauvis
-bio-processing-vegetables=Bio processing vegetabilis
-bio-processing-alien=Bio processing animalis
+bio-processing-nauvis=Bioprocessing nauvis
+bio-processing-vegetables=Bioprocessing vegetabilis
+bio-processing-alien=Bioprocessing animalis
 
 [technology-name]
-bio-processing-green=Green algae processing
-bio-processing-brown=Brown algae processing
+bio-processing-brown=Basic algae processing
+bio-processing-green=Advanced algae processing
 bio-processing-blue=Blue algae processing
 bio-processing-red=Red algae processing
-bio-processing-alien=Alien bio processing
+bio-processing-alien=Alien microbe processing
 bio-processing-crystal-splinter=Crystal splinter processing
 bio-processing-crystal-shard=Crystal shard processing
 bio-processing-crystal-full=Crystal processing
@@ -479,18 +557,18 @@ bio-temperate-farming=Temperate farming
 bio-temperate-farm=Temperate farming environment
 bio-swamp-farming=Swamp farming
 bio-swamp-farm=Swamp farming environment
-bio-nutrient-paste=Nutrient paste
-bio-pressing=Plant pressing
-bio-pressing-fish=Fish pressing
+bio-nutrient-paste=Nutrient extraction
+bio-pressing=Oil pressing of plants
+bio-pressing-fish=Oil pressing of fish
 bio-fermentation=Fermentation processes
 bio-plastic=Bio-plastics
 
 bio-paper=Paper making
 bio-wood-processing=Wood processing
 bio-arboretum=Arboretum
+bio-arboretum-desert=Desert arboretum
 bio-arboretum-temperate=Temperate arboretum
 bio-arboretum-swamp=Swamp arboretum
-bio-arboretum-desert=Desert arboretum
 
 bio-refugium-fish=Fish refugium
 bio-refugium-hatchery=Hatchery
@@ -503,56 +581,53 @@ angels-bio-yield-module=Agriculture module
 angels-bio-yield-module-2=Agriculture module 2
 angels-bio-yield-module-3=Agriculture module 3
 
-[item-description]
-composter=Used to turn any organic material into compost.
-solid-saw="He saw, he cut, and he shattered."
-
-temperate-1=Wil. Plant from a place where no man has gone before.
-temperate-2=Fluffy. Makes you want to go to bed.
-temperate-3=Sour. Best served in a hot sauce.
-temperate-4=Adaptive. Can be used for a variety of things.
-temperate-5=Tasty. Very generous range of flavours.
-
-desert-1=Sweet. Gets you all fuzzy and warm around your heart.
-desert-2=Organized. Grows in ordered lines.
-desert-3=Productive. Will always arrange itself in orderly lines.
-desert-4=Zealous. Always dynamic.
-desert-5=Salty. Has to be handled with care.
-
-swamp-1=Nutty. Makes you slightly mad.
-swamp-2=Lively. Seem to be growing disregarding the conditions.
-swamp-3=Commanding. Don't use too much.
-swamp-4=Binary. It grows or it does not, nothing in between.
-swamp-5=Spicy. Seems to yell at you.
-
-solid-nuclear-fertilizer=This doesn't sound healty... we might start to glow at night!
-
-raw-fish=A friendly reminder to who knew Factorio before an Angel stopped by.
-alien-fish-1-raw=The least deadly fish on this planet.
-alien-fish-2-raw=Oblivious of their surroundings, very frugal beings.
-alien-fish-3-raw=Lovely fish at first sight, but don't anger them.
-
-bio-raw-meat=It tastes like chicken...
-
-angels-bio-yield-module=Machine will have higher yields, which will increase productivity.
-angels-bio-yield-module-2=Machine will have higher yields, which will increase productivity.
-angels-bio-yield-module-3=Machine will have higher yields, which will increase productivity.
+[technology-description]
+
+bio-processing-brown=Algae are rich in fibres and inorganic salts.
+bio-processing-green=More efficient ways to produce and process algae.
+bio-processing-red=Red algae are rich in calcareous compounds.
+bio-processing-blue=Blue algae are rich in nitric compounds.
+bio-processing-alien=Inoculation and processing of microbial cultures.
+bio-processing-crystal-splinter=Splinters of crystals made from a combination of organic and inorganic material.
+bio-processing-crystal-shard=Shards of crystals made from a combination of organic and inorganic material.
+bio-processing-crystal-full=Crystals made from a combination of organic and inorganic material.
+bio-processing-paste=A paste from cellulose can act as growth medium for microbial cultures.
+
+gardens=Allows you to extract seeds and plant-life samples from gardens growing on this alien planet.
+angels-garden-mutations=Artificial mutation of gardens via radioactive material.
+bio-farm=Basic technology for growing and processing crops.
+bio-farm-alien=Enhanced fertilizer with additional nutrients from microorganisms native to this planet.
+bio-desert-farming=Grow and process crops specialized for dry climate conditions.
+bio-desert-farm=Specialized farming equipment for dry climate conditions.
+bio-temperate-farming=Grow and process crops specialized for temperate climate conditions.
+bio-temperate-farm=Specialized farming equipment for temperate climate conditions.
+bio-swamp-farming=Grow and process crops specialized for wet climate conditions.
+bio-swamp-farm=Specialized farming equipment for wet climate conditions.
+bio-nutrient-paste=Nutrient pulp serves as food for animals, as well as a renewable precursor for petrochemicals.
+bio-pressing=Plants as a source for oil products.
+bio-pressing-fish=Fish as a source for oil products.
+bio-fermentation=Alcoholic and acidic fermentation of organic material.
+bio-plastic=Production of plastic from renewable sources.
+
+bio-paper=Solid material made of organic fibres.
+bio-wood-processing=Various uses for wood and cellulose.
+bio-arboretum=Cultivation of trees and automated production of wood.
+bio-arboretum-desert=Extraction of bio-rubber from rare trees growing on this alien planet.
+bio-arboretum-temperate=Extraction of bio-resin from rare trees growing on this alien planet.
+bio-arboretum-swamp=Extraction of bio-plastic from rare trees growing on this alien planet.
+
+bio-refugium-fish=Domestication of the wild fish that live on this alien planet.
+bio-refugium-hatchery=Technology to hatch the eggs of puffers that live on this alien planet.
+bio-refugium-butchery=Production of meat from animals.
+bio-refugium-puffer=Domestication and processing of puffers that live on this alien planet.
+bio-refugium-biter=Domestication and processing of biters that live on this alien planet.
+bio-refugium-hogger=Domestication of hoggers that live on this alien planet.
+
+angels-bio-yield-module=Specialized module that increases the yield of agricultural processes.
 
 [item-limitation]
 angels-yield-module-usable-only-on-agriculture=Agriculture modules can only be used for agricultural processes.
 
-[entity-description]
-bio-refugium-biter=Fenced in safely from the outside world, biters can be grown here.
-bio-refugium-fish=More than just decoration, can be made home to a variety of fish.
-bio-refugium-hogger=Dirt digging hogger feel right at home here.
-bio-refugium-puffer=It stinks, but puffers feel right at home in this gas filled tower.
-
 [recipe-description]
-temperate-garden-a=Temperate seed extraction
-temperate-garden-b=Advanced temperate seed extraction
 
-desert-garden-a=Desert seed extraction
-desert-garden-b=Advanced desert seed extraction
 
-swamp-garden-a=Swamp seed extraction
-swamp-garden-b=Advanced swamp seed extraction
diff --git a/angelsbioprocessing/prototypes/buildings/algae-farm.lua b/angelsbioprocessing/prototypes/buildings/algae-farm.lua
index 6fa9289e9..5143cd686 100644
--- a/angelsbioprocessing/prototypes/buildings/algae-farm.lua
+++ b/angelsbioprocessing/prototypes/buildings/algae-farm.lua
@@ -3,18 +3,13 @@ data:extend(
     {
       type = "item",
       name = "algae-farm",
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png"
+      icons = angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.bioprocessing.number_tint),
       subgroup = "bio-processing-buildings-nauvis-a",
       order = "a[algae]-a",
       place_result = "algae-farm",
@@ -23,8 +18,13 @@ data:extend(
     {
       type = "assembling-machine",
       name = "algae-farm",
-      icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
+        },
+        1, angelsmods.bioprocessing.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "algae-farm"},
       max_health = 300,
@@ -98,18 +98,13 @@ data:extend(
     {
       type = "item",
       name = "algae-farm-2",
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png"
+      icons = angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.bioprocessing.number_tint),
       subgroup = "bio-processing-buildings-nauvis-a",
       order = "a[algae]-b",
       place_result = "algae-farm-2",
@@ -118,8 +113,13 @@ data:extend(
     {
       type = "assembling-machine",
       name = "algae-farm-2",
-      icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
+        },
+        2, angelsmods.bioprocessing.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "algae-farm-2"},
       max_health = 300,
@@ -194,18 +194,13 @@ data:extend(
     {
       type = "item",
       name = "algae-farm-3",
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png"
+      icons = angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.bioprocessing.number_tint),
       subgroup = "bio-processing-buildings-nauvis-a",
       order = "a[algae]-c",
       place_result = "algae-farm-3",
@@ -214,8 +209,13 @@ data:extend(
     {
       type = "assembling-machine",
       name = "algae-farm-3",
-      icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__angelsbioprocessing__/graphics/icons/algae-farm.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
+        },
+        3, angelsmods.bioprocessing.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "algae-farm-3"},
       max_health = 300,
diff --git a/angelsindustries/prototypes/entities/bio-tile.lua b/angelsbioprocessing/prototypes/buildings/bio-tile.lua
similarity index 63%
rename from angelsindustries/prototypes/entities/bio-tile.lua
rename to angelsbioprocessing/prototypes/buildings/bio-tile.lua
index f4f9f1092..b206eef0b 100644
--- a/angelsindustries/prototypes/entities/bio-tile.lua
+++ b/angelsbioprocessing/prototypes/buildings/bio-tile.lua
@@ -5,11 +5,22 @@ data:extend(
     {
       type = "item",
       name = "bio-tile",
-      icon = "__angelssmelting__/graphics/icons/brick-clay.png",
-      icon_size = 32,
+      icons = { --temp use base version of landfill as the icon
+        {
+          icon= "__base__/graphics/technology/landfill.png",
+          icon_size = 256,
+          icon_mipmaps = 4
+        },
+        {
+          icon = "__angelssmelting__/graphics/icons/brick-clay.png",
+          icon_size = 32,
+          scale = 0.4375 * 1.6,
+          shift = {9, 9}
+        }
+      },
       subgroup = "angels-stone",
       order = "f",
-      stack_size = 1000,
+      stack_size = angelsmods.trigger.pavement_stack_size,
       place_as_tile = {
         result = "bio-tile",
         condition_size = 4,
@@ -26,42 +37,42 @@ data:extend(
       walking_speed_modifier = 1.5,
       layer = 80,
       decorative_removal_probability = 1,
-      pollution_absorption_per_second = 0,
+      pollution_absorption_per_second = 0.000008,
       variants = {
         main = {
           {
-            picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-small.png",
+            picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-small.png",
             count = 16,
             scale = 0.5,
             size = 1
           }
         },
         inner_corner = {
-          picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-corner-inner.png",
+          picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-corner-inner.png",
           width = 128,
           height = 128,
           scale = 0.5,
           count = 1
         },
         outer_corner = {
-          picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-corner-outer.png",
+          picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-corner-outer.png",
           width = 128,
           height = 128,
           scale = 0.5,
           count = 1
         },
         side = {
-          picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-side.png",
+          picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-side.png",
           scale = 0.5,
           count = 4
         },
         u_transition = {
-          picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-corner-u.png",
+          picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-corner-u.png",
           scale = 0.5,
           count = 1
         },
         o_transition = {
-          picture = "__angelsindustries__/graphics/entity/tile-bio/bio-tile-corner-o.png",
+          picture = "__angelsbioprocessing__/graphics/entity/tile-bio/bio-tile-corner-o.png",
           scale = 0.5,
           count = 1
         }
diff --git a/angelsbioprocessing/prototypes/items/bio-processing-wood-paper.lua b/angelsbioprocessing/prototypes/items/bio-processing-wood-paper.lua
index 64f538435..90d44b314 100644
--- a/angelsbioprocessing/prototypes/items/bio-processing-wood-paper.lua
+++ b/angelsbioprocessing/prototypes/items/bio-processing-wood-paper.lua
@@ -1,6 +1,6 @@
 data:extend(
 {
-  {
+  --[[{
     type = "item",
     name = "circuit-wood-fiber-board",
     icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png",
@@ -8,7 +8,7 @@ data:extend(
     subgroup = "bio-processing-wood",
     order = "c[circuit-wood-fiber-board]",
     stack_size = 200,
-  },
+  },]]
   {
     type = "item",
     name = "cellulose-fiber",
diff --git a/angelsbioprocessing/prototypes/items/crop-farming-processing.lua b/angelsbioprocessing/prototypes/items/crop-farming-processing.lua
index d118f0f71..d2bb66421 100644
--- a/angelsbioprocessing/prototypes/items/crop-farming-processing.lua
+++ b/angelsbioprocessing/prototypes/items/crop-farming-processing.lua
@@ -104,7 +104,7 @@ data:extend(
     pressure_to_speed_ratio = 0.4,
     flow_to_energy_ratio = 0.59,
   },
-  {
+  --[[{
     type = "item",
     name = "solid-flour",
     icon = "__angelsbioprocessing__/graphics/icons/solid-flour.png",
@@ -126,7 +126,7 @@ data:extend(
     flow_color = {r = 245/255, g = 245/255, b = 245/255},
     pressure_to_speed_ratio = 0.4,
     flow_to_energy_ratio = 0.59,
-  },
+  },]]
   {
     type = "fluid",
     name = "gas-ethanol",
diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua
index 74a4ab744..74210f807 100644
--- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua
+++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-angel.lua
@@ -3,7 +3,7 @@ if angelsmods.industries and angelsmods.industries.overhaul then
 
   OV.modify_output("algae-brown-burning", {"solid-lithium", 1})
   -- OV.remove_unlock("bio-paper-1", "circuit-paper-board")
-
+  OV.modify_input("bio-tile",{type = "item", name = "solid-glass-mixture", amount = 1})
   -- MODULES
   OV.modify_input("speed-module", {"crystal-splinter-blue"})
   OV.modify_input("speed-module-2", {"crystal-shard-blue"})
@@ -28,7 +28,10 @@ if angelsmods.industries and angelsmods.industries.overhaul then
   OV.modify_input("beacon", {"crystal-full-harmonic"})
   OV.add_prereq("effect-transmission", "bio-processing-crystal-full")
 elseif mods["bobplates"] then
+  OV.modify_input("bio-tile",{type = "item", name = "solid-glass-mixture", amount = 1})
   -- nothing to change
 else
+  OV.modify_input("bio-tile",{type = "item", name = "steel-plate", amount = 1})
   OV.disable_recipe("algae-brown-burning")
 end
+OV.add_unlock("bio-farm-2","bio-tile")
\ No newline at end of file
diff --git a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobmodules.lua b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobmodules.lua
index 41dc1059d..1711f943d 100644
--- a/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobmodules.lua
+++ b/angelsbioprocessing/prototypes/overrides/bio-processing-override-bobmodules.lua
@@ -110,7 +110,7 @@ if mods["bobmodules"] then
   -----------------------------------------------------------------------------
   -- tier 1 modules
   OV.add_prereq("modules", "bio-processing-crystal-splinter-1")
-  
+
   -- tier 2 modules
   data:extend(
     {
@@ -292,7 +292,7 @@ if mods["bobmodules"] then
       name = "angels-bio-yield-module",
       ingredients = {
         {"!!"},
-        {type = "item", name = "solder", amount = 1},
+        --{type = "item", name = "solder", amount = 1},
         {type="item", name="productivity-module", amount = 1},
         {type="item", name="effectivity-module", amount = 1},
         {type = "item", name = "token-bio", amount = 1}
@@ -302,7 +302,7 @@ if mods["bobmodules"] then
       name = "angels-bio-yield-module-2",
       ingredients = {
         {"!!"},
-        {type = "item", name = "solder", amount = 2},
+        --{type = "item", name = "solder", amount = 2},
         {type="item", name="productivity-module-2", amount = 1},
         {type="item", name="effectivity-module-2", amount = 1},
         {type = "item", name = "token-bio", amount = 1}
@@ -312,13 +312,36 @@ if mods["bobmodules"] then
       name = "angels-bio-yield-module-3",
       ingredients = {
         {"!!"},
-        {type = "item", name = "solder", amount = 3},
+        --{type = "item", name = "solder", amount = 3},
         {type="item", name="productivity-module-3", amount = 1},
         {type="item", name="effectivity-module-3", amount = 1},
         {type = "item", name = "token-bio", amount = 1}
       }
     }
   })
+  --adding solder when bobplates is active
+if mods["bobplates"] then
+  OV.patch_recipes({
+    {
+      name = "angels-bio-yield-module",
+      ingredients = {
+        {type = "item", name = "solder", amount = 1}
+      }
+    },
+    {
+      name = "angels-bio-yield-module-2",
+      ingredients = {
+        {type = "item", name = "solder", amount = 2}
+      }
+    },
+    {
+      name = "angels-bio-yield-module-3",
+      ingredients = {
+        {type = "item", name = "solder", amount = 3}
+      }
+    }
+  })
+end
   data.raw.technology["angels-bio-yield-module"].icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-1.png"
   data.raw.technology["angels-bio-yield-module"].icon_size = 32
   data.raw.technology["angels-bio-yield-module"].icon_mipmaps = 1
@@ -328,7 +351,9 @@ if mods["bobmodules"] then
   data.raw.technology["angels-bio-yield-module-3"].icon = "__angelsbioprocessing__/graphics/icons/bobmodules/orange-module-3.png"
   data.raw.technology["angels-bio-yield-module-3"].icon_size = 32
   data.raw.technology["angels-bio-yield-module-3"].icon_mipmaps = 1
-  OV.add_prereq("angels-bio-yield-module", "module-merging")
+  if data.raw.technology["module-merging"] ~= nil then
+    OV.add_prereq("angels-bio-yield-module", "module-merging")
+  end
   for i = 1,3 do
     local ingredients = {{"token-bio", 1}}
     local ingredients_added = {["token-bio"] = true}
@@ -399,7 +424,7 @@ if mods["bobmodules"] then
           enabled = false,
           ingredients =
           {
-            {type = "item", name = "solder", amount = solder_amount},
+            --{type = "item", name = "solder", amount = solder_amount},
             {type = "item", name = "productivity-module-"..i, amount = 1},
             {type = "item", name = "effectivity-module-"..i, amount = 1},
             {type = "item", name = "token-bio", amount = 1}
@@ -434,6 +459,17 @@ if mods["bobmodules"] then
       }
     )
     angelsmods.functions.add_bio_productivity_module("angels-bio-yield-module-"..i)
+      --adding solder when bobplates is active
+    if mods["bobplates"] then
+      OV.patch_recipes({
+        {
+          name = "angels-bio-yield-module-" .. i,
+          ingredients = {
+            {type = "item", name = "solder", amount = solder_amount}
+          }
+        }
+      })
+    end
   end
   for i = 1,8 do
     local name = "angels-bio-yield-module"
@@ -465,4 +501,4 @@ if mods["bobmodules"] then
   OV.add_prereq("effect-transmission", "modules")
   OV.add_prereq("effect-transmission-2", "modules-2")
   OV.add_prereq("effect-transmission-3", "modules-3")
-end
\ No newline at end of file
+end
diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua
index 9047ba117..4610b6b36 100644
--- a/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua
+++ b/angelsbioprocessing/prototypes/recipes/bio-processing-algae.lua
@@ -66,26 +66,26 @@ data:extend(
       icon_size = 32,
       order = "c[solid-alginic-acid]"
     },
-    -- {
-    -- type = "recipe",
-    -- name = "circuit-wood-fiber-board",
-    -- icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png",
-    -- category = "advanced-crafting",
-    -- subgroup = "bio-processing-brown",
-    -- enabled = false,
-    -- energy_required = 4,
-    -- ingredients =
-    -- {
-    -- {type="item", name="cellulose-fiber", amount=4},
-    -- {type="item", name="solid-alginic-acid", amount=1},
-    -- },
-    -- results=
-    -- {
-    -- {type="item", name="circuit-wood-fiber-board", amount=3},
-    -- },
-    -- icon_size = 32,
-    -- order = "c[circuit-wood-fiber-board]",
-    -- },
+    --[[{
+      type = "recipe",
+      name = "circuit-wood-fiber-board",
+      icon = "__angelsbioprocessing__/graphics/icons/wood-fiber-board.png",
+      category = "advanced-crafting",
+      subgroup = "bio-processing-brown",
+      enabled = false,
+      energy_required = 4,
+      ingredients =
+      {
+        {type="item", name="cellulose-fiber", amount=4},
+        {type="item", name="solid-alginic-acid", amount=1},
+      },
+      results=
+      {
+        {type="item", name="circuit-wood-fiber-board", amount=3},
+      },
+      icon_size = 32,
+      order = "c[circuit-wood-fiber-board]",
+    },]]
 
     --GREEN
     {
@@ -103,18 +103,13 @@ data:extend(
         {type = "item", name = "algae-green", amount = 25},
         {type = "item", name = "algae-brown", amount = 5}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/algae-green.png"
+      icons = angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__angelsbioprocessing__/graphics/icons/algae-green.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.bioprocessing.number_tint),
       order = "aa[algae-farming]"
     },
     {
@@ -131,18 +126,13 @@ data:extend(
       results = {
         {type = "item", name = "algae-green", amount = 50}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/algae-green.png"
+      icons = angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__angelsbioprocessing__/graphics/icons/algae-green.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.bioprocessing.number_tint),
       order = "ab[algae-farming]"
     },
     {
diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-entity.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-entity.lua
index 89980c613..44d5ee07c 100644
--- a/angelsbioprocessing/prototypes/recipes/bio-processing-entity.lua
+++ b/angelsbioprocessing/prototypes/recipes/bio-processing-entity.lua
@@ -230,6 +230,19 @@ data:extend(
         {type = "item", name = "iron-plate", amount = 1}
       },
       result = "bio-butchery"
+    },
+    {
+      type = "recipe",
+      name = "bio-tile",
+      energy_required = 1,
+      enabled = false,
+      ingredients = {
+        {type = "item", name = "reinforced-concrete-brick", amount = 1},
+        {type = "item", name = "token-bio", amount = 2},
+        {type = "item", name = "solid-soil", amount = 1},
+        --{type = "item", name = "steel-plate", amount = 1}
+      },
+      result = "bio-tile"
     }
   }
 )
diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua
index a2546ec37..d8271315c 100644
--- a/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua
+++ b/angelsbioprocessing/prototypes/recipes/bio-processing-paper.lua
@@ -122,18 +122,9 @@ data:extend(
       results = {
         {type = "item", name = "solid-wood-pulp", amount = 20}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-wood-pulp.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-wood-pulp"),
+        1, angelsmods.bioprocessing.number_tint),
       order = "aa"
     },
     --T2 SULFITE PROCESS
@@ -201,18 +192,9 @@ data:extend(
         {type = "item", name = "solid-wood-pulp", amount = 25},
         {type = "fluid", name = "liquid-brown-liquor", amount = 75}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-wood-pulp.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-wood-pulp"),
+        2, angelsmods.bioprocessing.number_tint),
       order = "ab"
     },
     --T3 KRAFT PROCESS (SULFATE PROCESS)
@@ -288,18 +270,9 @@ data:extend(
         {type = "fluid", name = "liquid-black-liquor", amount_min = 35, amount_max = 40}
       },
       always_show_products = true,
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-wood-pulp.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-wood-pulp"),
+        3, angelsmods.bioprocessing.number_tint),
       order = "ac"
     },
     --PAPER BLEACHING
@@ -318,18 +291,9 @@ data:extend(
       },
       --main_product = "solid-paper",
       allow_decomposition = false,
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-paper.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-paper"),
+        1, angelsmods.bioprocessing.number_tint),
       order = "ba"
     },
     {
@@ -350,18 +314,9 @@ data:extend(
       },
       --main_product = "solid-paper",
       allow_decomposition = false,
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-paper.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-paper"),
+        2, angelsmods.bioprocessing.number_tint),
       order = "bb"
     },
     {
@@ -385,18 +340,9 @@ data:extend(
       },
       --main_product = "solid-paper",
       allow_decomposition = false,
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-paper.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-paper"),
+        3, angelsmods.bioprocessing.number_tint),
       order = "bc"
     }
   }
diff --git a/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua b/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua
index d056c8dd7..df174caff 100644
--- a/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua
+++ b/angelsbioprocessing/prototypes/recipes/bio-processing-wood.lua
@@ -15,18 +15,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-seed", amount = 4}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-seed"),
+        1, angelsmods.bioprocessing.number_tint),
       order = "a[generator]-a"
     },
     {
@@ -44,18 +35,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-seed", amount = 6}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-seed"),
+        2, angelsmods.bioprocessing.number_tint),
       order = "a[generator]-b"
     },
     {
@@ -74,18 +56,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-seed", amount = 8}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-seed"),
+        3, angelsmods.bioprocessing.number_tint),
       order = "a[generator]-c"
     },
     -- SPECIAL TREE GENERATION
@@ -141,20 +114,9 @@ data:extend(
       results = {
         {type = "item", name = "solid-tree", amount = 4}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-tree"),
+        1, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 100 / 255, g = 100 / 255, b = 100 / 255, a = 1}
       },
@@ -176,20 +138,9 @@ data:extend(
       results = {
         {type = "item", name = "solid-tree", amount = 6}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-tree"),
+        2, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 100 / 255, g = 100 / 255, b = 100 / 255, a = 1}
       },
@@ -212,20 +163,9 @@ data:extend(
       results = {
         {type = "item", name = "solid-tree", amount = 8}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/solid-tree.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-tree"),
+        3, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 100 / 255, g = 100 / 255, b = 100 / 255, a = 1}
       },
@@ -302,20 +242,9 @@ data:extend(
       },
       main_product = "wood",
       allow_decomposition = false,
-      icons = {
-        {
-          icon = "__base__/graphics/icons/wood.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("wood"),
+        1, angelsmods.bioprocessing.number_tint),
       order = "a[wood]-b[iron-saw]" -- order a[wood]-a[manual] reserved for manual wood crafting (bob greenhouse)
     },
     {
@@ -335,20 +264,9 @@ data:extend(
       },
       main_product = "wood",
       allow_decomposition = false,
-      icons = {
-        {
-          icon = "__base__/graphics/icons/wood.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("wood"),
+        2, angelsmods.bioprocessing.number_tint),
       order = "a[wood]-c[crystal-tipped-saw]"
     },
     {
@@ -368,20 +286,9 @@ data:extend(
       },
       main_product = "wood",
       allow_decomposition = false,
-      icons = {
-        {
-          icon = "__base__/graphics/icons/wood.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("wood"),
+        3, angelsmods.bioprocessing.number_tint),
       order = "a[wood]-d[crystal-full-saw]"
     },
     -- TEMPERATE WOOD GENERATOR
@@ -399,18 +306,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-temperate-seed", amount = 4}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-temperate-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-temperate-seed"),
+        1, angelsmods.bioprocessing.number_tint),
       order = "a[generator]-a"
     },
     {
@@ -428,18 +326,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-temperate-seed", amount = 6}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-temperate-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-temperate-seed"),
+        2, angelsmods.bioprocessing.number_tint),
       order = "a[generator]-b"
     },
     {
@@ -458,18 +347,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-temperate-seed", amount = 8}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-temperate-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-temperate-seed"),
+        3, angelsmods.bioprocessing.number_tint),
       order = "a[generator]-c"
     },
     -- TEMPERATE WOOD ARBORETUM
@@ -526,20 +406,9 @@ data:extend(
         {type = "item", name = "bio-resin", amount = 4},
         {type = "item", name = "solid-tree", amount = 2, catalyst_amount = 2}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-temperate.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("temperate-tree"),
+        1, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 0 / 255, g = 100 / 255, b = 0 / 255, a = 1}
       },
@@ -562,20 +431,9 @@ data:extend(
         {type = "item", name = "bio-resin", amount = 7},
         {type = "item", name = "solid-tree", amount = 3, catalyst_amount = 3}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-temperate.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("temperate-tree"),
+        2, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 0 / 255, g = 100 / 255, b = 0 / 255, a = 1}
       },
@@ -686,18 +544,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-swamp-seed", amount = 4}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-swamp-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-swamp-seed"),
+        1, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1}
       },
@@ -718,18 +567,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-swamp-seed", amount = 6}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-swamp-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-swamp-seed"),
+        2, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1}
       },
@@ -751,18 +591,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-swamp-seed", amount = 8}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-swamp-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-swamp-seed"),
+        3, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1}
       },
@@ -822,20 +653,9 @@ data:extend(
         {type = "item", name = "bio-plastic", amount = 4},
         {type = "item", name = "solid-tree", amount = 2, catalyst_amount = 2}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-swamp.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("swamp-tree"),
+        1, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1}
       },
@@ -858,20 +678,9 @@ data:extend(
         {type = "item", name = "bio-plastic", amount = 7},
         {type = "item", name = "solid-tree", amount = 3, catalyst_amount = 3}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-swamp.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("swamp-tree"),
+        2, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 0 / 255, g = 0 / 255, b = 100 / 255, a = 1}
       },
@@ -935,18 +744,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-desert-seed", amount = 4}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-desert-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-desert-seed"),
+        1, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1}
       },
@@ -967,18 +767,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-desert-seed", amount = 6}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-desert-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-desert-seed"),
+        2, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1}
       },
@@ -1000,18 +791,9 @@ data:extend(
       results = {
         {type = "item", name = "tree-desert-seed", amount = 8}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-desert-seed.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("tree-desert-seed"),
+        3, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1}
       },
@@ -1071,20 +853,9 @@ data:extend(
         {type = "item", name = "bio-rubber", amount = 4},
         {type = "item", name = "solid-tree", amount = 2, catalyst_amount = 2}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-desert.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("desert-tree"),
+        1, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1}
       },
@@ -1107,20 +878,9 @@ data:extend(
         {type = "item", name = "bio-rubber", amount = 7},
         {type = "item", name = "solid-tree", amount = 3, catalyst_amount = 3}
       },
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/tree-desert.png",
-          icon_size = 64,
-          scale = 0.5
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("desert-tree"),
+        2, angelsmods.bioprocessing.number_tint),
       crafting_machine_tint = {
         primary = {r = 100 / 255, g = 100 / 255, b = 0 / 255, a = 1}
       },
diff --git a/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua b/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua
index e82f74669..3e6129bf8 100644
--- a/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua
+++ b/angelsbioprocessing/prototypes/recipes/bio-refugium-fish.lua
@@ -580,18 +580,9 @@ data:extend(
         {type = "item", name = "crystal-splinter-raw", amount = 1, probability = 0.4}
       },
       always_show_products = true,
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-raw.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("crystal-splinter-raw"),
+        1, angelsmods.bioprocessing.number_tint),
       order = "a[crystalization]-a"
     },
     {
@@ -609,18 +600,9 @@ data:extend(
         {type = "item", name = "crystal-splinter-raw", amount = 1}
       },
       always_show_products = true,
-      icons = {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/crystal-splinter-raw.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("crystal-splinter-raw"),
+        2, angelsmods.bioprocessing.number_tint),
       order = "a[crystalization]-b"
     }
   }
diff --git a/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua b/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua
index 513dd64fc..9891a0add 100644
--- a/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua
+++ b/angelsbioprocessing/prototypes/recipes/bio-refugium-puffer.lua
@@ -1016,20 +1016,9 @@ data:extend(
         {type = "item", name = "crystal-shard-raw", amount = 1, probability = 0.4}
       },
       always_show_products = true,
-      icons =
-      {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-raw.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift =
-      {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("crystal-shard-raw"),
+        1, angelsmods.bioprocessing.number_tint),
       order = "a[crystalization]-a"
     },
     {
@@ -1051,20 +1040,9 @@ data:extend(
         {type = "item", name = "crystal-shard-raw", amount = 1}
       },
       always_show_products = true,
-      icons =
-      {
-        {
-          icon = "__angelsbioprocessing__/graphics/icons/crystal-shard-raw.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.bioprocessing.number_tint,
-          scale = 0.32,
-          shift =
-      {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("crystal-shard-raw"),
+        2, angelsmods.bioprocessing.number_tint),
       order = "a[crystalization]-b"
     }
   }
diff --git a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua
index 3de5b7634..e01baeef2 100644
--- a/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua
+++ b/angelsbioprocessing/prototypes/recipes/crop-farming-processing-fermentation.lua
@@ -248,11 +248,7 @@ data:extend(
         nil,
         {{255, 255, 255}, {255, 255, 255}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            icon_size = 32,
-            tint = angelsmods.bioprocessing.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.bioprocessing.number_tint)
         }
       ),
       order = "e"
@@ -305,11 +301,7 @@ data:extend(
         nil,
         {{255, 255, 255}, {255, 255, 255}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            icon_size = 32,
-            tint = angelsmods.bioprocessing.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.bioprocessing.number_tint)
         }
       ),
       order = "g"
diff --git a/angelsexploration/changelog.txt b/angelsexploration/changelog.txt
index 30a68f040..3ae949957 100644
--- a/angelsexploration/changelog.txt
+++ b/angelsexploration/changelog.txt
@@ -3,6 +3,7 @@ Version: 0.3.10
 Date: ??
   Bugfixes:
     - Fixed collision box and drawing box of the mammoth heavy tank (476)
+    - Fixed that turret technology did not depend on military (549)
 ---------------------------------------------------------------------------------------------------
 Version: 0.3.9
 Date: 26.11.2020
diff --git a/angelsexploration/prototypes/exploration-override.lua b/angelsexploration/prototypes/exploration-override.lua
index 9b695e863..4bbc5213d 100644
--- a/angelsexploration/prototypes/exploration-override.lua
+++ b/angelsexploration/prototypes/exploration-override.lua
@@ -30,7 +30,7 @@ if angelsmods.industries then
         }
       }
     )
-    OV.add_prereq("turrets", "military")
+    OV.add_prereq("gun-turret", "military")
 
     if bobmods and bobmods.warfare then
       -- sniper turret
diff --git a/angelsexploration/settings-updates.lua b/angelsexploration/settings-updates.lua
index 3a3967242..bf335686c 100644
--- a/angelsexploration/settings-updates.lua
+++ b/angelsexploration/settings-updates.lua
@@ -1,12 +1,3 @@
-local function hide_setting(setting_type, setting_name, setting_default)
-  if data.raw[setting_type] and data.raw[setting_type][setting_name] then
-    data.raw[setting_type][setting_name].hidden = true
-    if setting_default ~= nil then
-      data.raw[setting_type][setting_name].default_value = setting_default
-    end
-  end
-end
-
 if mods["angelsrefining"] then
-  hide_setting("bool-setting", "angels-enable-biters")
+  angelsmods.settings.hide_setting("bool-setting", "angels-enable-biters")
 end
diff --git a/angelsindustries/changelog.txt b/angelsindustries/changelog.txt
index d211aa71f..95215a223 100644
--- a/angelsindustries/changelog.txt
+++ b/angelsindustries/changelog.txt
@@ -2,19 +2,35 @@
 Version: 0.4.12
 Date: ??
   Changes:
+    - Changed and expanded locale strings and text descriptions (489)
     - Regular mode:
       - Ordered vehicle belt immunity equipment (477)
       - Integrated bobs plutonium nucleosynthesis (486)
       - Unlock red and green wires with the (previously empty) electronics technology
     - Component mode:
       - Partially integrated bobs locomotives, cargo and fluid wagons (not artillery) a bit (478)
+    - Moved Bio-tile data to angelsbioprocessing
   Bugfixes:
     - Regular mode:
       - Fixed the ordering of bobs vehicle roboport antenna (480)
+      - Fixed the vehicle repair roboport would unlock after the vehicle construction port (500)
     - Component mode:
       - Fixed that some science technologies would unlock block components
+      - Fixed boblogistics (inserter overhaul off) recipes to use angels components, not bobs (526)
+      - Fixed boblogistics (w/out bobplates) calling the wrong tin plate (453)
+        - Thanks to @lavafl0w on git for the partial fix which i built off
+      - Fixed battery 6 use and tech when not active under some conditions (453)
+      - Fixed lab not being craftable without science mode.
+      - Fixed that boblogistics' tier 1 robots did not use their appropriate intermediates (532)
+      - Fixed that not all bob train recipes did not require their previous tier s ingredient (537)
     - Science mode:
       - Fixed the technologies from the storage addon had the wrong data core
+      - Fixed the base game lab was visible in the bonus UI (505)
+      - Fixed science tiers on steam engines and boilers of bobs power (519)
+      - Fixed science tiers on heat pipes and heat sources of bobs power (519)
+      - Fixed science tiers on fluid burning generators of bobs power (502)
+      - Fixed the selection and collision box of the main lab did not align (539)
+      - Fixed that speed, productivity, effectivity, and agriculture module 3 couldnt be researched due to no lab taking all required science packs. removed Yellow science analyzer from required packs.
 ---------------------------------------------------------------------------------------------------
 Version: 0.4.11
 Date: 11.01.2021
diff --git a/angelsindustries/control.lua b/angelsindustries/control.lua
index 14d6030d4..16d90fb52 100644
--- a/angelsindustries/control.lua
+++ b/angelsindustries/control.lua
@@ -17,7 +17,7 @@ local function remove_lab_from_inv(inventory)
     local items = game.item_prototypes
     for key, lab in pairs(main_lab) do
       if items[lab] and inventory.get_item_count(lab) > 0 then
-        inventory.remove {name = lab}
+        inventory.remove{name = lab}
         global.is_lab_given = false
         return true
       end
@@ -27,9 +27,7 @@ end
 
 local function table_contains(table, value)
   for key, val in pairs(table) do
-    if val == value then
-      return true
-    end
+    if val == value then return true end
   end
   return false
 end
@@ -48,11 +46,11 @@ local function initialize_crash_site()
         local created_entity = surface.create_entity{
           name = main_lab[0],
           position = surface.find_non_colliding_position(
-            --[[name]]main_lab[0],
-            --[[center]]{crash_site_entity.position.x - 15, crash_site_entity.position.y},
-            --[[radius]]15 + 15,
-            --[[precision]]0.5,
-            --[[force_to_tile_center]]true
+            --[[name]] main_lab[0],
+            --[[center]] { crash_site_entity.position.x - 15, crash_site_entity.position.y },
+            --[[radius]] 15 + 15,
+            --[[precision]] 0.5,
+            --[[force_to_tile_center]] true
           ),
           force = "player",
           raise_build = false, -- I don't see why we should raise this?
@@ -105,9 +103,7 @@ local function initialize_crash_site()
 end
 
 script.on_event(defines.events.on_player_created, function(event)
-  if not global.crash_site_created then
-    initialize_crash_site()
-  end
+  if not global.crash_site_created then initialize_crash_site() end
 end)
 
 script.on_event(defines.events.on_player_respawned, function(event)
@@ -115,7 +111,7 @@ script.on_event(defines.events.on_player_respawned, function(event)
 
   if not global.is_lab_given and game.entity_prototypes[main_lab[1]] then
     if player and player.valid then
-      global.is_lab_given = player.insert {name = main_lab[0], count = 1} > 0
+      global.is_lab_given = player.insert{name = main_lab[0], count = 1} > 0
     end
   end
 
@@ -227,8 +223,7 @@ script.on_event(defines.events.on_research_finished, function(event)
 
 end)
 
-script.on_event({defines.events.on_lua_shortcut,
-                 "toggle-ghosting"             }, function(event)
+script.on_event({defines.events.on_lua_shortcut, "toggle-ghosting"}, function(event)
   if event.prototype_name and event.prototype_name ~= "toggle-ghosting" then return end
   local input = event.prototype_name or event.input_name
   local player = game.players[event.player_index]
@@ -237,8 +232,116 @@ script.on_event({defines.events.on_lua_shortcut,
     local toggled = force.ghost_time_to_live == 0
     force.ghost_time_to_live = toggled and 60 * 60 * 60 * 24 * 7 or 0
 
-    for _, fplayer in pairs(force.players) do
-      fplayer.set_shortcut_toggled(input, toggled)
+    for _, fplayer in pairs(force.players) do fplayer.set_shortcut_toggled(input, toggled) end
+  end
+end)
+
+------------------------------
+-- VEHICLE BURNER EQUIPMENT --
+------------------------------
+script.on_init(function(event)
+  global.vehicle_burners = {}
+  global.current_car = {}
+end)
+
+script.on_configuration_changed(function(event)
+  if global.vehicle_burners == nil then global.vehicle_burners = {} end
+  if global.current_car == nil then global.current_car = {} end
+end)
+
+script.on_event(defines.events.on_gui_opened, function(event)
+  if event.gui_type == defines.gui_type.entity and event.entity ~= nil and event.entity.type == "car" then
+    global.current_car = event.entity
+  end
+end)
+
+script.on_event(defines.events.on_gui_closed, function(event)
+  if event.gui_type == defines.gui_type.entity and event.entity.type == "car" and global.current_car == event.entity then
+    global.current_car = {}
+  end
+end)
+
+script.on_event(defines.events.on_player_placed_equipment, function(event)
+  if event.equipment.name == "angels-burner-generator-vequip" and next(global.current_car) ~= nil then
+    global.vehicle_burners[global.current_car.unit_number] = {
+      vehicle = global.current_car,
+      burner = event.equipment,
+      grid = event.grid
+    }
+  end
+end)
+
+script.on_event(defines.events.on_player_removed_equipment, function(event)
+  if event.equipment == "angels-burner-generator-vequip" and next(global.current_car) ~= nil then
+    global.vehicle_burners[global.current_car.unit_number] = nil
+  end
+end)
+
+script.on_nth_tick(60, function()
+  if next(global.vehicle_burners) ~= nil then
+    for v, vehicle in pairs(global.vehicle_burners) do
+      local inv = vehicle.burner.burner.inventory.get_item_count()
+      if inv < 3 then
+        local car_inv = vehicle.vehicle.get_inventory(defines.inventory.car_trunk)
+        local car_content = car_inv.get_contents()
+        local burner = vehicle.burner.burner
+        if burner.currently_burning ~= nil then
+          if car_content[burner.currently_burning.name] ~= nil then
+            local car = vehicle.vehicle.get_inventory(defines.inventory.car_trunk)
+            local amount = burner.inventory.get_insertable_count(burner.currently_burning.name)
+            local removed = car.remove({name = burner.currently_burning.name, count = amount})
+            burner.inventory.insert({name = burner.currently_burning.name, count = removed})
+          else
+            local highest_fuel
+            for i, item in pairs(car_content) do
+              if game.item_prototypes[i] ~= nil and
+                burner.fuel_categories[game.item_prototypes[i].fuel_category] ~= nil and
+                game.item_prototypes[i].fuel_value ~= nil then
+                if highest_fuel ~= nil and i ~= highest_fuel and game.item_prototypes[i].fuel_value >
+                  game.item_prototypes[highest_fuel].fuel_value then
+                  highest_fuel = i
+                elseif highest_fuel == nil then
+                  highest_fuel = i
+                end
+              end
+            end
+            if highest_fuel ~= nil then
+              local car = vehicle.vehicle.get_inventory(defines.inventory.car_trunk)
+              local amount = burner.inventory.get_insertable_count(highest_fuel)
+              local removed = car.remove({name = highest_fuel, count = amount})
+              burner.inventory.insert({name = highest_fuel, count = removed})
+            end
+          end
+        else
+          local highest_fuel
+          for i, item in pairs(car_content) do
+            if game.item_prototypes[i] ~= nil and
+              burner.fuel_categories[game.item_prototypes[i].fuel_category] ~= nil and
+              game.item_prototypes[i].fuel_value ~= nil then
+              if highest_fuel ~= nil and i ~= highest_fuel and game.item_prototypes[i].fuel_value >
+                game.item_prototypes[highest_fuel].fuel_value then
+                highest_fuel = i
+              elseif highest_fuel == nil then
+                highest_fuel = i
+              end
+            end
+          end
+          if highest_fuel ~= nil then
+            local car = vehicle.vehicle.get_inventory(defines.inventory.car_trunk)
+            local amount = burner.inventory.get_insertable_count(highest_fuel)
+            local removed = car.remove({name = highest_fuel, count = amount})
+            burner.inventory.insert({name = highest_fuel, count = removed})
+          end
+        end
+      end
+    end
+  end
+end)
+
+script.on_event(defines.events.on_entity_died, function(event)
+  if event.entity.type == "car" then
+    if global.vehicle_burners[event.entity.unit_number] ~= nil then
+      global.vehicle_burners[event.entity.unit_number] = nil
     end
   end
 end)
diff --git a/angelsindustries/data-final-fixes.lua b/angelsindustries/data-final-fixes.lua
index f08360104..74d43a2af 100644
--- a/angelsindustries/data-final-fixes.lua
+++ b/angelsindustries/data-final-fixes.lua
@@ -90,8 +90,8 @@ if angelsmods.industries.components then
   --set ingredient return on building pickup
   if angelsmods.industries.return_ingredients then
     add_minable_results()
-    OV.execute()
   end
+  OV.execute()
 end
 
 --OTHER OVERRIDES
diff --git a/angelsindustries/data.lua b/angelsindustries/data.lua
index 1555d4f4a..092846b72 100644
--- a/angelsindustries/data.lua
+++ b/angelsindustries/data.lua
@@ -101,7 +101,6 @@ require("prototypes.buildings.angels-logistics-robot-cargo")
 --ENTITIES
 require("prototypes.entities.crawler")
 require("prototypes.entities.equipment")
-require("prototypes.entities.bio-tile")
 --RECIPES
 require("prototypes.recipes.equipment-recipes")
 require("prototypes.recipes.logistics-entity")
diff --git a/angelsindustries/info.json b/angelsindustries/info.json
index d45cea7a0..ce642b6df 100644
--- a/angelsindustries/info.json
+++ b/angelsindustries/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsindustries",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "factorio_version": "1.1",
   "title": "Angel's Industries",
   "author": "Arch666Angel",
diff --git a/angelsindustries/locale/en/components.cfg b/angelsindustries/locale/en/components.cfg
index 5cfd7b4b8..4925b765b 100644
--- a/angelsindustries/locale/en/components.cfg
+++ b/angelsindustries/locale/en/components.cfg
@@ -7,6 +7,14 @@ angels-assembling-machine-small-3=Small assembling machine 3
 angels-assembling-machine-big-3=Big assembling machine 3
 angels-assembling-machine-0=Assembling machine 0
 
+[entity-description]
+angels-assembling-machine-small-1=A faster, 2×2 assembling machine.
+angels-assembling-machine-big-1=A slower, 4×4 assembling machine.
+angels-assembling-machine-small-2=A faster, 2×2 assembling machine.
+angels-assembling-machine-big-2=A slower, 4×4 assembling machine.
+angels-assembling-machine-small-3=A faster, 2×2 assembling machine.
+angels-assembling-machine-big-3=A slower, 4×4 assembling machine.
+
 [item-name]
 circuit-grey-board=Grey board
 circuit-red-board=Red board
@@ -253,17 +261,21 @@ angels-rocket-shield-array=Rocket defences
 ; compatibility techs
 angels-glass-melting=Basic glass smelting
 
-[item-description]
-angels-assembling-machine-small-1=A faster, 2×2 assembling machine.
-angels-assembling-machine-big-1=A slower, 4×4 assembling machine.
-angels-assembling-machine-small-2=A faster, 2×2 assembling machine.
-angels-assembling-machine-big-2=A slower, 4×4 assembling machine.
-angels-assembling-machine-small-3=A faster, 2×2 assembling machine.
-angels-assembling-machine-big-3=A slower, 4×4 assembling machine.
-
 [technology-description]
-angels-rocket=It's about time we focused on our breathtaking exit off this forsaken planet...
+angels-basic-blocks=Basic blocks for the construction of buildings.
+angels-advanced-blocks=Advanced blocks for the construction of buildings.
+
+angels-components-mechanical=Mechanical components serve as moving parts for machines.
+angels-components-construction=Construction components ensure stability of machines.
+angels-components-weapons-basic=Basic components for the construction of weaponry.
+angels-components-weapons-advanced=Advanced components for the construction of weaponry.
+angels-components-cabling=Cabling components for the transfer of electricity and of signals.
+angels-components-batteries=Containers filled with chemicals that can store and release electric energy.
+
+angels-rocket=It is about time we focused on our breathtaking exit off this forsaken planet...
 angels-rocket-hull=Research a lightweight, but durable hull design to push your rocket past max Q.
 angels-rocket-ion-thruster=Research that little push in the back required to lift you past the horizon.
 angels-rocket-fusion-reactor=A precious reactor, required to keep all the life supports going 24/7, so you can keep playing!
-angels-rocket-shield-array=Just a safety measure... There are alien forces on this planet, why wouldn't there be any in deep space?
+angels-rocket-shield-array=Just a safety measure... There are alien forces on this planet, why would there not be any in deep space?
+
+angels-glass-melting=First method of producing molten glass.
diff --git a/angelsindustries/locale/en/logistic.cfg b/angelsindustries/locale/en/logistic.cfg
index 73672780e..5e75fc029 100644
--- a/angelsindustries/locale/en/logistic.cfg
+++ b/angelsindustries/locale/en/logistic.cfg
@@ -26,7 +26,36 @@ angels-logistic-chest-buffer=Big buffer chest
 
 angels-crawler=Crawler construction vehicle
 
-angels-lamp=Crawler light
+angels-lamp=Crawler lamp
+
+[entity-description]
+cargo-robot=A slow logistic robot that can carry a stack of items.
+cargo-robot-2=A slow logistic robot that can carry a large stack of items.
+;cargo-roboport=This item should be hidden.
+cargo-hub=Early roboport with increased charging capabilities.
+cargo-box=Early roboport with large storage capacity for robots, but limited charging capabilities.
+angels-construction-robot=An early but slow construction robot.
+
+angels-relay-station=Extends the supply area of the logistic network and provides charging points for robots.
+angels-relay-station-2=Extends the supply area of the logistic network and provides charging points for robots.
+angels-relay-station-3=Extends the supply area of the logistic network and provides charging points for robots. Also provides minimal storage for robots.
+angels-charging-station=Provides charging points for robots with considerable recharge power.
+angels-zone-expander=Extends supply zone of the logistic network without requiring any electricity.
+angels-zone-expander-2=Extends supply zone of the logistic network without requiring any electricity.
+angels-zone-expander-3=Extends supply zone of the logistic network without requiring any electricity.
+angels-construction-zone-expander=Extends the construction zone of the logistic network.
+angels-construction-zone-expander-2=Extends the construction zone of the logistic network.
+angels-construction-zone-expander-3=Extends the construction zone of the logistic network. Also provides minimal charging for robots.
+
+angels-logistic-chest-passive-provider=Makes its content available to the logistic network.
+angels-logistic-chest-requester=Requests specified items from the logistic network.
+angels-logistic-chest-active-provider=Sends its content to the logistic network.
+angels-logistic-chest-storage=Long-term storage for the logistic network.
+angels-logistic-chest-buffer=Requests specified items to be available for personal logistics and automated construction.
+
+angels-crawler=Slow vehicle with huge trunk storage. Can be equipped with a vehicle roboport for mobile construction works.
+
+angels-lamp=Lamp with "Crawler" aesthetics.
 
 [item-name]
 
@@ -38,6 +67,14 @@ angels-construction-roboport-vequip=Vehicle construction roboport
 angels-heavy-energy-shield-vequip=Vehicle heavy shield generator
 angels-rocket-defense-equipment-vequip=Vehicle rocket defense
 
+[equipment-description]
+angels-burner-generator-vequip=Basic method to power vehicle equipment via burnable fuel.
+angels-fusion-reactor-vequip=Advanced method to power vehicle equipment permanently.
+angels-repair-roboport-vequip=Roboport optimized for repair of the vehicle itself, without interfering too much with nearby ghosts.
+angels-construction-roboport-vequip=Roboport for mobile construction works from the vehicle trunk inventory.
+angels-heavy-energy-shield-vequip=Protection for vehicles.
+angels-rocket-defense-equipment-vequip=Automatic defense system for vehicles.
+
 [recipe-category-name]
 
 [item-group-name]
@@ -57,6 +94,10 @@ angels-ghosting-angels-construction-robots=Ghosted entities on destruction
 angels-hidden-ghosting=Ghosted entities on destruction
 
 [technology-description]
+angels-construction-robots=Early but slow robots for construction works.
+cargo-robots=Early but slow robots for logistic tasks. Can carry many items at once.
+angels-crawler=Slow vehicle with huge trunk storage. Can be equipped with a vehicle roboport for mobile construction works.
+angels-vequipment=Basic technology to provide power to vehicle equipment grids.
 angels-ghosting-angels-construction-robots=This technology unlocks a toggle to enable and disable the creation of ghosts when entities are destroyed by external forces. By default the ghosting is enabled after researching it.
 
 [mod-setting-name]
diff --git a/angelsindustries/locale/en/nuclear-power.cfg b/angelsindustries/locale/en/nuclear-power.cfg
index 18e9be7b0..b63be2f8c 100644
--- a/angelsindustries/locale/en/nuclear-power.cfg
+++ b/angelsindustries/locale/en/nuclear-power.cfg
@@ -48,6 +48,6 @@ angels-thorium-power=Thorium-plutonium-based power systems
 angels-fusion-power=Deuterium fusion-based power systems
 
 [technology-description]
-angels-plutonium-power=All that is required to use all of that U-238. Convert it to plutonium-240 through breeder cycles.
+angels-plutonium-power=All that is required to use up excess uranium-238. Convert it to plutonium-240 through breeder cycles.
 angels-thorium-power=All that is required to use thorium-based power cycles. If you have excess plutonium-240 or curium-245, you may as well get an energy boost.
-angels-fusion-power=All that is needed to seed and maintain fusion power through the use of muons and deuterium.
+angels-fusion-power=All that is required to seed and maintain fusion power through the use of muons and deuterium.
diff --git a/angelsindustries/locale/en/science.cfg b/angelsindustries/locale/en/science.cfg
index ea40eb94f..7f8a3b477 100644
--- a/angelsindustries/locale/en/science.cfg
+++ b/angelsindustries/locale/en/science.cfg
@@ -23,6 +23,19 @@ angels-war-lab-1=Warfare tech laboratory 1
 angels-war-lab-2=Warfare tech laboratory 2
 angels-war-lab-3=Warfare tech laboratory 3
 
+[entity-description]
+angels-lab-inputs=[font=default-semibold][color=1,0.9,0.75]Inputs:[/color][/font] __1__
+angels-main-lab-crash-site=Contains all the knowledge you've gathered in the past. You should try to rebuild it to its former glory.
+angels-main-lab=Performs key technology research.
+angels-main-lab-warning=[img=utility/warning_icon] You only have one of these! Take good care of it! If you do lose it, kill yourself and you'll get a new one.
+angels-basic-lab=Performs basic technology research, as well as technologies that do not fit in other categories.
+angels-energy-lab=Performs energy technology research.
+angels-enhance-lab=Performs enhancement technology research.
+angels-exploration-lab=Performs exploration technology research.
+angels-logistic-lab=Performs logistic technology research.
+angels-processing-lab=Performs processing technology research.
+angels-war-lab=Performs warfare technology research.
+
 [item-name]
 angels-science-pack-grey=Grey science analyzer
 angels-science-pack-red=Red science analyzer
@@ -55,6 +68,30 @@ science-force-analyzer=Force analyzer
 science-harmonics-analyzer=Harmonics analyzer
 science-gravitational-analyzer=Gravitational analyzer
 
+[item-description]
+angels-science-pack-grey=Used for grey-tier science.
+angels-science-pack-red=Used for red-tier science.
+angels-science-pack-green=Used for green-tier science.
+angels-science-pack-orange=Used for orange-tier science.
+angels-science-pack-blue=Used for blue-tier science.
+angels-science-pack-yellow=Used for yellow-tier science.
+
+datacore-basic=Data for basic research.
+datacore-exploration-1=Data for basic exploration research.
+datacore-exploration-2=Data for advanced exploration research.
+datacore-enhance-1=Data for basic enhancement research.
+datacore-enhance-2=Data for advanced enhancement research.
+datacore-energy-1=Data for basic energy research.
+datacore-energy-2=Data for advanced energy research.
+datacore-logistic-1=Data for basic logistic research.
+datacore-logistic-2=Data for advanced logistic research.
+datacore-processing-1=Data for basic processing research.
+datacore-processing-2=Data for advanced processing research.
+datacore-war-1=Data for basic warfare research.
+datacore-war-2=Data for advanced warfare research.
+
+science-pack-remaining-amount-key=Remaining
+
 [equipment-name]
 
 [recipe-name]
@@ -67,11 +104,11 @@ angels-tech=Angel's Technology
 [item-subgroup-name]
 
 [technology-name]
-tech-red-packs=Red science packs (automation)
-tech-green-packs=Green science packs (key logistics)
-tech-orange-packs=Orange science packs (petrochemicals)
-tech-blue-packs=Blue science packs (advanced logistics)
-tech-yellow-packs=Yellow science packs (mid-game)
+tech-red-packs=Red science: automation
+tech-green-packs=Green science: transport
+tech-orange-packs=Orange science: petrochemistry
+tech-blue-packs=Blue science: logistics
+tech-yellow-packs=Yellow science: late-game 
 
 tech-red-circuit=Red electronics
 tech-green-circuit=Green electronics
@@ -95,39 +132,31 @@ tech-specialised-labs-advanced-processing=Advanced processing technology
 tech-specialised-labs-basic-war=Basic warfare technology
 tech-specialised-labs-advanced-war=Advanced warfare technology
 
-[entity-description]
-angels-lab-inputs=[font=default-semibold][color=1,0.9,0.75]Inputs:[/color][/font] __1__
-angels-main-lab-crash-site=Contains all the knowledge you've gathered in the past. You should try to rebuild it to it's former glory.
-angels-main-lab=Used for key technology research.
-angels-main-lab-warning=[img=utility/warning_icon] You only have one of these! Take good care of it! If you do lose it, kill yourself and you'll get a new one.
-angels-basic-lab=Used for basic research, or research that do not fit in other categories.
-angels-energy-lab=Used for energy research.
-angels-enhance-lab=Used for enhancement research.
-angels-exploration-lab=Used for exploration research.
-angels-logistic-lab=Used for logistic research.
-angels-processing-lab=Used for processing research.
-angels-war-lab=Used for warfare research.
+[technology-description]
+tech-red-packs=Red-tier science with a focus on essential automation.
+tech-green-packs=Green-tier science with a focus on essential transport.
+tech-orange-packs=Orange-tier science with a focus on petrochemical processing.
+tech-blue-packs=Blue-tier science with a focus on advanced logistics.
+tech-yellow-packs=Yellow-tier science with a focus on late-game utilities.
 
-[item-description]
-angels-science-pack-grey=Used for grey-tier science.
-angels-science-pack-red=Used for red-tier science.
-angels-science-pack-green=Used for green tier science.
-angels-science-pack-orange=Used for orange tier science.
-angels-science-pack-blue=Used for blue tier science.
-angels-science-pack-yellow=Used for yellow tier science.
-
-datacore-basic=Data for basic research.
-datacore-exploration-1=Data for basic exploration research.
-datacore-exploration-2=Data for advanced exploration research.
-datacore-enhance-1=Data for basic enhancement research.
-datacore-enhance-2=Data for advanced enhancement research.
-datacore-energy-1=Data for basic energy research.
-datacore-energy-2=Data for advanced energy research.
-datacore-logistic-1=Data for basic logistic research.
-datacore-logistic-2=Data for advanced logistic research.
-datacore-processing-1=Data for basic processing research.
-datacore-processing-2=Data for advanced processing research.
-datacore-war-1=Data for basic warfare research.
-datacore-war-2=Data for advanced warfare research.
+tech-red-circuit=Red-tier electronics for processing of signals.
+tech-green-circuit=Green-tier electronics for processing of signals.
+tech-orange-circuit=Orange-tier electronics for processing of signals.
+tech-blue-circuit=Blue-tier electronics for processing of signals.
+tech-yellow-circuit=Yellow-tier electronics for processing of signals.
 
-science-pack-remaining-amount-key=Remaining
+tech-specialised-labs=Key technology for automated research.
+tech-specialised-labs-basic=More efficient research practices for basic technology research.
+tech-specialised-labs-advanced=Most advanced research parctices that make use of space science.
+tech-specialised-labs-basic-exploration=Key technology for exploration research.
+tech-specialised-labs-advanced-exploration=Advanced technology for exploration research.
+tech-specialised-labs-basic-energy=Key technology for energy research.
+tech-specialised-labs-advanced-energy=Advanced technology for energy research.
+tech-specialised-labs-basic-enhance=Key technology for enhancement research.
+tech-specialised-labs-advanced-enhance=Advanced technology for enhancement research.
+tech-specialised-labs-basic-logistic=Key technology for logistic research.
+tech-specialised-labs-advanced-logistic=Advanced technology for logistic research.
+tech-specialised-labs-basic-processing=Key technology for processing research.
+tech-specialised-labs-advanced-processing=Advanced technology for processing research.
+tech-specialised-labs-basic-war=Key technology for warfare research.
+tech-specialised-labs-advanced-war=Advanced technology for warfare research.
diff --git a/angelsindustries/prototypes/buildings/angels-labs-basic.lua b/angelsindustries/prototypes/buildings/angels-labs-basic.lua
index f7d6bb394..fd5eb2005 100644
--- a/angelsindustries/prototypes/buildings/angels-labs-basic.lua
+++ b/angelsindustries/prototypes/buildings/angels-labs-basic.lua
@@ -5,306 +5,284 @@ local function create_rich_text_icons(inputs)
   end
   return rich_text_icons
 end
+
 if angelsmods.industries.tech then
-data:extend(
-  {
-    --BASIC LABs
+  data:extend(
     {
-      type = "item",
-      name = "angels-basic-lab",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
+      --BASIC LABs
+      {
+        type = "item",
+        name = "angels-basic-lab",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-1",
+        order = "g[angels-basic-lab]",
+        place_result = "angels-basic-lab",
+        stack_size = 10
       },
-      icon_size = 32,
-      subgroup = "angels-labs-1",
-      order = "g[angels-basic-lab]",
-      place_result = "angels-basic-lab",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-basic-lab",
-      localised_description = {
-        "",
-        {"entity-description.angels-basic-lab"},
-        "\n",
-        {
-          "entity-description.angels-lab-inputs",
-          create_rich_text_icons {
-            "angels-science-pack-grey",
-            "datacore-basic"
+      {
+        type = "lab",
+        name = "angels-basic-lab",
+        localised_description = {
+          "",
+          {"entity-description.angels-basic-lab"},
+          "\n",
+          {
+            "entity-description.angels-lab-inputs",
+            create_rich_text_icons {
+              "angels-science-pack-grey",
+              "datacore-basic"
+            }
           }
-        }
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-basic-lab"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      working_sound = {
-        sound = {
-          filename = "__base__/sound/lab.ogg",
-          volume = 0.7
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-basic-lab"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
         },
-        apparent_volume = 1
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "100kW",
-      researching_speed = 1.5,
-      inputs = {
-        "angels-science-pack-grey",
-        "datacore-basic"
-      },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-basic-lab-2",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-2",
-      order = "g[angels-basic-lab]",
-      place_result = "angels-basic-lab-2",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-basic-lab-2",
-      localised_description = {
-        "",
-        {"entity-description.angels-basic-lab"},
-        "\n",
-        {
-          "entity-description.angels-lab-inputs",
-          create_rich_text_icons {
-            "angels-science-pack-red",
-            "angels-science-pack-green",
-            "angels-science-pack-orange",
-            "angels-science-pack-blue",
-            "angels-science-pack-yellow",
-            "datacore-basic"
-          }
-        }
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
+        working_sound = {
+          sound = {
+            filename = "__base__/sound/lab.ogg",
+            volume = 0.7
+          },
+          apparent_volume = 1
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-basic-lab-2"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      working_sound = {
-        sound = {
-          filename = "__base__/sound/lab.ogg",
-          volume = 0.7
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
         },
-        apparent_volume = 1
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "150kW",
-      researching_speed = 2,
-      inputs = {
-        "angels-science-pack-red",
-        "angels-science-pack-green",
-        "angels-science-pack-orange",
-        "angels-science-pack-blue",
-        "angels-science-pack-yellow",
-        "datacore-basic"
-      },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-basic-lab-3",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
+        energy_usage = "100kW",
+        researching_speed = 1.5,
+        inputs = {
+          "angels-science-pack-grey",
+          "datacore-basic"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      subgroup = "angels-labs-3",
-      order = "g[angels-basic-lab]",
-      place_result = "angels-basic-lab-3",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-basic-lab-3",
-      localised_description = {
-        "",
-        {"entity-description.angels-basic-lab"},
-        "\n",
-        {
-          "entity-description.angels-lab-inputs",
-          create_rich_text_icons {
-            "angels-science-pack-white",
-            "datacore-basic"
-          }
-        }
+      {
+        type = "item",
+        name = "angels-basic-lab-2",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-2",
+        order = "g[angels-basic-lab]",
+        place_result = "angels-basic-lab-2",
+        stack_size = 10
       },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png"
+      {
+        type = "lab",
+        name = "angels-basic-lab-2",
+        localised_description = {
+          "",
+          {"entity-description.angels-basic-lab"},
+          "\n",
+          {
+            "entity-description.angels-lab-inputs",
+            create_rich_text_icons {
+              "angels-science-pack-red",
+              "angels-science-pack-green",
+              "angels-science-pack-orange",
+              "angels-science-pack-blue",
+              "angels-science-pack-yellow",
+              "datacore-basic"
+            }
+          }
+        },
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-basic-lab-2"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        working_sound = {
+          sound = {
+            filename = "__base__/sound/lab.ogg",
+            volume = 0.7
+          },
+          apparent_volume = 1
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        energy_usage = "150kW",
+        researching_speed = 2,
+        inputs = {
+          "angels-science-pack-red",
+          "angels-science-pack-green",
+          "angels-science-pack-orange",
+          "angels-science-pack-blue",
+          "angels-science-pack-yellow",
+          "datacore-basic"
+        },
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-basic-lab-3"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
+      {
+        type = "item",
+        name = "angels-basic-lab-3",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-3",
+        order = "g[angels-basic-lab]",
+        place_result = "angels-basic-lab-3",
+        stack_size = 10
       },
-      working_sound = {
-        sound = {
-          filename = "__base__/sound/lab.ogg",
-          volume = 0.7
+      {
+        type = "lab",
+        name = "angels-basic-lab-3",
+        localised_description = {
+          "",
+          {"entity-description.angels-basic-lab"},
+          "\n",
+          {
+            "entity-description.angels-lab-inputs",
+            create_rich_text_icons {
+              "angels-science-pack-white",
+              "datacore-basic"
+            }
+          }
         },
-        apparent_volume = 1
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "200kW",
-      researching_speed = 2.5,
-      inputs = {
-        "angels-science-pack-white",
-        "datacore-basic"
-      },
-      module_specification = {
-        module_slots = 3,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/basic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-basic-lab-3"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/basic-lab/basic-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        working_sound = {
+          sound = {
+            filename = "__base__/sound/lab.ogg",
+            volume = 0.7
+          },
+          apparent_volume = 1
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "200kW",
+        researching_speed = 2.5,
+        inputs = {
+          "angels-science-pack-white",
+          "datacore-basic"
+        },
+        module_specification = {
+          module_slots = 3,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
+        }
       }
     }
-  }
-)
-angelsmods.triggers.lab_ignore_token["angels-basic-lab"] = true
-angelsmods.triggers.lab_ignore_token["angels-basic-lab-2"] = true
-angelsmods.triggers.lab_ignore_token["angels-basic-lab-3"] = true
+  )
+  
+  angelsmods.triggers.lab_ignore_token["angels-basic-lab"] = true
+  angelsmods.triggers.lab_ignore_token["angels-basic-lab-2"] = true
+  angelsmods.triggers.lab_ignore_token["angels-basic-lab-3"] = true
 end
\ No newline at end of file
diff --git a/angelsindustries/prototypes/buildings/angels-labs-energy.lua b/angelsindustries/prototypes/buildings/angels-labs-energy.lua
index f31d02ff6..1ebf1ee7f 100644
--- a/angelsindustries/prototypes/buildings/angels-labs-energy.lua
+++ b/angelsindustries/prototypes/buildings/angels-labs-energy.lua
@@ -5,276 +5,253 @@ local function create_rich_text_icons(inputs)
   end
   return rich_text_icons
 end
+
 if angelsmods.industries.tech then
-data:extend(
-  {
-    --ENERGY LAB
+  data:extend(
     {
-      type = "item",
-      name = "angels-energy-lab-1",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
+      --ENERGY LAB
+      {
+        type = "item",
+        name = "angels-energy-lab-1",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-1",
+        order = "c[angels-energy-lab-1]",
+        place_result = "angels-energy-lab-1",
+        stack_size = 10
       },
-      icon_size = 32,
-      subgroup = "angels-labs-1",
-      order = "c[angels-energy-lab-1]",
-      place_result = "angels-energy-lab-1",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-energy-lab-1",
-      localised_description = {"",
-        {"entity-description.angels-energy-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+      {
+        type = "lab",
+        name = "angels-energy-lab-1",
+        localised_description = {"",
+          {"entity-description.angels-energy-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-red",
+            "angels-science-pack-green",
+            "angels-science-pack-orange",
+            "datacore-energy-1"
+          }}
+        },
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-energy-lab-1"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        working_sound = {
+          sound = {
+            filename = "__base__/sound/lab.ogg",
+            volume = 0.7
+          },
+          apparent_volume = 1
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "125kW",
+        researching_speed = 1,
+        inputs = {
           "angels-science-pack-red",
           "angels-science-pack-green",
           "angels-science-pack-orange",
           "datacore-energy-1"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-energy-lab-1"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
+      {
+        type = "item",
+        name = "angels-energy-lab-2",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-2",
+        order = "c[angels-energy-lab-2]",
+        place_result = "angels-energy-lab-2",
+        stack_size = 10
       },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      working_sound = {
-        sound = {
-          filename = "__base__/sound/lab.ogg",
-          volume = 0.7
+      {
+        type = "lab",
+        name = "angels-energy-lab-2",
+        localised_description = {"",
+          {"entity-description.angels-energy-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-blue",
+            "angels-science-pack-yellow",
+            "datacore-energy-2"
+          }}
         },
-        apparent_volume = 1
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "125kW",
-      researching_speed = 1,
-      inputs = {
-        "angels-science-pack-red",
-        "angels-science-pack-green",
-        "angels-science-pack-orange",
-        "datacore-energy-1"
-      },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-energy-lab-2",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-energy-lab-2"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-2",
-      order = "c[angels-energy-lab-2]",
-      place_result = "angels-energy-lab-2",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-energy-lab-2",
-      localised_description = {"",
-        {"entity-description.angels-energy-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "250kW",
+        researching_speed = 2,
+        inputs = {
           "angels-science-pack-blue",
           "angels-science-pack-yellow",
           "datacore-energy-2"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-energy-lab-2"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "250kW",
-      researching_speed = 2,
-      inputs = {
-        "angels-science-pack-blue",
-        "angels-science-pack-yellow",
-        "datacore-energy-2"
+      {
+        type = "item",
+        name = "angels-energy-lab-3",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-3",
+        order = "c[angels-energy-lab-3]",
+        place_result = "angels-energy-lab-3",
+        stack_size = 10
       },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-energy-lab-3",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
+      {
+        type = "lab",
+        name = "angels-energy-lab-3",
+        localised_description = {"",
+          {"entity-description.angels-energy-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-white",
+            "datacore-energy-2"
+          }}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-3",
-      order = "c[angels-energy-lab-3]",
-      place_result = "angels-energy-lab-3",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-energy-lab-3",
-      localised_description = {"",
-        {"entity-description.angels-energy-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-energy-lab-3"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "300kW",
+        researching_speed = 3,
+        inputs = {
           "angels-science-pack-white",
           "datacore-energy-2"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/energy-lab-ico.png"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 3,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
-      },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-energy-lab-3"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/energy-lab/energy-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "300kW",
-      researching_speed = 3,
-      inputs = {
-        "angels-science-pack-white",
-        "datacore-energy-2"
-      },
-      module_specification = {
-        module_slots = 3,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
       }
     }
-  }
-)
+  )
 
-angelsmods.triggers.lab_ignore_token["angels-energy-lab-1"] = true
-angelsmods.triggers.lab_ignore_token["angels-energy-lab-2"] = true
-angelsmods.triggers.lab_ignore_token["angels-energy-lab-3"] = true
+  angelsmods.triggers.lab_ignore_token["angels-energy-lab-1"] = true
+  angelsmods.triggers.lab_ignore_token["angels-energy-lab-2"] = true
+  angelsmods.triggers.lab_ignore_token["angels-energy-lab-3"] = true
 end
\ No newline at end of file
diff --git a/angelsindustries/prototypes/buildings/angels-labs-enhance.lua b/angelsindustries/prototypes/buildings/angels-labs-enhance.lua
index 1218bff02..e2cf639e0 100644
--- a/angelsindustries/prototypes/buildings/angels-labs-enhance.lua
+++ b/angelsindustries/prototypes/buildings/angels-labs-enhance.lua
@@ -5,6 +5,7 @@ local function create_rich_text_icons(inputs)
   end
   return rich_text_icons
 end
+
 if angelsmods.industries.tech then
   data:extend(
     {
@@ -12,18 +13,14 @@ if angelsmods.industries.tech then
       {
         type = "item",
         name = "angels-enhance-lab-1",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          1, angelsmods.industries.number_tint),
         subgroup = "angels-labs-1",
         order = "b[angels-enhance-lab-1]",
         place_result = "angels-enhance-lab-1",
@@ -42,18 +39,14 @@ if angelsmods.industries.tech then
             "token-bio"
           }}
         },
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          1, angelsmods.industries.number_tint),
         flags = {"placeable-player", "player-creation"},
         minable = {mining_time = 1, result = "angels-enhance-lab-1"},
         max_health = 150,
@@ -108,18 +101,14 @@ if angelsmods.industries.tech then
       {
         type = "item",
         name = "angels-enhance-lab-2",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          2, angelsmods.industries.number_tint),
         subgroup = "angels-labs-2",
         order = "b[angels-enhance-lab-2]",
         place_result = "angels-enhance-lab-2",
@@ -137,18 +126,14 @@ if angelsmods.industries.tech then
             "token-bio"
           }}
         },
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          2, angelsmods.industries.number_tint),
         flags = {"placeable-player", "player-creation"},
         minable = {mining_time = 1, result = "angels-enhance-lab-2"},
         max_health = 150,
@@ -195,18 +180,14 @@ if angelsmods.industries.tech then
       {
         type = "item",
         name = "angels-enhance-lab-3",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_3.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          3, angelsmods.industries.number_tint),
         subgroup = "angels-labs-3",
         order = "b[angels-enhance-lab-3]",
         place_result = "angels-enhance-lab-3",
@@ -222,18 +203,14 @@ if angelsmods.industries.tech then
             "datacore-enhance-2"
           }}
         },
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/enhance-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_3.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          3, angelsmods.industries.number_tint),
         flags = {"placeable-player", "player-creation"},
         minable = {mining_time = 1, result = "angels-enhance-lab-3"},
         max_health = 150,
diff --git a/angelsindustries/prototypes/buildings/angels-labs-exploration.lua b/angelsindustries/prototypes/buildings/angels-labs-exploration.lua
index bcd4c40c7..7b4283805 100644
--- a/angelsindustries/prototypes/buildings/angels-labs-exploration.lua
+++ b/angelsindustries/prototypes/buildings/angels-labs-exploration.lua
@@ -5,6 +5,7 @@ local function create_rich_text_icons(inputs)
   end
   return rich_text_icons
 end
+
 if angelsmods.industries.tech then
   data:extend(
     {
@@ -12,18 +13,14 @@ if angelsmods.industries.tech then
       {
         type = "item",
         name = "angels-exploration-lab-1",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          1, angelsmods.industries.number_tint),
         subgroup = "angels-labs-1",
         order = "a[angels-exploration-lab-1]",
         place_result = "angels-exploration-lab-1",
@@ -47,18 +44,14 @@ if angelsmods.industries.tech then
             }
           }
         },
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          1, angelsmods.industries.number_tint),
         flags = {"placeable-player", "player-creation"},
         minable = {mining_time = 1, result = "angels-exploration-lab-1"},
         max_health = 150,
@@ -112,18 +105,14 @@ if angelsmods.industries.tech then
       {
         type = "item",
         name = "angels-exploration-lab-2",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          2, angelsmods.industries.number_tint),
         subgroup = "angels-labs-2",
         order = "a[angels-exploration-lab-2]",
         place_result = "angels-exploration-lab-2",
@@ -145,18 +134,14 @@ if angelsmods.industries.tech then
             }
           }
         },
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          2, angelsmods.industries.number_tint),
         flags = {"placeable-player", "player-creation"},
         minable = {mining_time = 1, result = "angels-exploration-lab-2"},
         max_health = 150,
@@ -202,18 +187,14 @@ if angelsmods.industries.tech then
       {
         type = "item",
         name = "angels-exploration-lab-3",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_3.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
+          3, angelsmods.industries.number_tint),
         subgroup = "angels-labs-3",
         order = "a[angels-exploration-lab-3]",
         place_result = "angels-exploration-lab-3",
@@ -234,17 +215,14 @@ if angelsmods.industries.tech then
             }
           }
         },
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png"
+            {
+              icon = "__angelsindustries__/graphics/icons/exploration-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_3.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
+          3, angelsmods.industries.number_tint),
         icon_size = 32,
         flags = {"placeable-player", "player-creation"},
         minable = {mining_time = 1, result = "angels-exploration-lab-3"},
diff --git a/angelsindustries/prototypes/buildings/angels-labs-logistic.lua b/angelsindustries/prototypes/buildings/angels-labs-logistic.lua
index 7c141d611..d3f3ce246 100644
--- a/angelsindustries/prototypes/buildings/angels-labs-logistic.lua
+++ b/angelsindustries/prototypes/buildings/angels-labs-logistic.lua
@@ -5,276 +5,253 @@ local function create_rich_text_icons(inputs)
   end
   return rich_text_icons
 end
+
 if angelsmods.industries.tech then
-data:extend(
-  {
-    --LOGISTIC LAB
+  data:extend(
     {
-      type = "item",
-      name = "angels-logistic-lab-1",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
+      --LOGISTIC LAB
+      {
+        type = "item",
+        name = "angels-logistic-lab-1",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-1",
+        order = "d[angels-logistic-lab-1]",
+        place_result = "angels-logistic-lab-1",
+        stack_size = 10
       },
-      icon_size = 32,
-      subgroup = "angels-labs-1",
-      order = "d[angels-logistic-lab-1]",
-      place_result = "angels-logistic-lab-1",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-logistic-lab-1",
-      localised_description = {"",
-        {"entity-description.angels-logistic-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+      {
+        type = "lab",
+        name = "angels-logistic-lab-1",
+        localised_description = {"",
+          {"entity-description.angels-logistic-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-red",
+            "angels-science-pack-green",
+            "angels-science-pack-orange",
+            "datacore-logistic-1"
+          }}
+        },
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-logistic-lab-1"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        working_sound = {
+          sound = {
+            filename = "__base__/sound/lab.ogg",
+            volume = 0.7
+          },
+          apparent_volume = 1
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "125kW",
+        researching_speed = 1,
+        inputs = {
           "angels-science-pack-red",
           "angels-science-pack-green",
           "angels-science-pack-orange",
           "datacore-logistic-1"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-logistic-lab-1"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
+      {
+        type = "item",
+        name = "angels-logistic-lab-2",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-2",
+        order = "d[angels-logistic-lab-2]",
+        place_result = "angels-logistic-lab-2",
+        stack_size = 10
       },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      working_sound = {
-        sound = {
-          filename = "__base__/sound/lab.ogg",
-          volume = 0.7
+      {
+        type = "lab",
+        name = "angels-logistic-lab-2",
+        localised_description = {"",
+          {"entity-description.angels-logistic-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-blue",
+            "angels-science-pack-yellow",
+            "datacore-logistic-2"
+          }}
         },
-        apparent_volume = 1
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "125kW",
-      researching_speed = 1,
-      inputs = {
-        "angels-science-pack-red",
-        "angels-science-pack-green",
-        "angels-science-pack-orange",
-        "datacore-logistic-1"
-      },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-logistic-lab-2",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-logistic-lab-2"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-2",
-      order = "d[angels-logistic-lab-2]",
-      place_result = "angels-logistic-lab-2",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-logistic-lab-2",
-      localised_description = {"",
-        {"entity-description.angels-logistic-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "250kW",
+        researching_speed = 2,
+        inputs = {
           "angels-science-pack-blue",
           "angels-science-pack-yellow",
           "datacore-logistic-2"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-logistic-lab-2"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "250kW",
-      researching_speed = 2,
-      inputs = {
-        "angels-science-pack-blue",
-        "angels-science-pack-yellow",
-        "datacore-logistic-2"
+      {
+        type = "item",
+        name = "angels-logistic-lab-3",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-3",
+        order = "d[angels-logistic-lab-3]",
+        place_result = "angels-logistic-lab-3",
+        stack_size = 10
       },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-logistic-lab-3",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
+      {
+        type = "lab",
+        name = "angels-logistic-lab-3",
+        localised_description = {"",
+          {"entity-description.angels-logistic-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-white",
+            "datacore-logistic-2"
+          }}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-3",
-      order = "d[angels-logistic-lab-3]",
-      place_result = "angels-logistic-lab-3",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-logistic-lab-3",
-      localised_description = {"",
-        {"entity-description.angels-logistic-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-logistic-lab-3"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "300kW",
+        researching_speed = 3,
+        inputs = {
           "angels-science-pack-white",
           "datacore-logistic-2"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/logistic-lab-ico.png"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 3,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
-      },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-logistic-lab-3"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/logistic-lab/logistic-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "300kW",
-      researching_speed = 3,
-      inputs = {
-        "angels-science-pack-white",
-        "datacore-logistic-2"
-      },
-      module_specification = {
-        module_slots = 3,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
       }
     }
-  }
-)
+  )
 
-angelsmods.triggers.lab_ignore_token["angels-logistic-lab-1"] = true
-angelsmods.triggers.lab_ignore_token["angels-logistic-lab-2"] = true
-angelsmods.triggers.lab_ignore_token["angels-logistic-lab-3"] = true
+  angelsmods.triggers.lab_ignore_token["angels-logistic-lab-1"] = true
+  angelsmods.triggers.lab_ignore_token["angels-logistic-lab-2"] = true
+  angelsmods.triggers.lab_ignore_token["angels-logistic-lab-3"] = true
 end
\ No newline at end of file
diff --git a/angelsindustries/prototypes/buildings/angels-labs-main.lua b/angelsindustries/prototypes/buildings/angels-labs-main.lua
index 31cc94e15..3d5b1d1af 100644
--- a/angelsindustries/prototypes/buildings/angels-labs-main.lua
+++ b/angelsindustries/prototypes/buildings/angels-labs-main.lua
@@ -8,7 +8,8 @@ if angelsmods.industries.tech then
     icons = {
       {
         icon = "__angelsindustries__/graphics/icons/main-lab.png",
-        icon_size = 64
+        icon_size = 64, icon_mipmaps = 1,
+        scale = 0.5
       }
     },
     icon_size = 32,
@@ -21,8 +22,7 @@ if angelsmods.industries.tech then
   local lab_entity = {
     type = "lab",
     --name = lab_item.place_result,
-    icon = lab_item.icons[1].icon,
-    icon_size = lab_item.icons[1].icon_size,
+    --icons = lab_item.icons,
     flags = {"placeable-player", "player-creation"},
     minable = {
       mining_time = 1
@@ -33,7 +33,8 @@ if angelsmods.industries.tech then
     dying_explosion = "medium-explosion",
 
     collision_box = {{-3.2, -3.2}, {3.2, 3.2}},
-    selection_box = {{-3.5, -4.5}, {3.5, 3.5}},
+    selection_box = {{-3.5, -3.5}, {3.5, 3.5}},
+    drawing_box   = {{-3.5, -4.5}, {3.5, 3.5}},
 
     light = {intensity = 0.75, size = 8},
 
@@ -164,15 +165,7 @@ if angelsmods.industries.tech then
     -- item
     local lab_item_tier = util.table.deepcopy(lab_item)
     lab_item_tier.name = lab_item_tier.name .. string.format("-%i", tier_index)
-    table.insert(
-      lab_item_tier.icons,
-      {
-        icon = string.format("__angelsrefining__/graphics/icons/num_%i.png", tier_index),
-        tint = angelsmods.industries.number_tint,
-        scale = 0.32,
-        shift = {-12, -12}
-      }
-    )
+    lab_item_tier.icons = angelsmods.functions.add_number_icon_layer(lab_item_tier.icons, tier_index, angelsmods.industries.number_tint)
     lab_item_tier.place_result = lab_item_tier.name
     lab_item_tier.order = lab_item_tier.order .. string.format("-%i", tier_index)
 
@@ -188,6 +181,7 @@ if angelsmods.industries.tech then
       "\n",
       {"entity-description.angels-lab-inputs", create_rich_text_icons(lab_entity_tier.inputs)}
     }
+    lab_entity_tier.icons = util.table.deepcopy(lab_item_tier.icons)
     lab_entity_tier.minable.result = lab_item_tier.name
     lab_entity_tier.energy_usage = string.format("%iMW", lab_entity_tier.researching_speed)
 
@@ -484,5 +478,4 @@ if angelsmods.industries.tech then
   )
 
   angelsmods.triggers.lab_ignore_token[lab_item.name .. string.format("-%i", 0)] = true
-
 end
diff --git a/angelsindustries/prototypes/buildings/angels-labs-processing.lua b/angelsindustries/prototypes/buildings/angels-labs-processing.lua
index 40ca490c2..a9f3b0350 100644
--- a/angelsindustries/prototypes/buildings/angels-labs-processing.lua
+++ b/angelsindustries/prototypes/buildings/angels-labs-processing.lua
@@ -5,282 +5,260 @@ local function create_rich_text_icons(inputs)
   end
   return rich_text_icons
 end
+
 if angelsmods.industries.tech then
-data:extend(
-  {
-    --PROCESSING LAB
+  data:extend(
     {
-      type = "item",
-      name = "angels-processing-lab-1",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
+      --PROCESSING LAB
+      {
+        type = "item",
+        name = "angels-processing-lab-1",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-1",
+        order = "f",
+        place_result = "angels-processing-lab-1",
+        stack_size = 10
       },
-      icon_size = 32,
-      subgroup = "angels-labs-1",
-      order = "f",
-      place_result = "angels-processing-lab-1",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-processing-lab-1",
-      localised_description = {"",
-        {"entity-description.angels-processing-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+      {
+        type = "lab",
+        name = "angels-processing-lab-1",
+        localised_description = {"",
+          {"entity-description.angels-processing-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-red",
+            "angels-science-pack-green",
+            "angels-science-pack-orange",
+            "datacore-processing-1",
+            "token-bio",
+          }}
+        },
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-processing-lab-1"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        working_sound = {
+          sound = {
+            filename = "__base__/sound/lab.ogg",
+            volume = 0.7
+          },
+          apparent_volume = 1
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "125kW",
+        researching_speed = 1,
+        inputs = {
           "angels-science-pack-red",
           "angels-science-pack-green",
           "angels-science-pack-orange",
-          "datacore-processing-1",
-          "token-bio",
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
+          "datacore-processing-1"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-processing-lab-1"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
+      {
+        type = "item",
+        name = "angels-processing-lab-2",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-2",
+        order = "f",
+        place_result = "angels-processing-lab-2",
+        stack_size = 10
       },
-      working_sound = {
-        sound = {
-          filename = "__base__/sound/lab.ogg",
-          volume = 0.7
+      {
+        type = "lab",
+        name = "angels-processing-lab-2",
+        localised_description = {"",
+          {"entity-description.angels-processing-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-blue",
+            "angels-science-pack-yellow",
+            "datacore-processing-2",
+            "token-bio",
+          }}
         },
-        apparent_volume = 1
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "125kW",
-      researching_speed = 1,
-      inputs = {
-        "angels-science-pack-red",
-        "angels-science-pack-green",
-        "angels-science-pack-orange",
-        "datacore-processing-1"
-      },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-processing-lab-2",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-processing-lab-2"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-2",
-      order = "f",
-      place_result = "angels-processing-lab-2",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-processing-lab-2",
-      localised_description = {"",
-        {"entity-description.angels-processing-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "250kW",
+        researching_speed = 2,
+        inputs = {
           "angels-science-pack-blue",
           "angels-science-pack-yellow",
-          "datacore-processing-2",
-          "token-bio",
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
+          "datacore-processing-2"
+          --"datacore-processing-3",
+          --"datacore-processing-4",
+          --"datacore-processing-5"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-processing-lab-2"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "250kW",
-      researching_speed = 2,
-      inputs = {
-        "angels-science-pack-blue",
-        "angels-science-pack-yellow",
-        "datacore-processing-2"
-        --"datacore-processing-3",
-        --"datacore-processing-4",
-        --"datacore-processing-5"
+      {
+        type = "item",
+        name = "angels-processing-lab-3",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-3",
+        order = "f",
+        place_result = "angels-processing-lab-3",
+        stack_size = 10
       },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-processing-lab-3",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
+      {
+        type = "lab",
+        name = "angels-processing-lab-3",
+        localised_description = {"",
+          {"entity-description.angels-processing-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-white",
+            "datacore-processing-2",
+            "token-bio",
+          }}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-3",
-      order = "f",
-      place_result = "angels-processing-lab-3",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-processing-lab-3",
-      localised_description = {"",
-        {"entity-description.angels-processing-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-processing-lab-3"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "300kW",
+        researching_speed = 3,
+        inputs = {
           "angels-science-pack-white",
-          "datacore-processing-2",
-          "token-bio",
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/processing-lab-ico.png"
+          "datacore-processing-2"
+          --"datacore-processing-3",
+          --"datacore-processing-4",
+          --"datacore-processing-5"
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 3,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
-      },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-processing-lab-3"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/processing-lab/processing-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "300kW",
-      researching_speed = 3,
-      inputs = {
-        "angels-science-pack-white",
-        "datacore-processing-2"
-        --"datacore-processing-3",
-        --"datacore-processing-4",
-        --"datacore-processing-5"
-      },
-      module_specification = {
-        module_slots = 3,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
       }
     }
-  }
-)
-angelsmods.triggers.lab_ignore_token["angels-processing-lab-3"] = true
+  )
+  
+  angelsmods.triggers.lab_ignore_token["angels-processing-lab-3"] = true
 end
\ No newline at end of file
diff --git a/angelsindustries/prototypes/buildings/angels-labs-war.lua b/angelsindustries/prototypes/buildings/angels-labs-war.lua
index 8c1629dc8..6da403f81 100644
--- a/angelsindustries/prototypes/buildings/angels-labs-war.lua
+++ b/angelsindustries/prototypes/buildings/angels-labs-war.lua
@@ -5,276 +5,253 @@ local function create_rich_text_icons(inputs)
   end
   return rich_text_icons
 end
+
 if angelsmods.industries.tech then
-data:extend(
-  {
-    --WAR LAB
+  data:extend(
     {
-      type = "item",
-      name = "angels-war-lab-1",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
+      --WAR LAB
+      {
+        type = "item",
+        name = "angels-war-lab-1",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-1",
+        order = "e",
+        place_result = "angels-war-lab-1",
+        stack_size = 10
       },
-      icon_size = 32,
-      subgroup = "angels-labs-1",
-      order = "e",
-      place_result = "angels-war-lab-1",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-war-lab-1",
-      localised_description = {"",
-        {"entity-description.angels-war-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+      {
+        type = "lab",
+        name = "angels-war-lab-1",
+        localised_description = {"",
+          {"entity-description.angels-war-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-red",
+            "angels-science-pack-green",
+            "angels-science-pack-orange",
+            "datacore-war-1"
+          }}
+        },
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          1, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-war-lab-1"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        working_sound = {
+          sound = {
+            filename = "__base__/sound/lab.ogg",
+            volume = 0.7
+          },
+          apparent_volume = 1
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "125kW",
+        researching_speed = 1,
+        inputs = {
           "angels-science-pack-red",
           "angels-science-pack-green",
           "angels-science-pack-orange",
           "datacore-war-1"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-war-lab-1"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
+      {
+        type = "item",
+        name = "angels-war-lab-2",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-2",
+        order = "e",
+        place_result = "angels-war-lab-2",
+        stack_size = 10
       },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      working_sound = {
-        sound = {
-          filename = "__base__/sound/lab.ogg",
-          volume = 0.7
+      {
+        type = "lab",
+        name = "angels-war-lab-2",
+        localised_description = {"",
+          {"entity-description.angels-war-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-blue",
+            "angels-science-pack-yellow",
+            "datacore-war-2"
+          }}
         },
-        apparent_volume = 1
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "125kW",
-      researching_speed = 1,
-      inputs = {
-        "angels-science-pack-red",
-        "angels-science-pack-green",
-        "angels-science-pack-orange",
-        "datacore-war-1"
-      },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-war-lab-2",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          2, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-war-lab-2"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-2",
-      order = "e",
-      place_result = "angels-war-lab-2",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-war-lab-2",
-      localised_description = {"",
-        {"entity-description.angels-war-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "250kW",
+        researching_speed = 2,
+        inputs = {
           "angels-science-pack-blue",
           "angels-science-pack-yellow",
           "datacore-war-2"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 2,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
       },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-war-lab-2"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "250kW",
-      researching_speed = 2,
-      inputs = {
-        "angels-science-pack-blue",
-        "angels-science-pack-yellow",
-        "datacore-war-2"
+      {
+        type = "item",
+        name = "angels-war-lab-3",
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        subgroup = "angels-labs-3",
+        order = "e",
+        place_result = "angels-war-lab-3",
+        stack_size = 10
       },
-      module_specification = {
-        module_slots = 2,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
-      }
-    },
-    {
-      type = "item",
-      name = "angels-war-lab-3",
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
+      {
+        type = "lab",
+        name = "angels-war-lab-3",
+        localised_description = {"",
+          {"entity-description.angels-war-lab"}, "\n",
+          {"entity-description.angels-lab-inputs", create_rich_text_icons{
+            "angels-science-pack-white",
+            "datacore-war-2"
+          }}
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
-      subgroup = "angels-labs-3",
-      order = "e",
-      place_result = "angels-war-lab-3",
-      stack_size = 10
-    },
-    {
-      type = "lab",
-      name = "angels-war-lab-3",
-      localised_description = {"",
-        {"entity-description.angels-war-lab"}, "\n",
-        {"entity-description.angels-lab-inputs", create_rich_text_icons{
+        icons = angelsmods.functions.add_number_icon_layer(
+          {
+            {
+              icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
+              icon_size = 32, icon_mipmaps = 1
+            }
+          },
+          3, angelsmods.industries.number_tint),
+        flags = {"placeable-player", "player-creation"},
+        minable = {mining_time = 1, result = "angels-war-lab-3"},
+        max_health = 150,
+        corpse = "big-remnants",
+        dying_explosion = "medium-explosion",
+        collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
+        selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
+        light = {intensity = 0.75, size = 8},
+        on_animation = {
+          filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
+          width = 160,
+          height = 160,
+          frame_count = 36,
+          line_length = 6,
+          animation_speed = 0.5,
+          shift = {0, 0}
+        },
+        off_animation = {
+          filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
+          width = 160,
+          height = 160,
+          frame_count = 1,
+          shift = {0, 0}
+        },
+        energy_source = {
+          type = "electric",
+          usage_priority = "secondary-input"
+        },
+        energy_usage = "300kW",
+        researching_speed = 3,
+        inputs = {
           "angels-science-pack-white",
           "datacore-war-2"
-        }}
-      },
-      icons = {
-        {
-          icon = "__angelsindustries__/graphics/icons/war-lab-ico.png",
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
+        module_specification = {
+          module_slots = 3,
+          max_entity_info_module_icons_per_row = 3,
+          max_entity_info_module_icon_rows = 1,
+          module_info_icon_shift = {0, 0.9}
         }
-      },
-      icon_size = 32,
-      flags = {"placeable-player", "player-creation"},
-      minable = {mining_time = 1, result = "angels-war-lab-3"},
-      max_health = 150,
-      corpse = "big-remnants",
-      dying_explosion = "medium-explosion",
-      collision_box = {{-1.2, -1.2}, {1.2, 1.2}},
-      selection_box = {{-1.5, -1.5}, {1.5, 1.5}},
-      light = {intensity = 0.75, size = 8},
-      on_animation = {
-        filename = "__angelsindustries__/graphics/entity/war-lab/war-lab.png",
-        width = 160,
-        height = 160,
-        frame_count = 36,
-        line_length = 6,
-        animation_speed = 0.5,
-        shift = {0, 0}
-      },
-      off_animation = {
-        filename = "__angelsindustries__/graphics/entity/war-lab/war-lab-off.png",
-        width = 160,
-        height = 160,
-        frame_count = 1,
-        shift = {0, 0}
-      },
-      energy_source = {
-        type = "electric",
-        usage_priority = "secondary-input"
-      },
-      energy_usage = "300kW",
-      researching_speed = 3,
-      inputs = {
-        "angels-science-pack-white",
-        "datacore-war-2"
-      },
-      module_specification = {
-        module_slots = 3,
-        max_entity_info_module_icons_per_row = 3,
-        max_entity_info_module_icon_rows = 1,
-        module_info_icon_shift = {0, 0.9}
       }
     }
-  }
-)
+  )
 
-angelsmods.triggers.lab_ignore_token["angels-war-lab-1"] = true
-angelsmods.triggers.lab_ignore_token["angels-war-lab-2"] = true
-angelsmods.triggers.lab_ignore_token["angels-war-lab-3"] = true
+  angelsmods.triggers.lab_ignore_token["angels-war-lab-1"] = true
+  angelsmods.triggers.lab_ignore_token["angels-war-lab-2"] = true
+  angelsmods.triggers.lab_ignore_token["angels-war-lab-3"] = true
 end
\ No newline at end of file
diff --git a/angelsindustries/prototypes/buildings/angels-logistics-big-chest.lua b/angelsindustries/prototypes/buildings/angels-logistics-big-chest.lua
index 57bf5d04a..dd95f2293 100644
--- a/angelsindustries/prototypes/buildings/angels-logistics-big-chest.lua
+++ b/angelsindustries/prototypes/buildings/angels-logistics-big-chest.lua
@@ -91,7 +91,6 @@ data:extend(
     },
     fast_replaceable_group = "container",
     inventory_size = 60,
-    max_logistic_slots = 12,
     logistic_mode = "requester",
     open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 },
     close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 },
@@ -283,7 +282,6 @@ data:extend(
     fast_replaceable_group = "container",
     inventory_size = 60,
     logistic_mode = "buffer",
-    max_logistic_slots = 12,
     open_sound = { filename = "__base__/sound/metallic-chest-open.ogg", volume=0.65 },
     close_sound = { filename = "__base__/sound/metallic-chest-close.ogg", volume = 0.7 },
     vehicle_impact_sound =  { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
diff --git a/angelsindustries/prototypes/items/components-blocks.lua b/angelsindustries/prototypes/items/components-blocks.lua
index 069b693a4..efb3e02b5 100644
--- a/angelsindustries/prototypes/items/components-blocks.lua
+++ b/angelsindustries/prototypes/items/components-blocks.lua
@@ -154,18 +154,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-enhancement-1",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-enhancement-1.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-enhancement-1.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.industries.number_tint),
       subgroup = "blocks-enhancement",
       order = "a",
       stack_size = angelsmods.industries.block_stack_size,
@@ -173,18 +169,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-enhancement-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-enhancement-2.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-enhancement-2.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.industries.number_tint),
       subgroup = "blocks-enhancement",
       order = "b",
       stack_size = angelsmods.industries.block_stack_size,
@@ -192,18 +184,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-enhancement-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-enhancement-3.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-enhancement-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-enhancement",
       order = "c",
       stack_size = angelsmods.industries.block_stack_size,
@@ -211,18 +199,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-enhancement-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-enhancement-4.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-enhancement-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-enhancement",
       order = "d",
       stack_size = angelsmods.industries.block_stack_size,
@@ -230,18 +214,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-enhancement-5",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-enhancement-5.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-enhancement-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_5.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-enhancement",
       order = "e",
       stack_size = angelsmods.industries.block_stack_size,
@@ -252,18 +232,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-energy-1",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-energy-1.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-energy-1.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.industries.number_tint),
       subgroup = "blocks-energy",
       order = "a",
       stack_size = angelsmods.industries.block_stack_size,
@@ -271,18 +247,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-energy-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-energy-2.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-energy-2.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.industries.number_tint),
       subgroup = "blocks-energy",
       order = "b",
       stack_size = angelsmods.industries.block_stack_size,
@@ -290,18 +262,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-energy-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-energy-3.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-energy-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-energy",
       order = "c",
       stack_size = angelsmods.industries.block_stack_size,
@@ -309,18 +277,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-energy-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-energy-4.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-energy-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-energy",
       order = "d",
       stack_size = angelsmods.industries.block_stack_size,
@@ -328,18 +292,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-energy-5",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-energy-5.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-energy-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_5.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-energy",
       order = "e",
       stack_size = angelsmods.industries.block_stack_size,
@@ -350,18 +310,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-exploration-1",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-exploration-1.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-exploration-1.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.industries.number_tint),
       subgroup = "blocks-exploration",
       order = "a",
       stack_size = angelsmods.industries.block_stack_size,
@@ -369,18 +325,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-exploration-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-exploration-2.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-exploration-2.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.industries.number_tint),
       subgroup = "blocks-exploration",
       order = "b",
       stack_size = angelsmods.industries.block_stack_size,
@@ -388,18 +340,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-exploration-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-exploration-3.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-exploration-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-exploration",
       order = "c",
       stack_size = angelsmods.industries.block_stack_size,
@@ -407,18 +355,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-exploration-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-exploration-4.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-exploration-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-exploration",
       order = "d",
       stack_size = angelsmods.industries.block_stack_size,
@@ -426,18 +370,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-exploration-5",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-exploration-5.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-exploration-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_5.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-exploration",
       order = "e",
       stack_size = angelsmods.industries.block_stack_size,
@@ -448,18 +388,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-logistic-1",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-logistic-1.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-logistic-1.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.industries.number_tint),
       subgroup = "blocks-logistic",
       order = "a",
       stack_size = angelsmods.industries.block_stack_size,
@@ -467,18 +403,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-logistic-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-logistic-2.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-logistic-2.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.industries.number_tint),
       subgroup = "blocks-logistic",
       order = "b",
       stack_size = angelsmods.industries.block_stack_size,
@@ -486,18 +418,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-logistic-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-logistic-3.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-logistic-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-logistic",
       order = "c",
       stack_size = angelsmods.industries.block_stack_size,
@@ -505,18 +433,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-logistic-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-logistic-4.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-logistic-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-logistic",
       order = "d",
       stack_size = angelsmods.industries.block_stack_size,
@@ -524,18 +448,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-logistic-5",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-logistic-5.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-logistic-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_5.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-logistic",
       order = "e",
       stack_size = angelsmods.industries.block_stack_size,
@@ -546,18 +466,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-production-1",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-production-1.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-production-1.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.industries.number_tint),
       subgroup = "blocks-production",
       order = "a",
       stack_size = angelsmods.industries.block_stack_size,
@@ -565,18 +481,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-production-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-production-2.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-production-2.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.industries.number_tint),
       subgroup = "blocks-production",
       order = "b",
       stack_size = angelsmods.industries.block_stack_size,
@@ -584,18 +496,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-production-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-production-3.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-production-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-production",
       order = "c",
       stack_size = angelsmods.industries.block_stack_size,
@@ -603,18 +511,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-production-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-production-4.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-production-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-production",
       order = "d",
       stack_size = angelsmods.industries.block_stack_size,
@@ -622,18 +526,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-production-5",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-production-5.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-production-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_5.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-production",
       order = "e",
       stack_size = angelsmods.industries.block_stack_size,
@@ -644,8 +544,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-extraction-3",
-      icon = "__angelsindustries__/graphics/icons/block-extraction-3.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-extraction-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "c",
       stack_size = angelsmods.industries.block_stack_size,
@@ -653,8 +559,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-extraction-4",
-      icon = "__angelsindustries__/graphics/icons/block-extraction-4.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-extraction-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "d",
       stack_size = angelsmods.industries.block_stack_size,
@@ -662,8 +574,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-extraction-5",
-      icon = "__angelsindustries__/graphics/icons/block-extraction-5.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-extraction-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "e",
       stack_size = angelsmods.industries.block_stack_size,
@@ -674,8 +592,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-mprocessing-3",
-      icon = "__angelsindustries__/graphics/icons/block-mprocessing-3.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-mprocessing-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "f",
       stack_size = angelsmods.industries.block_stack_size,
@@ -683,8 +607,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-mprocessing-4",
-      icon = "__angelsindustries__/graphics/icons/block-mprocessing-4.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-mprocessing-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "g",
       stack_size = angelsmods.industries.block_stack_size,
@@ -692,8 +622,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-mprocessing-5",
-      icon = "__angelsindustries__/graphics/icons/block-mprocessing-5.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-mprocessing-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "h",
       stack_size = angelsmods.industries.block_stack_size,
@@ -704,8 +640,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-cprocessing-3",
-      icon = "__angelsindustries__/graphics/icons/block-cprocessing-3.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-cprocessing-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "i",
       stack_size = angelsmods.industries.block_stack_size,
@@ -713,8 +655,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-cprocessing-4",
-      icon = "__angelsindustries__/graphics/icons/block-cprocessing-4.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-cprocessing-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "j",
       stack_size = angelsmods.industries.block_stack_size,
@@ -722,8 +670,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-cprocessing-5",
-      icon = "__angelsindustries__/graphics/icons/block-cprocessing-5.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-cprocessing-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "k",
       stack_size = angelsmods.industries.block_stack_size,
@@ -734,8 +688,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-bprocessing-3",
-      icon = "__angelsindustries__/graphics/icons/block-bprocessing-3.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-bprocessing-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "l",
       stack_size = angelsmods.industries.block_stack_size,
@@ -743,8 +703,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-bprocessing-4",
-      icon = "__angelsindustries__/graphics/icons/block-bprocessing-4.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-bprocessing-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "m",
       stack_size = angelsmods.industries.block_stack_size,
@@ -752,8 +718,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-bprocessing-5",
-      icon = "__angelsindustries__/graphics/icons/block-bprocessing-5.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsindustries__/graphics/icons/block-bprocessing-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
+        },
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-processing",
       order = "n",
       stack_size = angelsmods.industries.block_stack_size,
@@ -764,18 +736,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-warfare-1",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-warfare-1.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-warfare-1.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.industries.number_tint),
       subgroup = "blocks-warfare",
       order = "a",
       stack_size = angelsmods.industries.block_stack_size,
@@ -783,18 +751,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-warfare-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-warfare-2.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-warfare-2.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.industries.number_tint),
       subgroup = "blocks-warfare",
       order = "b",
       stack_size = angelsmods.industries.block_stack_size,
@@ -802,18 +766,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-warfare-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-warfare-3.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-warfare-3.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.industries.number_tint),
       subgroup = "blocks-warfare",
       order = "c",
       stack_size = angelsmods.industries.block_stack_size,
@@ -821,18 +781,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-warfare-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-warfare-4.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-warfare-4.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.industries.number_tint),
       subgroup = "blocks-warfare",
       order = "d",
       stack_size = angelsmods.industries.block_stack_size,
@@ -840,18 +796,14 @@ if angelsmods.industries.components then
     {
       type = "item",
       name = "block-warfare-5",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsindustries__/graphics/icons/block-warfare-5.png",
+          {
+            icon = "__angelsindustries__/graphics/icons/block-warfare-5.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_5.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
-      icon_size = 32,
+        5, angelsmods.industries.number_tint),
       subgroup = "blocks-warfare",
       order = "e",
       stack_size = angelsmods.industries.block_stack_size,
diff --git a/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-other-entities-update.lua b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-other-entities-update.lua
index dac991113..e33fe3e40 100644
--- a/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-other-entities-update.lua
+++ b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-other-entities-update.lua
@@ -1,7 +1,8 @@
 if angelsmods.industries.components then
   local OV = angelsmods.functions.OV
   -- CUSTOM FIXES FOR BASE GAME ENTITIES THAT DO NOT FIT IN OTHER CATEGORIES (+ ANGELS)
-
+  OV.remove_prereq("water-treatment", "angels-fluid-control")
+  
   OV.patch_recipes(
     {
       {
@@ -54,7 +55,18 @@ if angelsmods.industries.components then
               {"block-electronics-0", "block-electronics-1"}
             }
           }
-        }
+        },
+        {
+          name = "lab",
+          ingredients = {
+            {"block-electronics-0", "block-electronics-1"}
+          },
+          minable = {
+            results = {
+              {"block-electronics-0", "block-electronics-1"}
+            }
+          }
+        },
       }
     )
   end
diff --git a/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-robots-update.lua b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-robots-update.lua
index 67c5706fc..531ed8735 100644
--- a/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-robots-update.lua
+++ b/angelsindustries/prototypes/overrides/components-base-entity-update/components-base-robots-update.lua
@@ -213,5 +213,7 @@ if angelsmods.industries.components then
   --OV.remove_science_pack("cargo-robots-3", "chemical-science-pack")
 
   OV.add_prereq("angels-construction-robots-3", "tech-blue-circuit")
-
+  
+  OV.add_prereq("logistic-robotics","cargo-robots-2")
+  OV.add_prereq("construction-robotics","angels-construction-robots")
 end
\ No newline at end of file
diff --git a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua
index 78c12b8d0..33e1eeed7 100644
--- a/angelsindustries/prototypes/overrides/components-base-recipe-update.lua
+++ b/angelsindustries/prototypes/overrides/components-base-recipe-update.lua
@@ -10,11 +10,12 @@ if angelsmods.industries.components then
   replace_recipe_ing("accumulator","battery-1","battery-2")
   OV.remove_prereq("electric-energy-accumulators", "battery")
   OV.add_prereq("electric-energy-accumulators", "angels-components-batteries-2")
-
-  replace_recipe_ing("flying-robot-frame","battery","battery-4")
-  OV.remove_prereq("robotics", "battery")
-  OV.add_prereq("robotics", "angels-components-batteries-4")
-
+--do i want to leave this for bobs bots?
+  --if (not mods["boblogistics"]) then --if i want to actually move it to battery-2
+    replace_recipe_ing("flying-robot-frame","battery","battery-4")
+    OV.remove_prereq("robotics", "battery")
+    OV.add_prereq("robotics", "angels-components-batteries-4")
+  --end
   replace_recipe_ing("battery-equipment","battery-1","battery-3")
   OV.remove_prereq("battery-equipment", "battery")
   OV.add_prereq("battery-equipment", "angels-components-batteries-3")
@@ -73,7 +74,6 @@ if angelsmods.industries.components then
   if mods["bobmodules"] then
     -- bob modules have their own overhaul
   else
-    log(serpent.block(data.raw.recipe["speed-module"]))
     OV.patch_recipes(
       {
         {
diff --git a/angelsindustries/prototypes/overrides/components-block-update.lua b/angelsindustries/prototypes/overrides/components-block-update.lua
index 553dc9bbb..2c494d02d 100644
--- a/angelsindustries/prototypes/overrides/components-block-update.lua
+++ b/angelsindustries/prototypes/overrides/components-block-update.lua
@@ -28,48 +28,6 @@ if angelsmods.industries.components then
   OV.remove_prereq("angels-steel-smelting-1", "angels-metallurgy-2")
   OV.add_prereq("angels-steel-smelting-1", "angels-metallurgy-1")
 
-  -- split advanced glass smelting 1 in two seperate techs for battery 2
-  data:extend(
-    {
-      {
-        type = "technology",
-        name = "angels-glass-melting",
-        icon = "__angelssmelting__/graphics/technology/glass-tech.png",
-        icon_size = 256, icon_mipmaps = 4,
-        prerequisites = {
-          "ore-crushing",
-          "powder-metallurgy-1"
-        },
-        effects = {
-          {
-            type = "unlock-recipe",
-            recipe = "glass-mixture-1"
-          },
-          {
-            type = "unlock-recipe",
-            recipe = "molten-glass-smelting"
-          }
-        },
-        unit = {
-          count = 100,
-          ingredients = {
-            {type = "item", name = "automation-science-pack", amount = 1}
-          },
-          time = 30
-        },
-        order = "c-a"
-      }
-    }
-  )
-  OV.add_prereq("angels-glass-smelting-1", "angels-glass-melting")
-  OV.remove_prereq("angels-glass-smelting-1", "ore-crushing")
-  OV.remove_prereq("angels-glass-smelting-1", "powder-metallurgy-1")
-  OV.remove_unlock("angels-glass-smelting-1", "glass-mixture-1")
-  OV.remove_unlock("angels-glass-smelting-1", "molten-glass-smelting")
-  -- update depending technologies accordingly
-  OV.remove_prereq("angels-components-batteries-2", "angels-glass-smelting-1")
-  OV.add_prereq("angels-components-batteries-2", "angels-glass-melting")
-
   -----------------------------------------------------------------------------
   -- ADD ELECTRONIC RECIPES TO ELECTRONIC ASSMBLY -----------------------------
   -----------------------------------------------------------------------------
diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua
index ba6090168..0c9571ae5 100644
--- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua
+++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-inserters-update.lua
@@ -14,7 +14,8 @@ if angelsmods.industries.components then
               {"!!"},
               {type = "item", name = "inserter", amount = 1},
               {type = "item", name = "circuit-grey", amount = 2},
-              angelsmods.trigger.smelting_products["tin"].plate and {type = "item", name = "tin-plate", amount = 2} or nil
+              angelsmods.trigger.smelting_products["tin"].plate and
+                {type = "item", name = "angels-plate-tin", amount = 2} or nil
             }
           },
           {
@@ -109,7 +110,8 @@ if angelsmods.industries.components then
               {type = "item", name = "circuit-orange-loaded", amount = 1},
               {type = "item", name = "angels-servo-motor-3", amount = 2},
               {type = "item", name = "angels-plating", amount = 2},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 1} or nil
             }
           },
           {
@@ -120,7 +122,8 @@ if angelsmods.industries.components then
               {type = "item", name = "circuit-orange-loaded", amount = 2},
               {type = "item", name = "angels-servo-motor-3", amount = 1},
               {type = "item", name = "angels-plating", amount = 4},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 1} or nil
             }
           },
           {
@@ -131,7 +134,8 @@ if angelsmods.industries.components then
               {type = "item", name = "circuit-blue-loaded", amount = 2},
               {type = "item", name = "angels-servo-motor-4", amount = 3},
               {type = "item", name = "angels-plating", amount = 8},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 1} or nil
             }
           },
           {
@@ -142,7 +146,8 @@ if angelsmods.industries.components then
               {type = "item", name = "circuit-blue-loaded", amount = 3},
               {type = "item", name = "angels-servo-motor-4", amount = 2},
               {type = "item", name = "angels-plating", amount = 10},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 1} or nil
             }
           },
           {
@@ -153,7 +158,8 @@ if angelsmods.industries.components then
               {type = "item", name = "circuit-blue-loaded", amount = 1},
               {type = "item", name = "angels-servo-motor-4", amount = 2},
               {type = "item", name = "angels-strut", amount = 2},
-              data.raw.item["nitinol-bearing"] and {type = "item", name = "nitinol-bearing", amount = 1} or nil
+              data.raw.item["nitinol-bearing"] and
+                {type = "item", name = "nitinol-bearing", amount = 1} or nil
             }
           },
           {
@@ -164,7 +170,8 @@ if angelsmods.industries.components then
               {type = "item", name = "circuit-blue-loaded", amount = 2},
               {type = "item", name = "angels-servo-motor-4", amount = 1},
               {type = "item", name = "angels-strut", amount = 4},
-              data.raw.item["nitinol-bearing"] and {type = "item", name = "nitinol-bearing", amount = 1} or nil
+              data.raw.item["nitinol-bearing"] and
+                {type = "item", name = "nitinol-bearing", amount = 1} or nil
             }
           },
           {
@@ -175,7 +182,8 @@ if angelsmods.industries.components then
               {type = "item", name = "circuit-yellow-loaded", amount = 2},
               {type = "item", name = "angels-servo-motor-5", amount = 3},
               {type = "item", name = "angels-strut", amount = 8},
-              data.raw.item["nitinol-bearing"] and {type = "item", name = "nitinol-bearing", amount = 1} or nil
+              data.raw.item["nitinol-bearing"] and
+                {type = "item", name = "nitinol-bearing", amount = 1} or nil
             }
           },
           {
@@ -186,7 +194,8 @@ if angelsmods.industries.components then
               {type = "item", name = "circuit-yellow-loaded", amount = 3},
               {type = "item", name = "angels-servo-motor-5", amount = 2},
               {type = "item", name = "angels-strut", amount = 10},
-              data.raw.item["nitinol-bearing"] and {type = "item", name = "nitinol-bearing", amount = 1} or nil
+              data.raw.item["nitinol-bearing"] and
+                {type = "item", name = "nitinol-bearing", amount = 1} or nil
             }
           }
         }
@@ -228,8 +237,10 @@ if angelsmods.industries.components then
               {type = "item", name = "fast-inserter", amount = 1},
               {type = "item", name = "circuit-orange-loaded", amount = 2},
               {type = "item", name = "angels-servo-motor-3", amount = 2},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 6} or nil,
-              data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 6} or nil,
+              data.raw.item["titanium-gear-wheel"] and
+                {type = "item", name = "angels-spring", amount = 1} or nil
             }
           },
           {
@@ -239,8 +250,10 @@ if angelsmods.industries.components then
               {type = "item", name = "stack-inserter", amount = 1},
               {type = "item", name = "circuit-orange-loaded", amount = 2},
               {type = "item", name = "angels-servo-motor-3", amount = 2},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 6} or nil,
-              data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 6} or nil,
+              data.raw.item["titanium-gear-wheel"] and
+                {type = "item", name = "angels-spring", amount = 1} or nil
             }
           },
           {
@@ -250,8 +263,10 @@ if angelsmods.industries.components then
               {type = "item", name = "fast-inserter", amount = 1},
               {type = "item", name = "circuit-blue-loaded", amount = 1},
               {type = "item", name = "angels-servo-motor-4", amount = 2},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil,
-              data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 1} or nil,
+              data.raw.item["titanium-gear-wheel"] and
+                {type = "item", name = "angels-spring", amount = 1} or nil
             }
           },
           {
@@ -261,8 +276,10 @@ if angelsmods.industries.components then
               {type = "item", name = "filter-inserter", amount = 1},
               {type = "item", name = "circuit-blue-loaded", amount = 1},
               {type = "item", name = "angels-servo-motor-4", amount = 2},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 1} or nil,
-              data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 1} or nil,
+              data.raw.item["titanium-gear-wheel"] and
+                {type = "item", name = "angels-spring", amount = 1} or nil
             }
           },
           {
@@ -272,8 +289,10 @@ if angelsmods.industries.components then
               {type = "item", name = "stack-inserter", amount = 1},
               {type = "item", name = "circuit-yellow-loaded", amount = 2},
               {type = "item", name = "angels-servo-motor-5", amount = 2},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 6} or nil,
-              data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 6} or nil,
+              data.raw.item["titanium-gear-wheel"] and
+                {type = "item", name = "angels-spring", amount = 1} or nil
             }
           },
           {
@@ -283,8 +302,10 @@ if angelsmods.industries.components then
               {type = "item", name = "stack-filter-inserter", amount = 1},
               {type = "item", name = "circuit-yellow-loaded", amount = 2},
               {type = "item", name = "angels-servo-motor-5", amount = 2},
-              data.raw.item["titanium-bearing"] and {type = "item", name = "titanium-bearing", amount = 6} or nil,
-              data.raw.item["titanium-gear-wheel"] and {type = "item", name = "titanium-gear-wheel", amount = 1} or nil
+              data.raw.item["titanium-bearing"] and
+                {type = "item", name = "titanium-bearing", amount = 6} or nil,
+              data.raw.item["titanium-gear-wheel"] and
+                {type = "item", name = "angels-spring", amount = 1} or nil
             }
           }
         }
diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua
new file mode 100644
index 000000000..e8546402f
--- /dev/null
+++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-robots-update.lua
@@ -0,0 +1,149 @@
+if angelsmods.industries.components then
+  local OV = angelsmods.functions.OV
+
+  if mods["boblogistics"] and settings.startup["bobmods-logistics-flyingrobotframes"].value == true then
+    -- flying robot frames
+    OV.patch_recipes(
+      {
+        {
+          name = "flying-robot-frame",
+          ingredients =
+          {
+            { "!!" },
+            { type = "item", name = "circuit-orange-loaded", amount = 3 },
+            { type = "item", name = "motor-3", amount = 1 },
+            { type = "item", name = "construction-frame-3", amount = 1 },
+            { type = "item", name = "battery-2", amount = 2 }
+          },
+        },
+        {
+          name = "flying-robot-frame-2",
+          ingredients =
+          {
+            { "!!" },
+            { type = "item", name = "circuit-blue-loaded", amount = 3 },
+            { type = "item", name = "motor-4", amount = 1 },
+            { type = "item", name = "construction-frame-4", amount = 1 },
+            { type = "item", name = "battery-3", amount = 2 }
+          },
+        },
+        {
+          name = "flying-robot-frame-3",
+          ingredients =
+          {
+            { "!!" },
+            { type = "item", name = "circuit-blue-loaded", amount = 3 },
+            { type = "item", name = "motor-4", amount = 1 },
+            { type = "item", name = "construction-frame-4", amount = 1 },
+            { type = "item", name = "battery-4", amount = 2 }
+          },
+        },
+        {
+          name = "flying-robot-frame-4",
+          ingredients =
+          {
+            { "!!" },
+            { type = "item", name = "circuit-yellow-loaded", amount = 3 },
+            { type = "item", name = "motor-5", amount = 1 },
+            { type = "item", name = "construction-frame-5", amount = 1 },
+            mods["bobplates"] and
+              { type = "item", name = "battery-6", amount = 2 } or
+              { type = "item", name = "battery-5", amount = 3 }
+          }
+        }
+      }
+    )
+    -- base game late robots
+    OV.patch_recipes(
+      {
+        {
+          name = "construction-robot",
+          ingredients = {
+            {type = "item", name = "robot-brain-construction", amount = 1},
+            {type = "item", name = "robot-tool-construction", amount = 1}
+          }
+        },
+        {
+          name = "logistic-robot",
+          ingredients = {
+            {type = "item", name = "robot-brain-logistic", amount = 1},
+            {type = "item", name = "robot-tool-logistic", amount = 1}
+          }
+        }
+      }
+    )
+  end
+  
+  OV.remove_prereq("robotics", "angels-components-batteries-4")
+  OV.remove_prereq("robotics", "electric-engine")
+  OV.add_prereq("robotics", "angels-components-mechanical-3")
+  OV.add_prereq("robotics", "tech-orange-circuit")
+
+  OV.add_prereq("bob-robotics-2", "angels-components-mechanical-4")
+  OV.add_prereq("bob-robotics-2", "tech-blue-circuit")
+
+  OV.remove_prereq("bob-robotics-3", "titanium-processing")
+  OV.remove_prereq("bob-robotics-3", "advanced-electronics-2")
+  OV.remove_prereq("bob-robotics-3", "battery-2")
+  OV.add_prereq("bob-robotics-3", "angels-components-batteries-4")
+  OV.add_prereq("bob-robotics-3", "angels-components-mechanical-4")
+  OV.add_prereq("bob-robotics-3", "tech-blue-circuit")
+  
+  OV.remove_prereq("bob-robotics-4", "ceramics")
+  OV.remove_prereq("bob-robotics-4", "battery-3")
+  if data.raw.technology["angels-components-batteries-6"] then
+    OV.add_prereq("bob-robotics-4", "angels-components-batteries-6")
+  end
+  OV.add_prereq("bob-robotics-4", "angels-components-mechanical-5")
+  OV.add_prereq("bob-robotics-4", "tech-yellow-circuit")
+
+  -- charging pads
+  OV.patch_recipes(
+    {
+      {
+        name = "roboport-chargepad-1",
+        ingredients =
+        {
+          { "!!" },
+          { type = "item", name = "circuit-orange-loaded", amount = 5 },
+          { type = "item", name = "cable-harness-3", amount = 2 },
+          { type = "item", name = "battery-2", amount = 2 }
+        },
+      },
+      {
+        name = "roboport-chargepad-2",
+        ingredients =
+        {
+          { "!!" },
+          { type = "item", name = "circuit-blue-loaded", amount = 5 },
+          { type = "item", name = "cable-harness-4", amount = 2 },
+          { type = "item", name = "battery-3", amount = 2 }
+        },
+      },
+      {
+        name = "roboport-chargepad-3",
+        ingredients =
+        {
+          { "!!" },
+          { type = "item", name = "circuit-blue-loaded", amount = 5 },
+          { type = "item", name = "cable-harness-4", amount = 2 },
+          { type = "item", name = "battery-4", amount = 2 }
+        },
+      },
+      {
+        name = "roboport-chargepad-4",
+        ingredients =
+        {
+          { "!!" },
+          { type = "item", name = "circuit-yellow-loaded", amount = 5 },
+          { type = "item", name = "cable-harness-5", amount = 2 },
+          { type = "item", name = "battery-5", amount = 2 }
+        },
+      },
+    }
+  )
+
+  OV.remove_prereq("bob-robo-modular-2", "bob-robotics-2")
+  OV.remove_prereq("bob-robo-modular-3", "bob-robotics-3")
+  OV.remove_prereq("bob-robo-modular-4", "bob-robotics-4")
+end
\ No newline at end of file
diff --git a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-trains-update.lua b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-trains-update.lua
index 6f82b9e5e..785615fef 100644
--- a/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-trains-update.lua
+++ b/angelsindustries/prototypes/overrides/components-bobs-entity-update/components-bobs-trains-update.lua
@@ -8,7 +8,6 @@ if angelsmods.industries.components then
       return {
         name = recipe_name,
         ingredients = ingredients_list,
-        minable = { results = ingredients_list }
       }
     end
     OV.patch_recipes(
@@ -16,22 +15,22 @@ if angelsmods.industries.components then
         swap_ingredients("bob-locomotive-2", {
           {"circuit-green-loaded", "circuit-orange-loaded"},
           {"motor-2", "angels-gear"},
-          {"bob-locomotive-2", 0}
+          {"locomotive", 1}
         }),
         swap_ingredients("bob-locomotive-3", {
           {"motor-4", "angels-spring"},
-          {"bob-locomotive-3", 0}
+          {"bob-locomotive-2", 1}
         }),
         swap_ingredients("bob-armoured-locomotive", {
           {"circuit-orange-loaded", 5},
           {"motor-3", 20},
           {"mechanical-parts", 30},
-          {"bob-armoured-locomotive", 0}
+          {"locomotive", 1}
         }),
         swap_ingredients("bob-armoured-locomotive-2", {
           {"circuit-yellow-loaded", "circuit-blue-loaded"},
           {"motor-5", "angels-spring"},
-          {"bob-armoured-locomotive-2", 0}
+          {"bob-armoured-locomotive", 1}
         }),
         swap_ingredients("bob-cargo-wagon-2", {
           {"!!"},
@@ -39,7 +38,8 @@ if angelsmods.industries.components then
           {"angels-servo-motor-2", 15},
           {"circuit-green-loaded", 5},
           {"mechanical-parts", 5},
-          {"brass-chest", 1},
+          data.raw.item["brass-chest"] and {"brass-chest", 1} or {"steel-chest", 2},
+          {"cargo-wagon", 1}
         }),
         swap_ingredients("bob-cargo-wagon-3", {
           {"!!"},
@@ -47,7 +47,8 @@ if angelsmods.industries.components then
           {"angels-servo-motor-4", 15},
           {"circuit-blue-loaded", 5},
           {"mechanical-parts", 5},
-          {"titanium-chest", 1},
+          data.raw.item["titanium-chest"] and {"titanium-chest", 1} or {"steel-chest", 4},
+          {"bob-cargo-wagon-2", 1}
         }),
         swap_ingredients("bob-armoured-cargo-wagon", {
           {"!!"},
@@ -55,7 +56,8 @@ if angelsmods.industries.components then
           {"angels-servo-motor-3", 15},
           {"circuit-orange-loaded", 5},
           {"mechanical-parts", 5},
-          {"brass-chest", 1},
+          data.raw.item["brass-chest"] and {"brass-chest", 1} or {"steel-chest", 2},
+          {"cargo-wagon", 1}
         }),
         swap_ingredients("bob-armoured-cargo-wagon-2", {
           {"!!"},
@@ -63,7 +65,8 @@ if angelsmods.industries.components then
           {"angels-servo-motor-5", 15},
           {"circuit-yellow-loaded", 5},
           {"mechanical-parts", 5},
-          {"titanium-chest", 1},
+          data.raw.item["titanium-chest"] and {"titanium-chest", 1} or {"steel-chest", 4},
+          {"bob-armoured-cargo-wagon", 1}
         }),
         swap_ingredients("bob-fluid-wagon-2", {
           {"!!"},
@@ -72,6 +75,7 @@ if angelsmods.industries.components then
           {"circuit-green-loaded", 5},
           {"mechanical-parts", 5},
           {"storage-tank-2", 1},
+          {"fluid-wagon", 1}
         }),
         swap_ingredients("bob-fluid-wagon-3", {
           {"!!"},
@@ -80,6 +84,7 @@ if angelsmods.industries.components then
           {"circuit-blue-loaded", 5},
           {"mechanical-parts", 5},
           {"storage-tank-4", 1},
+          {"bob-fluid-wagon-2", 1}
         }),
         swap_ingredients("bob-armoured-fluid-wagon", {
           {"!!"},
@@ -88,6 +93,7 @@ if angelsmods.industries.components then
           {"circuit-orange-loaded", 5},
           {"mechanical-parts", 5},
           {"storage-tank-3", 1},
+          {"fluid-wagon", 1}
         }),
         swap_ingredients("bob-armoured-fluid-wagon-2", {
           {"!!"},
@@ -96,6 +102,7 @@ if angelsmods.industries.components then
           {"circuit-yellow-loaded", 5},
           {"mechanical-parts", 5},
           {"bob-storage-tank-all-corners-4", 1},
+          {"bob-armoured-fluid-wagon", 1}
         })
       }
     )
diff --git a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua
index bd6e9c0d0..065c30b31 100644
--- a/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua
+++ b/angelsindustries/prototypes/overrides/components-bobs-recipe-update.lua
@@ -54,138 +54,7 @@ if angelsmods.industries.components then
   -----------------------------------------------------------------------------
   if mods["bobelectronics"] then
     OV.disable_recipe("wooden-board-paper")
-    OV.remove_prereq("water-treatment", "electronics")
   end
-
-  -----------------------------------------------------------------------------
-  -- BOB LOGISTICS ------------------------------------------------------------
-  -----------------------------------------------------------------------------
-  if mods["boblogistics"] then
-    if settings.startup["bobmods-logistics-flyingrobotframes"].value == true then
-      -- flying robot frames
-      OV.patch_recipes(
-        {
-          {
-            name = "flying-robot-frame",
-            ingredients =
-            {
-              { "!!" },
-              { type = "item", name = "circuit-orange-loaded", amount = 3 },
-              { type = "item", name = "motor-3", amount = 1 },
-              { type = "item", name = "construction-frame-3", amount = 1 },
-              { type = "item", name = "battery-2", amount = 2 }
-            },
-          },
-          {
-            name = "flying-robot-frame-2",
-            ingredients =
-            {
-              { "!!" },
-              { type = "item", name = "circuit-blue-loaded", amount = 3 },
-              { type = "item", name = "motor-4", amount = 1 },
-              { type = "item", name = "construction-frame-4", amount = 1 },
-              { type = "item", name = "battery-3", amount = 2 }
-            },
-          },
-          {
-            name = "flying-robot-frame-3",
-            ingredients =
-            {
-              { "!!" },
-              { type = "item", name = "circuit-blue-loaded", amount = 3 },
-              { type = "item", name = "motor-4", amount = 1 },
-              { type = "item", name = "construction-frame-4", amount = 1 },
-              { type = "item", name = "battery-4", amount = 2 }
-            },
-          },
-          {
-            name = "flying-robot-frame-4",
-            ingredients =
-            {
-              { "!!" },
-              { type = "item", name = "circuit-yellow-loaded", amount = 3 },
-              { type = "item", name = "motor-5", amount = 1 },
-              { type = "item", name = "construction-frame-5", amount = 1 },
-              { type = "item", name = "battery-6", amount = 2 }
-            }
-          }
-        }
-      )
-
-      OV.remove_prereq("robotics", "angels-components-batteries-4")
-      OV.remove_prereq("robotics", "electric-engine")
-      OV.add_prereq("robotics", "angels-components-mechanical-3")
-      OV.add_prereq("robotics", "tech-orange-circuit")
-
-      OV.add_prereq("bob-robotics-2", "angels-components-mechanical-4")
-      OV.add_prereq("bob-robotics-2", "tech-blue-circuit")
-
-      OV.remove_prereq("bob-robotics-3", "titanium-processing")
-      OV.remove_prereq("bob-robotics-3", "advanced-electronics-2")
-      OV.remove_prereq("bob-robotics-3", "battery-2")
-      OV.add_prereq("bob-robotics-3", "angels-components-batteries-4")
-      OV.add_prereq("bob-robotics-3", "angels-components-mechanical-4")
-      OV.add_prereq("bob-robotics-3", "tech-blue-circuit")
-      
-      OV.remove_prereq("bob-robotics-4", "ceramics")
-      OV.remove_prereq("bob-robotics-4", "battery-3")
-      OV.add_prereq("bob-robotics-4", "angels-components-batteries-6")
-      OV.add_prereq("bob-robotics-4", "angels-components-mechanical-5")
-      OV.add_prereq("bob-robotics-4", "tech-yellow-circuit")
-    end
-
-    -- charging pads
-    OV.patch_recipes(
-      {
-        {
-          name = "roboport-chargepad-1",
-          ingredients =
-          {
-            { "!!" },
-            { type = "item", name = "circuit-orange-loaded", amount = 5 },
-            { type = "item", name = "cable-harness-3", amount = 2 },
-            { type = "item", name = "battery-2", amount = 2 }
-          },
-        },
-        {
-          name = "roboport-chargepad-2",
-          ingredients =
-          {
-            { "!!" },
-            { type = "item", name = "circuit-blue-loaded", amount = 5 },
-            { type = "item", name = "cable-harness-4", amount = 2 },
-            { type = "item", name = "battery-3", amount = 2 }
-          },
-        },
-        {
-          name = "roboport-chargepad-3",
-          ingredients =
-          {
-            { "!!" },
-            { type = "item", name = "circuit-blue-loaded", amount = 5 },
-            { type = "item", name = "cable-harness-4", amount = 2 },
-            { type = "item", name = "battery-4", amount = 2 }
-          },
-        },
-        {
-          name = "roboport-chargepad-4",
-          ingredients =
-          {
-            { "!!" },
-            { type = "item", name = "circuit-yellow-loaded", amount = 5 },
-            { type = "item", name = "cable-harness-5", amount = 2 },
-            { type = "item", name = "battery-5", amount = 2 }
-          },
-        },
-      }
-    )
-
-    OV.remove_prereq("bob-robo-modular-2", "bob-robotics-2")
-    OV.remove_prereq("bob-robo-modular-3", "bob-robotics-3")
-    OV.remove_prereq("bob-robo-modular-4", "bob-robotics-4")
-
-  end
-
   -----------------------------------------------------------------------------
   -- BOB REVAMP ---------------------------------------------------------------
   -----------------------------------------------------------------------------
diff --git a/angelsindustries/prototypes/overrides/components-entity-update.lua b/angelsindustries/prototypes/overrides/components-entity-update.lua
index cf9cf7c70..ad68b831d 100644
--- a/angelsindustries/prototypes/overrides/components-entity-update.lua
+++ b/angelsindustries/prototypes/overrides/components-entity-update.lua
@@ -23,5 +23,6 @@ OV.execute()
 require "prototypes.overrides.components-bobs-entity-update.components-bobs-assemblers-update"
 require "prototypes.overrides.components-bobs-entity-update.components-bobs-inserters-update"
 require "prototypes.overrides.components-bobs-entity-update.components-bobs-labs-update"
+require "prototypes.overrides.components-bobs-entity-update.components-bobs-robots-update"
 require "prototypes.overrides.components-bobs-entity-update.components-bobs-trains-update"
 OV.execute()
\ No newline at end of file
diff --git a/angelsindustries/prototypes/overrides/components-recipe-update.lua b/angelsindustries/prototypes/overrides/components-recipe-update.lua
index 9b9b50c78..ae3810b89 100644
--- a/angelsindustries/prototypes/overrides/components-recipe-update.lua
+++ b/angelsindustries/prototypes/overrides/components-recipe-update.lua
@@ -23,10 +23,6 @@ if angelsmods.industries.components then
   angelsmods.functions.add_flag("battery", "hidden")
   OV.disable_recipe({"battery"})
 
-  -- OV.global_replace_item("iron-stick", "angels-rod-iron")
-  -- angelsmods.functions.add_flag("iron-stick", "hidden")
-  -- OV.disable_recipe({"iron-stick"})
-
   OV.global_replace_item("iron-gear-wheel", "angels-gear")
   angelsmods.functions.add_flag("iron-gear-wheel", "hidden")
   OV.disable_recipe({"iron-gear-wheel"})
diff --git a/angelsindustries/prototypes/overrides/global-components-recipe.lua b/angelsindustries/prototypes/overrides/global-components-recipe.lua
index f082c19f2..d2a713d1f 100644
--- a/angelsindustries/prototypes/overrides/global-components-recipe.lua
+++ b/angelsindustries/prototypes/overrides/global-components-recipe.lua
@@ -12,7 +12,6 @@ if angelsmods.industries.components then
   -------------------------------------------------------------------------------
   -- INTERMEDIATES --------------------------------------------------------------
   -------------------------------------------------------------------------------
-  -- OV.global_replace_item("iron-stick", "angels-rod-iron")
   OV.global_replace_item("iron-gear-wheel", "angels-gear")
   OV.global_replace_item("engine-unit", "motor-2")
   OV.global_replace_technology("engine", "angels-components-mechanical-2")
diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua
index f7da1e4f3..0e28f4b29 100644
--- a/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua
+++ b/angelsindustries/prototypes/overrides/global-tech-bobs-cores.lua
@@ -122,6 +122,10 @@ if angelsmods.industries.tech then
     OV.remove_science_pack("speed-module", "angels-science-pack-orange")
     OV.remove_science_pack("effectivity-module", "angels-science-pack-orange")
     OV.remove_science_pack("productivity-module", "angels-science-pack-orange")
+    OV.remove_science_pack("speed-module-3", "angels-science-pack-yellow")
+    OV.remove_science_pack("effectivity-module-3", "angels-science-pack-yellow")
+    OV.remove_science_pack("productivity-module-3", "angels-science-pack-yellow")
+    OV.remove_science_pack("angels-bio-yield-module-3", "angels-science-pack-yellow")
   end
 
   -------------------------------------------------------------------------------
diff --git a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua
index cb1c35265..ec3dbf839 100644
--- a/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua
+++ b/angelsindustries/prototypes/overrides/global-tech-bobs-packs.lua
@@ -21,6 +21,9 @@ if angelsmods.industries.tech then
       pack_replace("alien-green-research", "yellow", "blue")
       pack_replace("alien-red-research", "yellow", "blue")
     end
+
+    pack_replace("tungsten-processing", "blue", "orange")
+    pack_replace("ceramics", "blue", "orange")
   end
 
   -------------------------------------------------------------------------------
@@ -241,11 +244,23 @@ if angelsmods.industries.tech then
       pack_replace("bob-electric-energy-accumulators-2", "green", "orange")
     end
     if settings.startup["bobmods-power-fluidgenerator"].value == true then
-      pack_replace("fluid-generator-1", "red", "orange")
+      pack_replace("fluid-generator-3", "blue", "orange")
     end
     if settings.startup["bobmods-power-steam"].value == true then
-      pack_replace("bob-steam-engine-3", "green", "orange")
+      pack_replace("bob-steam-engine-4", "blue", "orange")
+      pack_replace("bob-boiler-4", "blue", "orange")
+      pack_replace("bob-oil-boiler-3", "blue", "orange")
       pack_replace("bob-steam-turbine-1", "green", "orange")
+      pack_replace("bob-heat-exchanger-2", "blue", "orange")
+    end
+    if settings.startup["bobmods-power-steam"].value == true or
+       settings.startup["bobmods-power-nuclear"].value == true or
+       settings.startup["bobmods-power-heatsources"].value == true then
+      pack_replace("bob-heat-pipe-2", "blue", "orange")
+    end
+    if settings.startup["bobmods-power-heatsources"].value == true then
+      pack_replace("burner-reactor-2", "blue", "orange")
+      pack_replace("fluid-reactor-2", "blue", "orange")
     end
   end
 
diff --git a/angelsindustries/prototypes/overrides/global-tech-data.lua b/angelsindustries/prototypes/overrides/global-tech-data.lua
index 2ec011546..53f40fc5f 100644
--- a/angelsindustries/prototypes/overrides/global-tech-data.lua
+++ b/angelsindustries/prototypes/overrides/global-tech-data.lua
@@ -55,7 +55,7 @@ if angelsmods.industries.tech then
     --removes enhancement core from module techs (not modules)
     for rec_4tech in pairs(data.raw.technology) do
       --fix modules to still work in bobs module lab
-      if string.find(rec_4tech,"-module-")~=nil  then
+      if string.find(rec_4tech,"%-module%-") ~= nil then
         angelsmods.functions.add_exception(rec_4tech)
       end
     end
@@ -101,4 +101,4 @@ if angelsmods.industries.tech then
       angelsmods.functions.add_exception(ignore)
     end
   end
-end
\ No newline at end of file
+end
diff --git a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua
index e4997b8b3..c176de31d 100644
--- a/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua
+++ b/angelsindustries/prototypes/overrides/overhaul-nuclear-power.lua
@@ -31,18 +31,9 @@ if angelsmods.industries.overhaul then
         ingredients = {
           {type = "item", name = "uranium-235", amount = 15} --halve
         },
-        icons = {
-          {icon = "__base__/graphics/icons/atomic-bomb.png", icon_size = 64, icon_mipmaps = 4},
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.industries.number_tint,
-            scale = 0.32,
-            icon_size = 32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32,
-        icon = nil
+        icons = angelsmods.functions.add_number_icon_layer(
+          angelsmods.functions.get_object_icons("atomic-bomb"),
+          1, angelsmods.industries.number_tint)
       },
       {
         name = "uranium-fuel-cell",
@@ -105,9 +96,10 @@ if angelsmods.industries.overhaul then
       }
     }
   )
-  OV.remove_unlock("kovarex-enrichment-process", "kovarex-enrichment-process")
+  OV.disable_recipe("kovarex-enrichment-process")
   OV.add_unlock("nuclear-power", "angels-uranium-fuel-cell")
   data.raw.item["uranium-fuel-cell"].fuel_value = "2GJ"
+  data.raw.technology["kovarex-enrichment-process"].unit.count = 10 --down from 1500 (Considering empty)
 
   -------------------------------------------------------------------------------
   -- Productivity
@@ -158,7 +150,7 @@ if angelsmods.industries.overhaul then
     -- plutonium enrichment process
     if mods["bobrevamp"] and settings.startup["bobmods-revamp-rtg"].value then
       OV.add_prereq("bobingabout-enrichment-process", "angels-plutonium-power")
-      OV.patch_recipes({{name="bobingabout-enrichment-process", subgroup="angels-power-nuclear-processing", order="b[AMOX]-c[duplication]"}})
+      OV.patch_recipes({{name = "bobingabout-enrichment-process", subgroup = "angels-power-nuclear-processing", order="b[AMOX]-c[duplication]"}})
     else
       --if not rtg, remove bobingabout process
       OV.remove_unlock("bobingabout-enrichment-process", "bobingabout-enrichment-process")
@@ -169,30 +161,32 @@ if angelsmods.industries.overhaul then
     angelsmods.functions.add_flag("plutonium-fuel-cell", "hide-from-fuel-tooltip")
 
     -- thorium processing
-    OV.remove_unlock("thorium-processing", "thorium-processing")
+    OV.disable_recipe("thorium-processing")
     OV.global_replace_technology("thorium-processing", "angels-thorium-power")
     OV.disable_technology("thorium-processing")
     angelsmods.functions.add_flag("thorium-fuel-cell", "hidden")
     angelsmods.functions.add_flag("thorium-fuel-cell", "hide-from-fuel-tooltip")
 
-    OV.remove_unlock("thorium-fuel-reprocessing", "thorium-fuel-reprocessing")
+    OV.disable_recipe("thorium-fuel-reprocessing")
     OV.disable_technology("thorium-fuel-reprocessing")
     angelsmods.functions.add_flag("used-up-thorium-fuel-cell", "hidden")
 
-    OV.remove_unlock("thorium-plutonium-fuel-cell", "thorium-plutonium-fuel-cell")
+    OV.disable_recipe("thorium-plutonium-fuel-cell")
     OV.disable_technology("thorium-plutonium-fuel-cell")
     angelsmods.functions.add_flag("thorium-plutonium-fuel-cell", "hidden")
     angelsmods.functions.add_flag("thorium-plutonium-fuel-cell", "hide-from-fuel-tooltip")
 
     -- deuterium processing
-    OV.remove_unlock("water-chemistry-2", "deuterium-fuel-cell")
+    OV.disable_recipe({"deuterium-fuel-cell","deuterium-fuel-cell-2"})
     angelsmods.functions.add_flag("deuterium-fuel-cell", "hidden")
     angelsmods.functions.add_flag("deuterium-fuel-cell", "hide-from-fuel-tooltip")
+    angelsmods.functions.add_flag("deuterium-fuel-cell-2", "hidden")
+    angelsmods.functions.add_flag("deuterium-fuel-cell-2", "hide-from-fuel-tooltip")
 
     OV.global_replace_item("fusion-catalyst", "angels-muon-fusion-catalyst")
     angelsmods.functions.add_flag("fusion-catalyst", "hidden")
 
-    OV.remove_unlock("deuterium-fuel-reprocessing", "deuterium-fuel-reprocessing")
+    OV.disable_recipe("deuterium-fuel-reprocessing")
     OV.global_replace_technology("deuterium-fuel-reprocessing", "angels-fusion-power-1")
     OV.global_replace_technology("deuterium-fuel-cell-2", "angels-fusion-power-2")
     OV.disable_technology("deuterium-fuel-reprocessing", "deuterium-fuel-cell-2")
@@ -202,27 +196,29 @@ if angelsmods.industries.overhaul then
     if bobmods.revamp and settings.startup["bobmods-revamp-nuclear"].value then
       --if overhaul, remove unlocks in each reactor tech
       --add each cell to each reactor... or would it be quicker to just set the setting?
-      OV.remove_unlock("plutonium-fuel-cell", "plutonium-fuel-cell") --keep as "uranium tier"
+      OV.disable_recipe("plutonium-fuel-cell") --keep as "uranium tier"
       OV.global_replace_technology("plutonium-fuel-cell", "angels-plutonium-power")
       OV.disable_technology("plutonium-fuel-cell")
 
-      if data.raw.item["thorium-fuel-cell"] and data.raw.reactor["nuclear-reactor-2"] then
-        OV.remove_unlock("bob-nuclear-power-2", "thorium-fuel-cell")
-        data.raw.item["angels-thorium-fuel-cell"].fuel_category = "thorium"
-        OV.add_prereq("bob-nuclear-power-2", "angels-thorium-power")
+      if data.raw.item["thorium-fuel-cell"] then
+        OV.disable_recipe("thorium-fuel-cell")
+        if data.raw.reactor["nuclear-reactor-2"] then
+          data.raw.item["angels-thorium-fuel-cell"].fuel_category = "thorium"
+          OV.add_prereq("bob-nuclear-power-2", "angels-thorium-power")
+        end
       end
 
-      if data.raw.item["deuterium-fuel-cell"] and data.raw.reactor["nuclear-reactor-3"] then
-        OV.remove_unlock("bob-nuclear-power-3", "deuterium-fuel-cell")
-        data.raw.item["angels-deuterium-fuel-cell"].fuel_category = "deuterium"
-        OV.add_prereq("bob-nuclear-power-3", "angels-fusion-power-1")
+      if data.raw.item["deuterium-fuel-cell"] then
+        OV.disable_recipe("deuterium-fuel-cell")
+        if data.raw.reactor["nuclear-reactor-3"] then
+          data.raw.item["angels-deuterium-fuel-cell"].fuel_category = "deuterium"
+          OV.add_prereq("bob-nuclear-power-3", "angels-fusion-power-1")
+        end
       end
     else --remove them from their individual techs
-      OV.remove_unlock("plutonium-fuel-cell", "plutonium-fuel-cell")
+      OV.disable_recipe({"plutonium-fuel-cell", "thorium-processing"})
       OV.global_replace_technology("plutonium-fuel-cell", "angels-plutonium-power")
       OV.disable_technology("plutonium-fuel-cell")
-
-      OV.remove_unlock("thorium-processing", "thorium-fuel-cell")
     end
   end
 
diff --git a/angelsindustries/prototypes/overrides/replacement-fallbacks.lua b/angelsindustries/prototypes/overrides/replacement-fallbacks.lua
index 853891355..299e255df 100644
--- a/angelsindustries/prototypes/overrides/replacement-fallbacks.lua
+++ b/angelsindustries/prototypes/overrides/replacement-fallbacks.lua
@@ -92,7 +92,6 @@ angelsmods.industries.general_replace={
   ["titanium-gear-wheel"]={new="angels-spring",amt_multi=1,unlocked_by="titanium-processing"},
   ["tungsten-gear-wheel"]={new="angels-bearing",amt_multi=1,unlocked_by="tungsten-processing"},
   --intermediates (vanilla)
-  --["iron-stick"]={new="angels-rod-iron",amt_multi=1} --not sure if the right spot for this
   ["engine-unit"]={new="motor-2",amt_multi=1,unlocked_by="engine"},
   ["electric-engine-unit"]={new="motor-4",amt_multi=1,unlocked_by="electric-engine"},
   ["battery"]={new="battery-1",amt_multi=1}
diff --git a/angelsindustries/prototypes/overrides/tech-mod-update.lua b/angelsindustries/prototypes/overrides/tech-mod-update.lua
index 7a17e0fef..67c624d9a 100644
--- a/angelsindustries/prototypes/overrides/tech-mod-update.lua
+++ b/angelsindustries/prototypes/overrides/tech-mod-update.lua
@@ -1,11 +1,14 @@
 -- File to add fixes for certain mods
 local OV = angelsmods.functions.OV
+
 if angelsmods.industries.tech then
   if mods["bobtech"] then
     if settings.startup["bobmods-burnerphase"].value then
     -- gets re-enabled as an unlock
       OV.disable_recipe("lab")
       OV.disable_technology("lab")
+      OV.global_replace_item("lab", "angels-basic-lab-2")
+      angelsmods.functions.add_flag("lab", "hide-from-bonus-gui")
 
     -- Allow steam science in basic lab
       local lab = data.raw.lab["angels-basic-lab"]
@@ -24,5 +27,4 @@ if angelsmods.industries.tech then
   data.raw.technology["space-science-pack"].icon_size = 128
   OV.add_unlock("space-science-pack", "angels-science-pack-white")
   OV.add_unlock("space-science-pack", "angels-main-lab-7")
-  OV.global_replace_item("lab", "angels-basic-lab-2")
 end
\ No newline at end of file
diff --git a/angelsindustries/prototypes/recipes/components-construction-recipes.lua b/angelsindustries/prototypes/recipes/components-construction-recipes.lua
index b60a6617c..e6e89c13c 100644
--- a/angelsindustries/prototypes/recipes/components-construction-recipes.lua
+++ b/angelsindustries/prototypes/recipes/components-construction-recipes.lua
@@ -11,7 +11,7 @@ if angelsmods.industries.components then
         category = "crafting",
         energy_required = 0.5,
         ingredients = {
-          {type = "item", name = "angels-rod-iron", amount = 2}
+          {type = "item", name = "iron-stick", amount = 2}
         },
         results = {
           {type = "item", name = "grate-iron", amount = 1}
diff --git a/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua b/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua
index b21042194..da3bc685a 100644
--- a/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua
+++ b/angelsindustries/prototypes/recipes/components-mechanical-recipes.lua
@@ -382,7 +382,7 @@ if angelsmods.industries.components then
         category = "crafting",
         enabled = true, -- enabled from the start
         ingredients = {
-          {type = "item", name = "angels-rod-iron", amount = 1}
+          {type = "item", name = "iron-stick", amount = 1}
         },
         results = {
           {type = "item", name = "angels-gear", amount = 2}
diff --git a/angelsindustries/prototypes/recipes/logistics-entity.lua b/angelsindustries/prototypes/recipes/logistics-entity.lua
index 7efcdf656..00693cbea 100644
--- a/angelsindustries/prototypes/recipes/logistics-entity.lua
+++ b/angelsindustries/prototypes/recipes/logistics-entity.lua
@@ -337,7 +337,7 @@ data:extend(
       enabled = false,
       energy_required = 5,
       ingredients = {
-        {type = "item", name = "electronic-circuit", amount = 1},
+        {type = "item", name = mods["bobelectronics"] and "basic-circuit-board" or "electronic-circuit", amount = 1},
         {type = "item", name = "copper-cable", amount = 3},
         {type = "item", name = "iron-plate", amount = 1}
       },
diff --git a/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua
index 1a4ebe536..bfe15781a 100644
--- a/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua
+++ b/angelsindustries/prototypes/recipes/overhaul-nuclear-power.lua
@@ -797,17 +797,9 @@ data:extend(
       name = "angels-atomic-bomb",
       enabled = false,
       energy_required = 50,
-      icons={
-        {icon = "__base__/graphics/icons/atomic-bomb.png",icon_size = 64, icon_mipmaps = 4},
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.industries.number_tint,
-          icon_size=32,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size=32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("atomic-bomb"),
+        2, angelsmods.industries.number_tint),
       ingredients =
       {
         {type = "item", name = "rocket-control-unit", amount = 10},
@@ -827,17 +819,9 @@ data:extend(
       category = "advanced-chemistry",
       enabled = false,
       energy_required = 50,
-      icons={
-        {icon = "__base__/graphics/icons/atomic-bomb.png",icon_size = 64, icon_mipmaps = 4},
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.industries.number_tint,
-          scale = 0.32,
-          icon_size=32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size=32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("atomic-bomb"),
+        3, angelsmods.industries.number_tint),
       ingredients =
       {
         {type = "item", name = "rocket-control-unit", amount = 20},
diff --git a/angelsindustries/prototypes/recipes/tech-science-packs-recipes.lua b/angelsindustries/prototypes/recipes/tech-science-packs-recipes.lua
index 74ab08b73..a4a13c8d9 100644
--- a/angelsindustries/prototypes/recipes/tech-science-packs-recipes.lua
+++ b/angelsindustries/prototypes/recipes/tech-science-packs-recipes.lua
@@ -106,7 +106,7 @@ if angelsmods.industries.tech then
       energy_required = 3,
       enabled = true,
       ingredients = {
-        {type = "item", name = "angels-rod-iron", amount = 1},
+        {type = "item", name = "iron-stick", amount = 1},
         {type = "item", name = "angels-wire-copper", amount = 4}
       },
       results = {
diff --git a/angelsindustries/prototypes/technology/vequip-technology.lua b/angelsindustries/prototypes/technology/vequip-technology.lua
index 7462c4430..bebf9e26d 100644
--- a/angelsindustries/prototypes/technology/vequip-technology.lua
+++ b/angelsindustries/prototypes/technology/vequip-technology.lua
@@ -12,6 +12,10 @@ data:extend(
         {
           type = "unlock-recipe",
           recipe = "angels-burner-generator-vequip"
+        },
+        {
+          type = "unlock-recipe",
+          recipe = "angels-repair-roboport-vequip"
         }
       },
       unit = {
@@ -37,10 +41,6 @@ data:extend(
           type = "unlock-recipe",
           recipe = "angels-fusion-reactor-vequip"
         },
-        {
-          type = "unlock-recipe",
-          recipe = "angels-repair-roboport-vequip"
-        },
         {
           type = "unlock-recipe",
           recipe = "angels-heavy-energy-shield-vequip"
diff --git a/angelsinfiniteores/changelog.txt b/angelsinfiniteores/changelog.txt
index 614c81c2f..d3128eb88 100644
--- a/angelsinfiniteores/changelog.txt
+++ b/angelsinfiniteores/changelog.txt
@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.9.9
+Date: ??
+  Changes:
+    - Now shows icons next to the autoplace controls (542)
+    - Updated the dark-matter-replicators detection script (543)
+    - Fixed the infinite bob gem mine generation (525)
+    - Fixed that bobs ore from other ore settings were not removing superfluous ores
+---------------------------------------------------------------------------------------------------
 Version: 0.9.8
 Date: 9.12.2020
   Changes:
diff --git a/angelsinfiniteores/data-updates.lua b/angelsinfiniteores/data-updates.lua
index 54a3e399c..38c3cb8ce 100644
--- a/angelsinfiniteores/data-updates.lua
+++ b/angelsinfiniteores/data-updates.lua
@@ -1,6 +1,6 @@
 require "prototypes.infiniteores-override"
-
+require("prototypes.generation.bob-options")
 -- EXECUTE OVERRIDES
 if not angelsmods.refining then
 	angelsmods.functions.update_autoplace()
-end
+end
\ No newline at end of file
diff --git a/angelsinfiniteores/data.lua b/angelsinfiniteores/data.lua
index 1a5be911e..8f29fb922 100644
--- a/angelsinfiniteores/data.lua
+++ b/angelsinfiniteores/data.lua
@@ -26,5 +26,7 @@ require("prototypes.generation.py-ore-inf")
 
 require("prototypes.generation.yuoki-ore-inf")
 
+require("prototypes.generation.dm-tenemut")
+
 -- EXECUTE FUNCTIONS
 angelsmods.functions.make_resource()
diff --git a/angelsinfiniteores/info.json b/angelsinfiniteores/info.json
index 466b80026..474073567 100644
--- a/angelsinfiniteores/info.json
+++ b/angelsinfiniteores/info.json
@@ -1,6 +1,6 @@
 {
   "name": "angelsinfiniteores",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "factorio_version": "1.1",
   "title": "Angel's Infinite Ores",
   "author": "Arch666Angel",
@@ -8,7 +8,7 @@
   "homepage": "https://forums.factorio.com/viewforum.php?f=185",
   "description": "Adds infinite ores for the base game, Bob's mods, Yuoki Industries, Uranium Power, Nucular, Dark Matter Replicators and the base ores for Angel's Refining. Works well with RSO mod. Has config options to change the yield for all infinite resources including oil and gas.",
   "dependencies": [
-    "base >= 1.1.0",
+    "base >= 1.1.24",
     "? angelsrefining >= 0.11.19",
     "? rso-mod >= 2.3.3",
     "? bobores >= 0.18.3",
@@ -17,6 +17,7 @@
     "? UraniumPower >= 0.6.3",
     "? Nucular >= 0.2.0",
     "? dark-matter-replicators >= 0.6.1",
+    "(?) dark-matter-replicators-18 >= 1.1.0",
     "? pycoalprocessing >= 1.3.4",
     "? pyrawores >= 1.5.2",
     "? pypetroleumhandling >= 1.2.4"
diff --git a/angelsinfiniteores/locale/en/names.cfg b/angelsinfiniteores/locale/en/names.cfg
index 4a894d4f7..aa0ed36c0 100644
--- a/angelsinfiniteores/locale/en/names.cfg
+++ b/angelsinfiniteores/locale/en/names.cfg
@@ -17,6 +17,7 @@ infinite-gem-ore=Infinite gem ore
 infinite-sulfur=Infinite sulfur
 infinite-silver-ore=Infinite silver ore
 infinite-cobalt-ore=Infinite cobalt ore
+infinite-thorium-ore=Infinite thorium ore
 
 infinite-uraninite=Infinite uraninite
 infinite-fluorite=Infinite fluorite
@@ -27,6 +28,7 @@ infinite-y-res2=Infinite F7-material chunk
 infinite-uranium-ore=Infinite uranium ore
 
 infinite-tenemut=Infinite tenemut cluster
+infinite-dmr18-tenemut=Infinite tenemut cluster
 
 infinite-angels-ore1=Infinite saphirite
 infinite-angels-ore2=Infinite jivolite
@@ -49,62 +51,10 @@ infinite-ore-titanium=Infinite titanium
 infinite-ore-zinc=Infinite zinc
 infinite-oil-sand=Infinite oil sand
 
-[autoplace-control-names]
-infinite-copper-ore=Infinite copper ore
-infinite-iron-ore=Infinite iron ore
-infinite-coal=Infinite coal
-infinite-stone=Infinite stone
-
-infinite-tin-ore=Infinite tin ore
-infinite-gold-ore=Infinite gold ore
-infinite-bauxite-ore=Infinite aluminium ore
-infinite-lead-ore=Infinite lead ore
-infinite-quartz=Infinite silicon ore
-infinite-rutile-ore=Infinite titanium ore
-infinite-tungsten-ore=Infinite tungsten ore
-infinite-zinc-ore=Infinite zinc ore
-infinite-nickel-ore=Infinite nickel ore
-infinite-gem-ore=Infinite gem ore
-infinite-sulfur=Infinite sulfur
-infinite-silver-ore=Infinite silver ore
-infinite-cobalt-ore=Infinite cobalt ore
-infinite-thorium-ore=Infinite thorium ore
-
-infinite-angels-ore1=Infinite saphirite
-infinite-angels-ore2=Infinite jivolite
-infinite-angels-ore3=Infinite stiratite
-infinite-angels-ore4=Infinite crotinnium
-infinite-angels-ore5=Infinite rubyte 
-infinite-angels-ore6=Infinite bobmonium
-
-infinite-uraninite=Infinite uraninite
-infinite-fluorite=Infinite fluorite
-
-infinite-y-res1=Infinite N4-Material chunk
-infinite-y-res2=Infinite F7-Material chunk
-
-infinite-uranium-ore=Infinite uranium ore
-
-infinite-tenemut=Infinite tenemut cluster
-
-infinite-borax=Infinite borax
-infinite-niobium=Infinite niobium
-infinite-molybdenum-ore=Infinite molybdenum
-infinite-ore-quartz=Infinite quartz
-infinite-raw-coal=Infinite raw coal
-infinite-ore-aluminium=Infinite aluminium
-infinite-ore-chromium=Infinite chromium
-infinite-ore-lead=Infinite lead
-infinite-ore-nickel=Infinite nickel
-infinite-ore-tin=Infinite tin
-infinite-ore-titanium=Infinite titanium
-infinite-ore-zinc=Infinite zinc
-infinite-oil-sand=Infinite oil sand
-
 [item-name]
 
 [mod-setting-name]
-angels-infinite-yield=Minimum yield for infine ore
+angels-infinite-yield=Minimum yield for infinite ore
 angels-lower-infinite-yield=Probability that infinite ore produces an output
 angels-enablefluidreq=Mining infinite ores requires fluids
 angels-keepuranacid=Mining uranium ore requires acid
diff --git a/angelsinfiniteores/prototypes/generation/bob-options.lua b/angelsinfiniteores/prototypes/generation/bob-options.lua
index ad3bf8efb..7965e7d15 100644
--- a/angelsinfiniteores/prototypes/generation/bob-options.lua
+++ b/angelsinfiniteores/prototypes/generation/bob-options.lua
@@ -1,37 +1,44 @@
-if bobmods.ores.settings.UnsortedGemOre == true then
-  bobmods.lib.resource.add_result("infinite-gem-ore", {name="gem-ore"})
-else
-  bobmods.lib.resource.add_result("infinite-gem-ore", {name="diamond-ore", probability = bobmods.gems.DiamondRatio})
-  bobmods.lib.resource.add_result("infinite-gem-ore", {name="emerald-ore", probability = bobmods.gems.EmeraldRatio})
-  bobmods.lib.resource.add_result("infinite-gem-ore", {name="amethyst-ore", probability = bobmods.gems.AmethystRatio})
-  bobmods.lib.resource.add_result("infinite-gem-ore", {name="ruby-ore", probability = bobmods.gems.RubyRatio})
-  bobmods.lib.resource.add_result("infinite-gem-ore", {name="sapphire-ore", probability = bobmods.gems.SapphireRatio})
-  bobmods.lib.resource.add_result("infinite-gem-ore", {name="topaz-ore", probability = bobmods.gems.TopazRatio})
-end
+if mods["bobores"] then
+  if bobmods.ores.settings.UnsortedGemOre == true then
+    bobmods.lib.resource.add_result("infinite-gem-ore", {name="gem-ore"})
+  else
+    bobmods.lib.resource.add_result("infinite-gem-ore", {name="diamond-ore", probability = bobmods.gems.DiamondRatio})
+    bobmods.lib.resource.add_result("infinite-gem-ore", {name="emerald-ore", probability = bobmods.gems.EmeraldRatio})
+    bobmods.lib.resource.add_result("infinite-gem-ore", {name="amethyst-ore", probability = bobmods.gems.AmethystRatio})
+    bobmods.lib.resource.add_result("infinite-gem-ore", {name="ruby-ore", probability = bobmods.gems.RubyRatio})
+    bobmods.lib.resource.add_result("infinite-gem-ore", {name="sapphire-ore", probability = bobmods.gems.SapphireRatio})
+    bobmods.lib.resource.add_result("infinite-gem-ore", {name="topaz-ore", probability = bobmods.gems.TopazRatio})
+    --remove regular gems
+    bobmods.lib.resource.remove_result("infinite-gem-ore", "gem-ore")
+  end
 
-if bobmods.ores.settings.GemsFromOtherOres == true then
-  bobmods.lib.resource.add_result("infinite-coal", {name="diamond-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.DiamondRatio})
+  if bobmods.ores.settings.GemsFromOtherOres == true then
+    bobmods.lib.resource.add_result("infinite-coal", {name="diamond-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.DiamondRatio})
 
-  bobmods.lib.resource.add_result("infinite-quartz", {name="emerald-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.EmeraldRatio})
-  bobmods.lib.resource.add_result("infinite-quartz", {name="amethyst-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.AmethystRatio})
+    bobmods.lib.resource.add_result("infinite-quartz", {name="emerald-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.EmeraldRatio})
+    bobmods.lib.resource.add_result("infinite-quartz", {name="amethyst-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.AmethystRatio})
 
-  bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="ruby-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.RubyRatio})
-  bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="sapphire-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.SapphireRatio})
-  bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="topaz-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.TopazRatio})
-end
+    bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="ruby-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.RubyRatio})
+    bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="sapphire-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.SapphireRatio})
+    bobmods.lib.resource.add_result("infinite-bauxite-ore", {name="topaz-ore", probability = bobmods.ores.settings.GemProbability * bobmods.gems.TopazRatio})
+    angelsmods.functions.remove_resource("infinite-gem-ore")
+  end
 
 
-if bobmods.ores.settings.LeadGivesNickel == true then
-  bobmods.lib.resource.add_result("infinite-lead-ore", {name = "nickel-ore", probability = bobmods.ores.settings.LeadNickelRatio})
-end
+  if bobmods.ores.settings.LeadGivesNickel == true then
+    bobmods.lib.resource.add_result("infinite-lead-ore", {name = "nickel-ore", probability = bobmods.ores.settings.LeadNickelRatio})
+    angelsmods.functions.remove_resource("infinite-nickel-ore")
+  end
 
 
-if bobmods.ores.settings.NickelGivesCobalt == true then
-  if bobmods.ores.nickel.enabled then
-    bobmods.lib.resource.add_result("infinite-nickel-ore", {name = "cobalt-ore", probability = bobmods.ores.settings.NickelCobaltRatio})
-  else
-    if bobmods.ores.settings.LeadGivesNickel == true then
-      bobmods.lib.resource.add_result("infinite-lead-ore", {name = "cobalt-ore", probability = bobmods.ores.settings.LeadNickelRatio * bobmods.ores.settings.NickelCobaltRatio})
+  if bobmods.ores.settings.NickelGivesCobalt == true then
+    angelsmods.functions.remove_resource("infinite-cobalt-ore")
+    if bobmods.ores.nickel.enabled then
+      bobmods.lib.resource.add_result("infinite-nickel-ore", {name = "cobalt-ore", probability = bobmods.ores.settings.NickelCobaltRatio})
+    else
+      if bobmods.ores.settings.LeadGivesNickel == true then
+        bobmods.lib.resource.add_result("infinite-lead-ore", {name = "cobalt-ore", probability = bobmods.ores.settings.LeadNickelRatio * bobmods.ores.settings.NickelCobaltRatio})
+      end
     end
   end
 end
\ No newline at end of file
diff --git a/angelsinfiniteores/prototypes/generation/dm-tenemut.lua b/angelsinfiniteores/prototypes/generation/dm-tenemut.lua
index 5765f237a..f790ae758 100644
--- a/angelsinfiniteores/prototypes/generation/dm-tenemut.lua
+++ b/angelsinfiniteores/prototypes/generation/dm-tenemut.lua
@@ -1,154 +1,54 @@
-if angelsmods.ores.enableinfiniteores and angelsmods.ores.enableinfinitedarkmatter then
-	data.raw["resource"]["tenemut"].stages={sheet=
-			{
-			filename = "__angelsinfiniteores__/graphics/entity/ores/ore-7.png",
-			tint = {r=0.76, g=0.58, b=0.69},
-			priority = "extra-high",
-			width = 38,
-			height = 38,
-			frame_count = 4,
-			variation_count = 8
-			}
-	}
+if angelsmods.ores.disable_ore_override or (not angelsmods.refining) then
+	local orename =	{"tenemut","dmr18-tenemut"}
+	for _, ore in pairs(orename) do
+		if data.raw.resource[ore] ~= nil then
+			angelsmods.functions.add_resource("update", {
+				name = ore,
+				order = "b-ab",
+				autoplace = {
+					starting_area = true,
+					--resource_index = 1,
+					base_density = 10,
+					regular_rq_factor_multiplier = 1.10,
+					starting_rq_factor_multiplier = 1.5
+				}
+			})
 
-	data.raw["resource"]["tenemut"].map_color={r=0.76, g=0.58, b=0.69}
+			local output
 
-	if not angelsmods.ores.enablersomode then
-	data:extend(
-	{
-		{
-		type = "autoplace-control",
-		name = "infinite-tenemut",
-		richness = true,
-		order = "b-e"
-		},
-		{
-		type = "noise-layer",
-		name = "infinite-tenemut"
-		},
-	  {
-		type = "resource",
-		name = "infinite-tenemut",
-		icon = "__dark-matter-replicators__/graphics/icons/tenemut.png",
-		flags = {"placeable-neutral"},
-		order="a-b-e",
-		infinite=true,
-		minimum=angelsmods.ores.yield,
-		normal=1500,
-		maximum=6000,
-		minable =
-		{
-		  hardness = 0.9,
-		  mining_particle = "tenemut-particle",
-		  mining_time = 4,
-		  results = {
-				{
-					type = "item",
-					name = "tenemut",
-					amount_min = 1,
-					amount_max = 1,
-					probability = angelsmods.ores.loweryield
-				}
-			},
-		},
-		collision_box = {{ -0.1, -0.1}, {0.1, 0.1}},
-		selection_box = {{ -0.5, -0.5}, {0.5, 0.5}},
-		autoplace =
-		{
-			control = "infinite-tenemut",
-			sharpness = 1,
-			richness_multiplier = 5000,
-			richness_multiplier_distance_bonus = 20,
-			richness_base = 2000,
-			coverage = 0.01,
-			peaks = {
-				{
-					noise_layer = "infinite-tenemut",
-					noise_octaves_difference = -2.5,
-					noise_persistence = 0.3,
-					starting_area_weight_optimal = 0,
-					starting_area_weight_range = 0,
-					starting_area_weight_max_range = 2,
-				},
-				{
-					noise_layer = "infinite-tenemut",
-					noise_octaves_difference = -2,
-					noise_persistence = 0.3,
-					starting_area_weight_optimal = 1,
-					starting_area_weight_range = 0,
-					starting_area_weight_max_range = 2,
-				},
-				{
-					influence = 0.15,
-					starting_area_weight_optimal = 0,
-					starting_area_weight_range = 0,
-					starting_area_weight_max_range = 2,
-				}
-			}
-		},
-		stage_counts = {1},
-		stages =
-		{
-			sheet =
-		  {
-			filename = "__angelsinfiniteores__/graphics/entity/ores-inf/ore-7-inf.png",
-			tint = {r=0.76, g=0.58, b=0.69},
-			priority = "extra-high",
-			width = 38,
-			height = 38,
-			frame_count = 8,
-			variation_count = 1
-		  }
-		},
-		map_color = {r=0.76, g=0.58, b=0.69},
-	  },
-	})
-	else
-	data:extend(
-	{
-	  {
-		type = "resource",
-		name = "infinite-tenemut",
-		icon = "__dark-matter-replicators__/graphics/icons/tenemut.png",
-		flags = {"placeable-neutral"},
-		order="a-b-e",
-		infinite=true,
-		minimum=angelsmods.ores.yield,
-		normal=1500,
-		maximum=6000,
-		minable =
-		{
-		  hardness = 0.9,
-		  mining_particle = "tenemut-particle",
-		  mining_time = 4,
-		  results = {
-				{
-					type = "item",
-					name = "tenemut",
-					amount_min = 1,
-					amount_max = 1,
-					probability = angelsmods.ores.loweryield
+			if data.raw.resource[ore].minable.result ~= nil then
+				output = data.raw.resource[ore].minable.result
+			end
+
+			angelsmods.functions.add_resource("make", {
+				name = "infinite-" .. ore,
+				get = ore,
+				order = "b",
+				sheet = 7,
+				infinite = true,
+				glow = true,
+				var = 2,
+				map_color = {r=0.55, g=0.392, b=0.55},
+				tint = {r=0.55, g=0.392, b=0.55},
+				mining_time = 3,
+				type = "item",
+				minimum = angelsmods.ores.yield,
+				normal = 1500,
+				maximum = 6000,
+				acid_to_mine = data.raw.resource[ore].minable.required_fluid or "liquid-sulfuric-acid",
+				output_name = output,
+				output_min = 1,
+				output_max = 1,
+				output_probability = angelsmods.ores.loweryield,
+				icon = data.raw.resource[ore].icon,
+				autoplace = {
+					starting_area = false,
+					--resource_index = 1,
+					base_density = 5,
+					regular_rq_factor_multiplier = 0.3,
+					starting_rq_factor_multiplier = 0.5,
 				}
-			},
-		},
-		collision_box = {{ -0.1, -0.1}, {0.1, 0.1}},
-		selection_box = {{ -0.5, -0.5}, {0.5, 0.5}},
-		stage_counts = {1},
-		stages =
-		{
-			sheet =
-		  {
-			filename = "__angelsinfiniteores__/graphics/entity/ores-inf/ore-7-inf.png",
-			tint = {r=0.76, g=0.58, b=0.69},
-			priority = "extra-high",
-			width = 38,
-			height = 38,
-			frame_count = 8,
-			variation_count = 1
-		  }
-		},
-		map_color = {r=0.76, g=0.58, b=0.69},
-	  },
-	})
+			})
+		end
 	end
 end
\ No newline at end of file
diff --git a/angelsinfiniteores/prototypes/generation/resource-builder.lua b/angelsinfiniteores/prototypes/generation/resource-builder.lua
index 50e49809d..f67ea6398 100644
--- a/angelsinfiniteores/prototypes/generation/resource-builder.lua
+++ b/angelsinfiniteores/prototypes/generation/resource-builder.lua
@@ -10,6 +10,7 @@ if not angelsmods.functions.make_resource then
         {
           type = "autoplace-control",
           name = input.name,
+          localised_name = {"", "[entity="..input.name.."] ", {"entity-name."..input.name}},
           richness = true,
           order = "b-" .. input.order,
           category = "resource"
diff --git a/angelspetrochem/changelog.txt b/angelspetrochem/changelog.txt
index 215ea2805..e31297e8f 100644
--- a/angelspetrochem/changelog.txt
+++ b/angelspetrochem/changelog.txt
@@ -6,6 +6,12 @@ Date: ??
     - Disabled bobs valve as angels valves have an identical purpose with more features
     - Added fuel values for vanilla fuels (for compatibility) (494)
     - Removed obsolete inventory slots in the flare stack and converter valve
+    - Added fuel value containing fluids to the flamethrower turret accepted fluids
+      - Damage multiplier is a function of fuel value ratio with methane for "new" fuels
+    - Changed and expanded locale strings and text descriptions (489)
+  Bugfixes:
+    - Fixed that the converter valve could not be disabled (507)
+    - Fixed a crash in a very old migration script (535)
 ---------------------------------------------------------------------------------------------------
 Version: 0.9.17
 Date: 26.11.2020
diff --git a/angelspetrochem/graphics/icons/gas.png b/angelspetrochem/graphics/icons/gas.png
new file mode 100644
index 000000000..82392b632
Binary files /dev/null and b/angelspetrochem/graphics/icons/gas.png differ
diff --git a/angelspetrochem/locale/en/petrochem.cfg b/angelspetrochem/locale/en/petrochem.cfg
index f7dc82d2b..45065a125 100644
--- a/angelspetrochem/locale/en/petrochem.cfg
+++ b/angelspetrochem/locale/en/petrochem.cfg
@@ -82,10 +82,10 @@ liquid-rubber=Liquid rubber
 chemical-formula=[font=default-semibold][color=1,0.9,0.75]Chemical formula:[/color][/font] __1__
 
 [recipe-name]
-dirt-water-separation=Dirt water electrolysis: hydrogen, oxygen, slag
-dirt-water-separation-2=Dirt water electrolysis: hydrogen, oxygen, slag, used electrode
-water-separation=Purified water electrolysis: hydrogen, oxygen
-water-separation-2=Purified water electrolysis: hydrogen, oxygen, used electrode
+dirt-water-separation=Dirt water electrolysis
+dirt-water-separation-2=Fast dirt water electrolysis
+water-separation=Purified water electrolysis
+water-separation-2=Fast purified water electrolysis
 water-gas-shift-1=Water gas shift
 water-gas-shift-2=Reverse water gas shift
 carbon-separation-1=Carbon monoxide
@@ -93,40 +93,40 @@ carbon-separation-2=Carbon dioxide
 coke-purification=Carbon
 coal-crushed=Crushed coal
 solid-coke=Coke
-coke-purification-2=Coke purification: carbon, sodium carbonate
-solid-coke-sulfur=Clean coal to coke and sulfuric waste water
+coke-purification-2=Coke purification
+solid-coke-sulfur=Desulfurization of coal
 pellet-coke=Coke pellet
-coal-cracking-1=Coal cracking gasification: coke, hydrogen sulfide gas, benzene gas, methane gas
-coal-cracking-2=Coal cracking Bergius process: coke, metal catalyst carrier, naphtha, ngl, mineral-oil
-coal-cracking-3=Coal cracking Fischer–Tropsch process: synthesis gas, carbon dioxide, hydrogen sulfide
-
-gas-separation=Natural gas separation: raw gas, condensates, sulfuric waste water
-gas-refining=Raw gas refining: acid gas, ngl
-gas-fractioning=Gas fractioning: methane gas, ethane gas, butane gas
-gas-fractioning-synthesis=Advanced light gas fractioning: methane gas, ethane gas, butane gas, carbon monoxide
-gas-fractioning-condensates=Advanced heavy gas fractioning: methane gas, ethane gas, butane gas, naphtha
-gas-fractioning-residual=Advanced medium gas fractioning: methane gas, ethane gas, butane gas, toluene
-condensates-refining=Condensates advanced cracking: coke, naphtha, methane gas
-gas-synthesis-separation=Synthesis gas separation: carbon monoxide, hydrogen
-gas-synthesis-methanation=Synthesis gas catalytic methanation: methane gas, ethane gas, butane gas
+coal-cracking-1=Coal cracking gasification
+coal-cracking-2=Coal cracking Bergius process
+coal-cracking-3=Coal cracking Fischer–Tropsch process
+
+gas-separation=Natural gas separation
+gas-refining=Raw gas refining
+gas-fractioning=Gas fractioning
+gas-fractioning-synthesis=Advanced light gas fractioning
+gas-fractioning-condensates=Advanced heavy gas fractioning
+gas-fractioning-residual=Advanced medium gas fractioning
+condensates-refining=Condensates advanced cracking
+gas-synthesis-separation=Synthesis gas separation
+gas-synthesis-methanation=Synthesis gas catalytic methanation
 gas-synthesis-methanol=Catalytic synthesis to methanol
 steam-cracking-residual=Steam cracking residual gas to syngas
 
-oil-separation=Oil Separation: raw gas, crude oil, sulfuric waste water
-oil-refining=Oil Refining: mineral oil, fuel oil, naphtha
-advanced-oil-refining=Advanced light oil refining: mineral oil, fuel oil, naphtha
-residual-oil-refining=Advanced heavy oil refining: mineral oil, fuel oil, naphtha
-condensates-oil-refining=Oil and condensates refining: mineral oil, fuel oil, naphtha
-steam-cracking-naphtha=Steam cracking naphtha to syngas
+oil-separation=Oil Separation
+oil-refining=Oil Refining
+advanced-oil-refining=Advanced light oil refining
+residual-oil-refining=Advanced heavy oil refining
+condensates-oil-refining=Oil and condensates refining
+steam-cracking-naphtha=Steam cracking of naphtha to syngas
 liquid-mineral-oil-catalyst=Catalytic cracking of naphtha to mineral oil
 liquid-naphtha-catalyst=Catalytic synthesis of naphtha
-steam-cracking-mineral-oil=Steam cracking mineral oil to syngas
-steam-cracking-fuel-oil=Steam cracking fuel oil to syngas
+steam-cracking-mineral-oil=Steam cracking of mineral oil to syngas
+steam-cracking-fuel-oil=Steam cracking of fuel oil to syngas
 mineral-oil-lubricant=Lubricant
 
-steam-cracking-methane=Steam cracking methane: methanol gas, residual gas
-steam-cracking-ethane=Steam cracking ethane: ethylene gas, residual gas
-steam-cracking-butane=Steam cracking butane: benzene gas, residual gas
+steam-cracking-methane=Steam cracking of methane
+steam-cracking-ethane=Steam cracking of ethane
+steam-cracking-butane=Steam cracking of butane
 catalyst-steam-cracking-butane=Catalytic cracking naphtha to butadiene
 catalyst-steam-cracking-naphtha=Catalytic cracking naphtha to propene
 liquid-toluene-from-naphtha=Catalytic synthesis naphtha to toluene
@@ -141,13 +141,13 @@ liquid-phenol-catalyst=Catalytic synthesis of phenol
 gas-propene-synthesis=Synthesis of propene
 liquid-ethylbenzene-catalyst=Catalytic synthesis of ethylbenzene
 liquid-bisphenol-a=Synthesis of bisphenol A
-cumene-process=Cumene process: acetone, phenol
-liquid-ethylene-carbonate=Ethylene Carbonate
-gas-ethylene-oxide=Ethylene Oxide
+cumene-process=Cumene process
+liquid-ethylene-carbonate=Ethylene carbonate
+gas-ethylene-oxide=Ethylene oxide
 
-water-saline-separation=Saline water electrolysis: chlorine, hydrogen, sodium hydroxide
-solid-salt-separation=Molten salt electrolysis: chlorine, sodium hydroxide
-gas-hydrogen-chloride-separation=Separation of hydrogen chloride: chlorine, hydrogen
+water-saline-separation=Saline water electrolysis
+solid-salt-separation=Molten salt electrolysis
+gas-hydrogen-chloride-separation=Separation of hydrogen chloride
 gas-chlor-methane=Synthesis of chloromethane
 gas-hydrogen-chloride=Synthesis of hydrogen chloride
 liquid-hydrochloric-acid=Synthesis of hydrochloric acid
@@ -155,7 +155,7 @@ gas-allylchlorid=Synthesis of allyl chloride
 gas-epichlorhydrin=Synthesis of epichlorohydrin
 liquid-glycerol=Synthesis of glycerol
 solid-sodium-perchlorate=Sodium perchlorate
-liquid-hydrochloric-acid-solid-sodium-sulfate=Synthesis of hydrochloric acid: sodium sulfate
+liquid-hydrochloric-acid-solid-sodium-sulfate=Hydrochloric acid from salt
 solid-sodium-hydroxide-solid-sodium-sulfate=Synthesis of sodium sulfate
 
 angels-hydrogen-sulfide-enrichment=Hydrogen sulfide gas enrichment
@@ -163,8 +163,8 @@ angels-water-enrichment=Water enrichment __1__ (from __2__% to __3__%)
 angels-water-enriched-cooling=Enriched water cooling __1__
 angels-heavy-water-extraction=Heavy water separation
 angels-heavy-water-cooling=Heavy water cooling
-angels-heavy-water-separation=Heavy water electrolysis: deuterium, oxygen
-angels-heavy-water-separation-2=Heavy water electrolysis: deuterium, oxygen, used electrode
+angels-heavy-water-separation=Heavy water electrolysis
+angels-heavy-water-separation-2=Fast heavy water electrolysis
 
 solid-plastic-1=Propene plastic
 solid-plastic-2=Polyethylene plastic
@@ -182,19 +182,19 @@ catalyst-metal-blue=Blue metal catalyst
 catalyst-metal-yellow=Yellow metal catalyst
 angels-electrode-used=Clean used electrode
 
-gas-acid-catalyst=Catalytic cracking acid gas
-solid-sulfur=Synthesis sulfur
-gas-sulfur-dioxide=Synthesis sulfur dioxide
-gas-sulfur-dioxide-calcium-sulfate=Synthesis sulfur dioxide from calcium sulfate
-liquid-sulfuric-acid=Synthesis sulfuric acid
-liquid-hydrofluoric-acid=Synthesis hydrofluoric acid
+gas-acid-catalyst=Catalytic cracking of acid gas
+solid-sulfur=Sulfur synthesis
+gas-sulfur-dioxide=Sulfur dioxide synthesis
+gas-sulfur-dioxide-calcium-sulfate=Sulfur dioxide synthesis from calcium sulfate
+liquid-sulfuric-acid=Sulfuric acid synthesis
+liquid-hydrofluoric-acid=Hydrofluoric acid synthesis
 liquid-hydrogen-fluoride=Hydrogen fluoride dissolving
 gas-hydrogen-fluoride=Hydrogen fluoride gas seperation
 angels-sulfur-scrubber=Sulfur air scrubbing
-angels-sulfur-air-scrubbing=Lime filter recycling: acid gas
+angels-sulfur-air-scrubbing=Acid gas from lime filter recycling
 
-air-filtering=Air filtering: compressed air
-air-separation=Air separation: nitrogen gas, oxygen gas
+air-filtering=Air compression
+air-separation=Air separation
 gas-ammonia=Ammonia synthesis
 gas-nitrogen-monoxide=Nitrogen monoxide synthesis
 gas-nitrogen-dioxide=Nitrogen dioxide synthesis
@@ -208,8 +208,8 @@ gas-methylamine=Methylamine gas
 gas-dimethylamine=Dimethylamine gas
 gas-dimethylhydrazine=Dimethylhydrazine gas
 
-solid-sodium-nitrate-processing=Sodium nitrate: nitrogen monoxide, nitrogen dioxide
-sodium-nitrate-acid-processing=Sodium nitrate acid synthesis
+solid-sodium-nitrate-processing=Sodium nitrate to nitric gasses
+sodium-nitrate-acid-processing=Sodium nitrate to nitric acid
 
 converter-angels=Convert __1__ to __2__
 
@@ -283,6 +283,63 @@ angels-electric-boiler=Electric boiler 1
 angels-electric-boiler-2=Electric boiler 2
 angels-electric-boiler-3=Electric boiler 3
 
+[entity-description]
+advanced-chemical-plant=Most versatile chemical machine, can process up to 3 fluid inputs and/or 3 fluid outputs.
+advanced-chemical-plant-2=Most versatile chemical machine, can process up to 3 fluid inputs and/or 3 fluid outputs.
+
+angels-flare-stack=Burns excess chemicals at the cost of high pollution.
+
+angels-fluid-splitter-2-way=2-way fluid splitter
+angels-fluid-splitter-3-way=3-way fluid splitter
+
+gas-refinery-small=Machine for fractioning of short-chained mixtures.
+gas-refinery-small-2=Machine for fractioning of short-chained mixtures.
+gas-refinery-small-3=Machine for fractioning of short-chained mixtures.
+gas-refinery-small-4=Machine for fractioning of short-chained mixtures.
+
+gas-refinery=Machine for fractioning of short-chained mixtures, can use up to 4 outputs.
+gas-refinery-2=Machine for fractioning of short-chained mixtures, can use up to 4 outputs.
+gas-refinery-3=Machine for fractioning of short-chained mixtures, can use up to 4 outputs.
+gas-refinery-4=Machine for fractioning of short-chained mixtures, can use up to 4 outputs.
+
+separator=Machine for separating hydrophobic liquids from gasses.
+separator-2=Machine for separating hydrophobic liquids from gasses.
+separator-3=Machine for separating hydrophobic liquids from gasses.
+separator-4=Machine for separating hydrophobic liquids from gasses.
+
+steam-cracker=Uses steam to break down long molecules, and re-combines them into new compounds.
+steam-cracker-2=Uses steam to break down long molecules, and re-combines them into new compounds.
+steam-cracker-3=Uses steam to break down long molecules, and re-combines them into new compounds.
+steam-cracker-4=Uses steam to break down long molecules, and re-combines them into new compounds.
+
+angels-electrolyser=Uses electricity to break strong chemical bonds.
+angels-electrolyser-2=Uses electricity to break strong chemical bonds.
+angels-electrolyser-3=Uses electricity to break strong chemical bonds.
+angels-electrolyser-4=Uses electricity to break strong chemical bonds.
+
+angels-air-filter=Makes environmental air accessible for further processing.
+angels-air-filter-2=Makes environmental air accessible for further processing.
+
+angels-chemical-plant=Versatile chemical machine, can process up to 2 fluid inputs and/or 2 fluid outputs.
+angels-chemical-plant-2=Versatile chemical machine, can process up to 2 fluid inputs and/or 2 fluid outputs.
+angels-chemical-plant-3=Versatile chemical machine, can process up to 2 fluid inputs and/or 2 fluid outputs.
+angels-chemical-plant-4=Versatile chemical machine, can process up to 2 fluid inputs and/or 2 fluid outputs.
+
+valve-inspector=Pipe section that can hold 1000 units of fluid and can be connected to a wire.
+valve-return=Only allows one directional flow.
+valve-overflow=Allows flow if the input side is above 80%.
+valve-converter=Converts base game fluids to Angel's mod fluids and vice versa.
+valve-underflow=Allows flow if the output side is below 80%.
+
+oil-refinery=Machine for fractioning of long-chained mixtures.
+oil-refinery-2=Machine for fractioning of long-chained mixtures.
+oil-refinery-3=Machine for fractioning of long-chained mixtures.
+oil-refinery-4=Machine for fractioning of long-chained mixtures.
+
+angels-electric-boiler=Uses electricity to turn water into steam.
+angels-electric-boiler-2=Uses electricity to turn water into steam.
+angels-electric-boiler-3=Uses electricity to turn water into steam.
+
 [item-name]
 solid-sodium-hydroxide=Sodium hydroxide
 solid-sodium-hypochlorite=Sodium hypochlorite
@@ -314,7 +371,7 @@ solid-carbon=Carbon
 solid-coke=Coke
 pellet-coke=Coke pellet
 
-catalyst-metal-carrier=Metal catalyst carrier
+catalyst-metal-carrier=Metal-catalyst carrier
 catalyst-metal-red=Red metal catalyst
 catalyst-metal-green=Green metal catalyst
 catalyst-metal-blue=Blue metal catalyst
@@ -371,21 +428,15 @@ angels-air-filter=Air filter 1
 angels-air-filter-2=Air filter 2
 
 valve-inspector=Inspector valve
-valve-return=No-return valve
+valve-return=Non-return valve
 valve-overflow=Overflow valve
 valve-converter=Converter valve
 valve-underflow=Top-up valve
 
 [item-description]
-angels-flare-stack=Burns excess chemicals (chemical void).
 
 angels-fluid-splitter-2-way=Splits fluids between two outputs. Stops working if one output is blocked.
 angels-fluid-splitter-3-way=Splits fluids between three outputs. Stops working if one output is blocked.
-valve-inspector=Pipe section that can hold 1000 units of fluid and can be connected to a wire.
-valve-return=Only allows one directional flow.
-valve-overflow=Allows flow if the input side is above 80%.
-valve-converter=Converts base game fluids to Angel's mod fluids and vice versa.
-valve-underflow=Allows flow if the output side is below 80%.
 
 [technology-name]
 angels-fluid-control=Fluid control
@@ -417,31 +468,45 @@ angels-explosives=Explosives
 angels-electric-boiler=Electric boiler
 angels-nuclear-fuel=Nuclear fuel
 
+[technology-description]
+angels-fluid-control=Provides utilities to control the flow of fluids.
+basic-chemistry=Knowledge to produce and handle the basic ingredients for chemistry.
+water-chemistry=Enrichment and processing of heavy water.
+angels-sulfur-processing=Sulfur is a highly reactive non-metallic chemical with a broad range of applications.
+angels-nitrogen-processing=Nitrogen is a non-metallic chemical with a broad range of applications.
+chlorine-processing=Chlorine is a reactive halogen with a broad range of applications.
+oil-gas-extraction=Organic compounds from fossile deposits serve as the base for a vast number of production chains.
+angels-advanced-gas-processing=Alternative ways of fractioning short-chained hydrocarbons.
+angels-oil-processing=Key technology for the processing of long-chained hydrocarbons.
+angels-advanced-oil-processing=Alternative ways of fractioning of long-chained hydrocarbons.
+gas-processing=Key technology for the processing of short-chained hydrocarbons.
+angels-flare-stack=Burning off excess chemicals simplifies production chains at the cost of pollution.
+angels-advanced-chemistry=Selective chemical conversions using catalysts.
+angels-coal-processing=Purification and use of coke as well as carbon.
+angels-coal-cracking=Liquefaction and gasification of coal.
+gas-synthesis=De novo synthesis of hydrocarbons from base chemicals.
+gas-steam-cracking=Re-combination of short-chained hydrocarbons.
+oil-steam-cracking=Cracking down of long-chained hydrocarbons.
+plastic=Various sources for plastic.
+resins=Synthetic polymeric materials that can be molded into protective composition.
+resin=Various sources for resins.
+rubbers=Synthetic polymeric materials that can be molded into elastic composition.
+rubber=Co-polymerization of styrene and butadiene as a versatile artificial rubber.
+sodium-processing=Sodium is a highly-reactive alcali metal whose salts are key reactants in many processes.
+rocket-booster=Versatile fuel that provides high acceleration for vehicles.
+angels-explosives=Alternative ways to make explosives.
+angels-electric-boiler=Electricity as an alternative energy source for steam production.
+angels-nuclear-fuel=Radioactive materials provide fuels with exceptional acceleration for vehicles.
+
 [mod-setting-name]
 angels-enable-converter=Enable converter valve and conversion recipes
 angels-hide-converter=Hide conversion recipes
 angels-enable-acids=Add acids to ore refining and mining of infinite ores
-angels-disable-vanilla-chemical-plants=Disable base game chemical plant
+angels-disable-vanilla-chemical-plants=Disable base-game chemical plant
 angels-disable-bobs-electrolysers=Disable Bob's electrolysers
 angels-disable-bobs-chemical-plants=Disable Bob's chemical plants
 angels-disable-bobs-distilleries=Disable Bob's distilleries
-angels-show-chemical-formula=Show chemical formulae on item descriptions
-
-[technology-description]
-angels-fluid-control=Provides utilities to control the flow of fluids.
-basic-chemistry=Knowledge to produce and handle the basic ingredients for chemistry.
-resins=Synthetic polymeric materials that can be molded into protective composition.
-rubbers=Synthetic polymeric materials that can be molded into elastic composition.
-
-[entity-description]
-angels-flare-stack=Burns excess chemicals (chemical void).
-
-valve-inspector=Pipe section that can hold 1000 units of fluid and can be connected to a wire.
-valve-return=Only allows one directional flow.
-valve-overflow=Allows flow if the input side is above 80%.
-valve-converter=Converts base game fluids to Angel's mod fluids and vice versa.
-
-valve-underflow=Allows flow if the output side is below 80%.
+angels-show-chemical-formula=Show chemical formulae in item descriptions
 
 [mod-setting-description]
 angels-enable-acids=Changes leaching recipes in Refining to use different Petrochem acids and also changes the acid requirement of Infinite Ores.
diff --git a/angelspetrochem/migrations/angelspetrochem_0.4.0.lua b/angelspetrochem/migrations/angelspetrochem_0.4.0.lua
index 6e43d2ab4..ae5240960 100644
--- a/angelspetrochem/migrations/angelspetrochem_0.4.0.lua
+++ b/angelspetrochem/migrations/angelspetrochem_0.4.0.lua
@@ -3,19 +3,19 @@ game.reload_script()
 for index, force in pairs(game.forces) do
   force.reset_recipes()
   force.reset_technologies()
-    if force.technologies["basic-chemistry"].researched then
-		force.recipes["dirt-water-separation"].enabled = true
-    end
-	if force.technologies["basic-chemistry-2"].researched then
-		force.recipes["chemical-plant"].enabled = true
-    end
-	if force.technologies["angels-advanced-chemistry-2"].researched then
-		force.recipes["chemical-plant-2"].enabled = true
-    end
-	if force.technologies["angels-advanced-chemistry-3"].researched then
-		force.recipes["chemical-plant-3"].enabled = true
-    end
-	if force.technologies["angels-advanced-chemistry-4"].researched then
-		force.recipes["chemical-plant-4"].enabled = true
-    end
+  if force.technologies["basic-chemistry"] and force.technologies["basic-chemistry"].researched then
+    force.recipes["dirt-water-separation"].enabled = true
+  end
+  if force.technologies["basic-chemistry-2"] and force.technologies["basic-chemistry-2"].researched then
+    force.recipes["chemical-plant"].enabled = true
+  end
+  if force.technologies["angels-advanced-chemistry-2"] and force.technologies["angels-advanced-chemistry-2"].researched then
+    force.recipes["chemical-plant-2"].enabled = true
+  end
+  if force.technologies["angels-advanced-chemistry-3"] and force.technologies["angels-advanced-chemistry-3"].researched then
+    force.recipes["chemical-plant-3"].enabled = true
+  end
+  if force.technologies["angels-advanced-chemistry-4"] and force.technologies["angels-advanced-chemistry-4"].researched then
+    force.recipes["chemical-plant-4"].enabled = true
+  end
 end
\ No newline at end of file
diff --git a/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua b/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua
index af3819680..55424ca1e 100644
--- a/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua
+++ b/angelspetrochem/prototypes/buildings/advanced-chemical-plant.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "advanced-chemical-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-chemical-plant",
       order = "b[advanced]-a",
       place_result = "advanced-chemical-plant",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "advanced-chemical-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "advanced-chemical-plant"},
       fast_replaceable_group = "advanced-chemical-plant",
@@ -139,18 +131,14 @@ data:extend(
     {
       type = "item",
       name = "advanced-chemical-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-chemical-plant",
       order = "b[advanced]-b",
       place_result = "advanced-chemical-plant-2",
@@ -159,18 +147,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "advanced-chemical-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/advanced-chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "advanced-chemical-plant-2"},
       fast_replaceable_group = "advanced-chemical-plant",
diff --git a/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua b/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua
index 9ffa9e5ab..e1156f8b4 100644
--- a/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua
+++ b/angelspetrochem/prototypes/buildings/advanced-gas-refinery.lua
@@ -4,18 +4,14 @@ data:extend(
   {
     type = "item",
     name = "gas-refinery",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_1.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      1, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-gas-refinery",
     order = "b[gas-refinery]-a",
     place_result = "gas-refinery",
@@ -24,18 +20,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "gas-refinery",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_1.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      1, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "gas-refinery"},
     fast_replaceable_group = "gas-refinery",
@@ -149,18 +141,14 @@ data:extend(
   {
     type = "item",
     name = "gas-refinery-2",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_2.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      2, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-gas-refinery",
     order = "b[gas-refinery]-b",
     place_result = "gas-refinery-2",
@@ -169,18 +157,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "gas-refinery-2",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_2.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      2, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "gas-refinery-2"},
     fast_replaceable_group = "gas-refinery",
@@ -294,18 +278,14 @@ data:extend(
   {
     type = "item",
     name = "gas-refinery-3",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_3.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      3, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-gas-refinery",
     order = "b[gas-refinery]-c",
     place_result = "gas-refinery-3",
@@ -314,18 +294,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "gas-refinery-3",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_3.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      3, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "gas-refinery-3"},
     fast_replaceable_group = "gas-refinery",
@@ -438,18 +414,14 @@ data:extend(
   {
     type = "item",
     name = "gas-refinery-4",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_4.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      4, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-gas-refinery",
     order = "b[gas-refinery]-d",
     place_result = "gas-refinery-4",
@@ -458,18 +430,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "gas-refinery-4",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/gas-refinery.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_4.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      4, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "gas-refinery-4"},
     fast_replaceable_group = "gas-refinery",
diff --git a/angelspetrochem/prototypes/buildings/air-filter.lua b/angelspetrochem/prototypes/buildings/air-filter.lua
index 821be8bc8..041a274c6 100644
--- a/angelspetrochem/prototypes/buildings/air-filter.lua
+++ b/angelspetrochem/prototypes/buildings/air-filter.lua
@@ -3,18 +3,14 @@ data:extend(
     {
     type = "item",
     name = "angels-air-filter",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/air-filter.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/air-filter.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_1.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      1, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-electrolyser",
     order = "b[angels-air-filter]-a",
     place_result = "angels-air-filter",
@@ -23,18 +19,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "angels-air-filter",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/air-filter.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/air-filter.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_1.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      1, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "angels-air-filter"},
     fast_replaceable_group = "angels-air-filter",
@@ -99,18 +91,14 @@ data:extend(
   {
     type = "item",
     name = "angels-air-filter-2",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/air-filter.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/air-filter.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_2.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      2, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-electrolyser",
     order = "b[angels-air-filter]-b",
     place_result = "angels-air-filter-2",
@@ -119,18 +107,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "angels-air-filter-2",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/air-filter.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/air-filter.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_2.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      2, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "angels-air-filter-2"},
     fast_replaceable_group = "angels-air-filter",
diff --git a/angelspetrochem/prototypes/buildings/chemical-plant.lua b/angelspetrochem/prototypes/buildings/chemical-plant.lua
index c30b33cff..f83e118f5 100644
--- a/angelspetrochem/prototypes/buildings/chemical-plant.lua
+++ b/angelspetrochem/prototypes/buildings/chemical-plant.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "angels-chemical-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-chemical-plant",
       order = "a[regular]-b[angel]-a",
       place_result = "angels-chemical-plant",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-chemical-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "placeable-player", "player-creation"},
       minable = {hardness = 0.2, mining_time = 0.5, result = "angels-chemical-plant"},
       max_health = 300,
@@ -156,18 +148,14 @@ data:extend(
     {
       type = "item",
       name = "angels-chemical-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-chemical-plant",
       order = "a[regular]-b[angel]-b",
       place_result = "angels-chemical-plant-2",
@@ -176,18 +164,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-chemical-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "placeable-player", "player-creation"},
       minable = {hardness = 0.2, mining_time = 0.5, result = "angels-chemical-plant-2"},
       max_health = 300,
@@ -309,18 +293,14 @@ data:extend(
     {
       type = "item",
       name = "angels-chemical-plant-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-chemical-plant",
       order = "a[regular]-b[angel]-c",
       place_result = "angels-chemical-plant-3",
@@ -329,18 +309,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-chemical-plant-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "placeable-player", "player-creation"},
       minable = {hardness = 0.2, mining_time = 0.5, result = "angels-chemical-plant-3"},
       max_health = 300,
@@ -462,18 +438,14 @@ data:extend(
     {
       type = "item",
       name = "angels-chemical-plant-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-chemical-plant",
       order = "a[regular]-b[angel]-d",
       place_result = "angels-chemical-plant-4",
@@ -482,18 +454,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-chemical-plant-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/chemical-plant.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/chemical-plant.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "placeable-player", "player-creation"},
       minable = {hardness = 0.2, mining_time = 0.5, result = "angels-chemical-plant-4"},
       max_health = 300,
diff --git a/angelspetrochem/prototypes/buildings/electric-boiler.lua b/angelspetrochem/prototypes/buildings/electric-boiler.lua
index c9535e8f9..d72a53a2c 100644
--- a/angelspetrochem/prototypes/buildings/electric-boiler.lua
+++ b/angelspetrochem/prototypes/buildings/electric-boiler.lua
@@ -10,18 +10,14 @@ data:extend(
     {
       type = "item",
       name = "angels-electric-boiler",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electric-boiler.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electric-boiler.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       subgroup = "boiler-building",
       order = "c[electric-boiler]-a",
       place_result = "angels-electric-boiler",
@@ -30,18 +26,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-electric-boiler",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electric-boiler.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electric-boiler.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-electric-boiler"},
       fast_replaceable_group = "angels-electric-boiler",
@@ -168,18 +160,14 @@ data:extend(
     {
       type = "item",
       name = "angels-electric-boiler-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electric-boiler.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electric-boiler.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       subgroup = "boiler-building",
       order = "c[electric-boiler]-b",
       place_result = "angels-electric-boiler-2",
@@ -188,18 +176,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-electric-boiler-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electric-boiler.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electric-boiler.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-electric-boiler-2"},
       fast_replaceable_group = "angels-electric-boiler",
@@ -326,18 +310,14 @@ data:extend(
     {
       type = "item",
       name = "angels-electric-boiler-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electric-boiler.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electric-boiler.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       subgroup = "boiler-building",
       order = "c[electric-boiler]-c",
       place_result = "angels-electric-boiler-3",
@@ -346,18 +326,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-electric-boiler-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electric-boiler.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electric-boiler.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-electric-boiler-3"},
       fast_replaceable_group = "angels-electric-boiler",
diff --git a/angelspetrochem/prototypes/buildings/electrolyser.lua b/angelspetrochem/prototypes/buildings/electrolyser.lua
index a4fbe77b4..61dd58239 100644
--- a/angelspetrochem/prototypes/buildings/electrolyser.lua
+++ b/angelspetrochem/prototypes/buildings/electrolyser.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "angels-electrolyser",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electrolyser.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electrolyser.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-electrolyser",
       order = "ab[angels-electrolyser]-a",
       place_result = "angels-electrolyser",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-electrolyser",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electrolyser.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electrolyser.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-electrolyser"},
       fast_replaceable_group = "angels-electrolyser",
@@ -138,18 +130,14 @@ data:extend(
     {
       type = "item",
       name = "angels-electrolyser-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electrolyser.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electrolyser.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-electrolyser",
       order = "ab[angels-electrolyser]-b",
       place_result = "angels-electrolyser-2",
@@ -158,18 +146,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-electrolyser-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electrolyser.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electrolyser.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-electrolyser-2"},
       fast_replaceable_group = "angels-electrolyser",
@@ -273,18 +257,14 @@ data:extend(
     {
       type = "item",
       name = "angels-electrolyser-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electrolyser.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electrolyser.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-electrolyser",
       order = "ab[angels-electrolyser]-c",
       place_result = "angels-electrolyser-3",
@@ -293,18 +273,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-electrolyser-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electrolyser.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electrolyser.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-electrolyser-3"},
       fast_replaceable_group = "angels-electrolyser",
@@ -408,18 +384,14 @@ data:extend(
     {
       type = "item",
       name = "angels-electrolyser-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electrolyser.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electrolyser.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-electrolyser",
       order = "ab[angels-electrolyser]-d",
       place_result = "angels-electrolyser-4",
@@ -428,18 +400,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-electrolyser-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/electrolyser.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/electrolyser.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-electrolyser-4"},
       fast_replaceable_group = "angels-electrolyser",
diff --git a/angelspetrochem/prototypes/buildings/gas-refinery.lua b/angelspetrochem/prototypes/buildings/gas-refinery.lua
index aff387636..79c23866c 100644
--- a/angelspetrochem/prototypes/buildings/gas-refinery.lua
+++ b/angelspetrochem/prototypes/buildings/gas-refinery.lua
@@ -4,18 +4,14 @@ data:extend(
     {
       type = "item",
       name = "gas-refinery-small",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-gas-refinery",
       order = "a[gas-refinery-small]-a",
       place_result = "gas-refinery-small",
@@ -24,18 +20,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "gas-refinery-small",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "gas-refinery-small"},
       fast_replaceable_group = "gas-refinery-small",
@@ -129,18 +121,14 @@ data:extend(
     {
       type = "item",
       name = "gas-refinery-small-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-gas-refinery",
       order = "a[gas-refinery-small]-b",
       place_result = "gas-refinery-small-2",
@@ -149,18 +137,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "gas-refinery-small-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "gas-refinery-small-2"},
       fast_replaceable_group = "gas-refinery-small",
@@ -254,18 +238,14 @@ data:extend(
     {
       type = "item",
       name = "gas-refinery-small-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-gas-refinery",
       order = "a[gas-refinery-small]-c",
       place_result = "gas-refinery-small-3",
@@ -274,18 +254,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "gas-refinery-small-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "gas-refinery-small-3"},
       fast_replaceable_group = "gas-refinery-small",
@@ -379,18 +355,14 @@ data:extend(
     {
       type = "item",
       name = "gas-refinery-small-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-gas-refinery",
       order = "a[gas-refinery-small]-d",
       place_result = "gas-refinery-small-4",
@@ -399,18 +371,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "gas-refinery-small-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/gas-refinery-small.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "gas-refinery-small-4"},
       fast_replaceable_group = "gas-refinery-small",
diff --git a/angelspetrochem/prototypes/buildings/oil-refinery.lua b/angelspetrochem/prototypes/buildings/oil-refinery.lua
index 1ee108b18..b98ed682b 100644
--- a/angelspetrochem/prototypes/buildings/oil-refinery.lua
+++ b/angelspetrochem/prototypes/buildings/oil-refinery.lua
@@ -12,19 +12,15 @@ data:extend(
     {
       type = "item",
       name = "oil-refinery-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__base__/graphics/icons/oil-refinery.png",
-          icon_size = 64
+          {
+            icon = "__base__/graphics/icons/oil-refinery.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-oil-refinery",
       order = "b[oil-refinery]-b",
       place_result = "oil-refinery-2",
@@ -33,19 +29,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "oil-refinery-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__base__/graphics/icons/oil-refinery.png",
-          icon_size = 64
+          {
+            icon = "__base__/graphics/icons/oil-refinery.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "oil-refinery-2"},
       fast_replaceable_group = "oil-refinery",
@@ -179,19 +171,15 @@ data:extend(
     {
       type = "item",
       name = "oil-refinery-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__base__/graphics/icons/oil-refinery.png",
-          icon_size = 64
+          {
+            icon = "__base__/graphics/icons/oil-refinery.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-oil-refinery",
       order = "b[oil-refinery]-c",
       place_result = "oil-refinery-3",
@@ -200,19 +188,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "oil-refinery-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__base__/graphics/icons/oil-refinery.png",
-          icon_size = 64
+          {
+            icon = "__base__/graphics/icons/oil-refinery.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "oil-refinery-3"},
       fast_replaceable_group = "oil-refinery",
@@ -346,19 +330,15 @@ data:extend(
     {
       type = "item",
       name = "oil-refinery-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__base__/graphics/icons/oil-refinery.png",
-          icon_size = 64
+          {
+            icon = "__base__/graphics/icons/oil-refinery.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-oil-refinery",
       order = "b[oil-refinery]-d",
       place_result = "oil-refinery-4",
@@ -367,19 +347,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "oil-refinery-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__base__/graphics/icons/oil-refinery.png",
-          icon_size = 64
+          {
+            icon = "__base__/graphics/icons/oil-refinery.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "oil-refinery-4"},
       fast_replaceable_group = "oil-refinery",
diff --git a/angelspetrochem/prototypes/buildings/separator.lua b/angelspetrochem/prototypes/buildings/separator.lua
index a076cd4a9..88a4cb113 100644
--- a/angelspetrochem/prototypes/buildings/separator.lua
+++ b/angelspetrochem/prototypes/buildings/separator.lua
@@ -3,18 +3,14 @@ data:extend(
   {
     type = "item",
     name = "separator",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/separator.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/separator.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_1.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      1, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-oil-refinery",
     order = "a[separator]-a",
     place_result = "separator",
@@ -23,18 +19,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "separator",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/separator.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/separator.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_1.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      1, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "separator"},
     fast_replaceable_group = "separator",
@@ -123,17 +115,14 @@ data:extend(
   {
     type = "item",
     name = "separator-2",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/separator.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/separator.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_2.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
+      2, angelsmods.petrochem.number_tint),
     icon_size = 32,
     subgroup = "petrochem-buildings-oil-refinery",
     order = "a[separator]-b",
@@ -143,18 +132,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "separator-2",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/separator.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/separator.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_2.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      2, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "separator-2"},
     fast_replaceable_group = "separator",
@@ -243,18 +228,14 @@ data:extend(
   {
     type = "item",
     name = "separator-3",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/separator.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/separator.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_3.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      3, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-oil-refinery",
     order = "a[separator]-c",
     place_result = "separator-3",
@@ -263,18 +244,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "separator-3",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/separator.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/separator.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_3.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      3, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "separator-3"},
     fast_replaceable_group = "separator",
@@ -363,18 +340,14 @@ data:extend(
   {
     type = "item",
     name = "separator-4",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/separator.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/separator.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_4.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      4, angelsmods.petrochem.number_tint),
     subgroup = "petrochem-buildings-oil-refinery",
     order = "a[separator]-d",
     place_result = "separator-4",
@@ -383,18 +356,14 @@ data:extend(
   {
     type = "assembling-machine",
     name = "separator-4",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__angelspetrochem__/graphics/icons/separator.png",
+        {
+          icon = "__angelspetrochem__/graphics/icons/separator.png",
+          icon_size = 32, icon_mipmaps = 1,
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_4.png",
-        tint = angelsmods.petrochem.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      4, angelsmods.petrochem.number_tint),
     flags = {"placeable-neutral","player-creation"},
     minable = {mining_time = 1, result = "separator-4"},
     fast_replaceable_group = "separator",
diff --git a/angelspetrochem/prototypes/buildings/steam-cracker.lua b/angelspetrochem/prototypes/buildings/steam-cracker.lua
index e0e6313eb..d26be6f6f 100644
--- a/angelspetrochem/prototypes/buildings/steam-cracker.lua
+++ b/angelspetrochem/prototypes/buildings/steam-cracker.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "steam-cracker",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/steam-cracker.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/steam-cracker.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-steam",
       order = "a[steam-cracker]-a",
       place_result = "steam-cracker",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "steam-cracker",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/steam-cracker.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/steam-cracker.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "steam-cracker"},
       fast_replaceable_group = "steam-cracker",
@@ -164,18 +156,14 @@ data:extend(
     {
       type = "item",
       name = "steam-cracker-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/steam-cracker.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/steam-cracker.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-steam",
       order = "a[steam-cracker]-b",
       place_result = "steam-cracker-2",
@@ -184,18 +172,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "steam-cracker-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/steam-cracker.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/steam-cracker.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "steam-cracker-2"},
       fast_replaceable_group = "steam-cracker",
@@ -309,18 +293,14 @@ data:extend(
     {
       type = "item",
       name = "steam-cracker-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/steam-cracker.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/steam-cracker.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-steam",
       order = "a[steam-cracker]-c",
       place_result = "steam-cracker-3",
@@ -329,18 +309,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "steam-cracker-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/steam-cracker.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/steam-cracker.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "steam-cracker-3"},
       fast_replaceable_group = "steam-cracker",
@@ -454,18 +430,14 @@ data:extend(
     {
       type = "item",
       name = "steam-cracker-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/steam-cracker.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/steam-cracker.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       subgroup = "petrochem-buildings-steam",
       order = "a[steam-cracker]-d",
       place_result = "steam-cracker-4",
@@ -474,18 +446,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "steam-cracker-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelspetrochem__/graphics/icons/steam-cracker.png"
+          {
+            icon = "__angelspetrochem__/graphics/icons/steam-cracker.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.petrochem.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "steam-cracker-4"},
       fast_replaceable_group = "steam-cracker",
diff --git a/angelspetrochem/prototypes/generation/angels-natural-gas.lua b/angelspetrochem/prototypes/generation/angels-natural-gas.lua
index 57b0e67c1..17efee074 100644
--- a/angelspetrochem/prototypes/generation/angels-natural-gas.lua
+++ b/angelspetrochem/prototypes/generation/angels-natural-gas.lua
@@ -17,9 +17,9 @@ angelsmods.functions.add_resource(
     output_name = "gas-natural-1",
     output_min = 20,
     output_max = 20,
-    icon = "__base__/graphics/icons/crude-oil-resource.png",
+    icon = "__angelspetrochem__/graphics/icons/gas.png",
     icon_size = 64,
-    icon_mipmaps = 4,
+    icon_mipmaps = 1,
     stage_counts = {0},
     autoplace = {
       starting_area = false,
diff --git a/angelspetrochem/prototypes/global-override/base-game.lua b/angelspetrochem/prototypes/global-override/base-game.lua
index 4e613f3d4..53ac9f06c 100644
--- a/angelspetrochem/prototypes/global-override/base-game.lua
+++ b/angelspetrochem/prototypes/global-override/base-game.lua
@@ -5,20 +5,14 @@ local move_item = angelsmods.functions.move_item
 -- CHEMICAL PLANTS ------------------------------------------------------------
 -------------------------------------------------------------------------------
 move_item("chemical-plant", "petrochem-buildings-chemical-plant", "a[regular]-aa[vanilla]")
+data.raw["item"]["chemical-plant"].icons = angelsmods.functions.add_number_icon_layer(
+  angelsmods.functions.get_object_icons("chemical-plant"),
+  1, angelsmods.petrochem.number_tint)
 data.raw["item"]["chemical-plant"].icon = nil
-data.raw["item"]["chemical-plant"].icon_size = 32
-data.raw["item"]["chemical-plant"].icons = {
-  {
-    icon = "__base__/graphics/icons/chemical-plant.png",
-    icon_size = 64
-  },
-  {
-    icon = "__angelsrefining__/graphics/icons/num_1.png",
-    tint = angelsmods.petrochem.number_tint,
-    scale = 0.32,
-    shift = {-12, -12}
-  }
-}
+data.raw["item"]["chemical-plant"].icon_size = nil
+data.raw["assembling-machine"]["chemical-plant"].icon = nil
+data.raw["assembling-machine"]["chemical-plant"].icon_size = nil
+data.raw["assembling-machine"]["chemical-plant"].icons = util.table.deepcopy(data.raw["item"]["chemical-plant"].icons)
 data.raw["assembling-machine"]["chemical-plant"].fast_replaceable_group = "chemical-plant"
 angelsmods.functions.add_crafting_category("assembling-machine", "chemical-plant", "liquifying")
 
@@ -38,20 +32,14 @@ end
 -------------------------------------------------------------------------------
 -- oil refinery
 move_item("oil-refinery", "petrochem-buildings-oil-refinery", "b[oil-refinery]-a")
+data.raw["item"]["oil-refinery"].icons = angelsmods.functions.add_number_icon_layer(
+  angelsmods.functions.get_object_icons("oil-refinery"),
+  1, angelsmods.petrochem.number_tint)
 data.raw["item"]["oil-refinery"].icon = nil
-data.raw["item"]["oil-refinery"].icon_size = 32
-data.raw["item"]["oil-refinery"].icons = {
-  {
-    icon = "__base__/graphics/icons/oil-refinery.png",
-    icon_size = 64
-  },
-  {
-    icon = "__angelsrefining__/graphics/icons/num_1.png",
-    tint = angelsmods.petrochem.number_tint,
-    scale = 0.32,
-    shift = {-12, -12}
-  }
-}
+data.raw["item"]["oil-refinery"].icon_size = nil
+data.raw["assembling-machine"]["oil-refinery"].icon = nil
+data.raw["assembling-machine"]["oil-refinery"].icon_size = nil
+data.raw["assembling-machine"]["oil-refinery"].icons = util.table.deepcopy(data.raw["item"]["oil-refinery"].icons)
 data.raw["assembling-machine"]["oil-refinery"].fast_replaceable_group = "oil-refinery"
 
 -- oil processing
@@ -110,15 +98,12 @@ OV.remove_unlock("kovarex-enrichment-process", "nuclear-fuel")
 data.raw["recipe"]["explosives"].subgroup = "petrochem-solids-2"
 data.raw["recipe"]["explosives"].order = "a[explosives]-a"
 data.raw["recipe"]["explosives"].icon_size = 32
-data.raw["recipe"]["explosives"].icons = {
+data.raw["recipe"]["explosives"].icons = angelsmods.functions.add_number_icon_layer(
   {
-    icon = "__base__/graphics/icons/explosives.png",
-    icon_size = 64
+    {
+      icon = "__base__/graphics/icons/explosives.png",
+      icon_size = 64, icon_mipmaps = 4,
+      scale = 0.5
+    }
   },
-  {
-    icon = "__angelsrefining__/graphics/icons/num_1.png",
-    tint = angelsmods.petrochem.number_tint,
-    scale = 0.32,
-    shift = {-12, -12}
-  }
-}
+  1, angelsmods.petrochem.number_tint)
diff --git a/angelspetrochem/prototypes/global-override/bobassembly.lua b/angelspetrochem/prototypes/global-override/bobassembly.lua
index 5169d4e8a..373891dd4 100644
--- a/angelspetrochem/prototypes/global-override/bobassembly.lua
+++ b/angelspetrochem/prototypes/global-override/bobassembly.lua
@@ -199,4 +199,4 @@ if mods["bobplates"] then
       --angelsmods.functions.add_crafting_category("assembling-machine", "angels-chemical-plant-5", "distillery")
     end
   end
-end
+end
\ No newline at end of file
diff --git a/angelspetrochem/prototypes/global-override/bobplates.lua b/angelspetrochem/prototypes/global-override/bobplates.lua
index c19351260..04d04162c 100644
--- a/angelspetrochem/prototypes/global-override/bobplates.lua
+++ b/angelspetrochem/prototypes/global-override/bobplates.lua
@@ -28,6 +28,16 @@ if mods["bobplates"] then
       "air-compressor-4"
     }
   )
+  
+  OV.hide_recipe(
+    {
+      "air-pump",
+      "air-pump-2",
+      "air-pump-3",
+      "air-pump-4",
+      "void-pump",
+    }
+  )
 end
 
 -------------------------------------------------------------------------------
@@ -49,6 +59,16 @@ if mods["bobplates"] then
     data.raw["storage-tank"]["angels-storage-tank-1"].fluid_box.base_area = 2000
     data.raw["storage-tank"]["angels-storage-tank-2"].fluid_box.base_area = 1500
   end
+  -- electrolysis -------------------------------------------------------------
+  --move small tanks to fluid-control
+  OV.add_unlock("angels-fluid-control","bob-small-storage-tank")
+  OV.add_unlock("angels-fluid-control","bob-small-inline-storage-tank")
+  OV.disable_technology({"electrolysis-1","electrolysis-2"})
+  --clean-up pre-requisites
+  OV.remove_prereq("steel-processing","electrolysis-1")
+  OV.remove_prereq("lithium-processing","electrolysis-1")
+  OV.remove_prereq("chemical-processing-2","electrolysis-2")
+  OV.remove_prereq("plastics","electrolysis-2")
 end
 
 -------------------------------------------------------------------------------
@@ -156,7 +176,28 @@ if mods["bobplates"] then
   move_item("enriched-fuel", "petrochem-fuel", "a[solid-fuel]-b")
   OV.patch_recipes({{name = "enriched-fuel-from-liquid-fuel", subgroup = "petrochem-fuel", order = "g"}})
   OV.disable_technology({"oil-processing-2", "oil-processing-3", "oil-processing-4"})
-
+  --hide disabled
+  OV.hide_recipe(
+    {
+      "bob-oil-processing",
+      "hydrogen-sulfide",
+      "sulfur-dioxide",
+      "coal-cracking",
+      "hydrogen-chloride",
+      "petroleum-gas-cracking",
+      "nitric-acid",
+      "nitrogen-dioxide",
+      "nitrogen",
+      "sulfuric-acid-2",
+      "sulfuric-acid-3",
+      "bob-liquid-air",
+      "solid-fuel-from-hydrogen",
+      "sulfur",
+      "sulfur-2",
+      "sulfur-3",
+      "carbon",
+    }
+  )
   -- plastics -----------------------------------------------------------------
   OV.remove_unlock("plastics", "plastic-bar")
 
@@ -196,36 +237,30 @@ if mods["bobplates"] then
         },
         subgroup = "petrochem-solids",
         order = "b[resin]-b[solid]-a",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__bobplates__/graphics/icons/resin.png"
+            {
+              icon = "__bobplates__/graphics/icons/resin.png",
+              icon_size = 32, icon_mipmaps = 1,
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.petrochem.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32
+          1, angelsmods.petrochem.number_tint),
       },
       {
         name = "solid-resin",
         order = "b[resin]-b[solid]-b",
-        icons = {
+        icons = mods["angelsbioprocessing"] and {
           {
-            icon = "__bobplates__/graphics/icons/resin.png"
+            icon = "__bobplates__/graphics/icons/resin.png",
+            icon_size = 32, icon_mipmaps = 1,
           },
-          not mods["angelsbioprocessing"] and
-            {
-              icon = "__angelsrefining__/graphics/icons/num_2.png",
-              tint = angelsmods.petrochem.number_tint,
-              scale = 0.32,
-              shift = {-12, -12}
-            } or
-            nil
+        } or angelsmods.functions.add_number_icon_layer({
+          {
+            icon = "__bobplates__/graphics/icons/resin.png",
+            icon_size = 32, icon_mipmaps = 1,
+          }
         },
-        icon_size = 32
+        2, angelsmods.petrochem.number_tint),
       }
     }
   )
@@ -256,35 +291,27 @@ if mods["bobplates"] then
         },
         subgroup = "petrochem-solids-2",
         order = "b[rubber]-b[solid]-a",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__bobplates__/graphics/icons/rubber.png"
+            {
+              icon = "__bobplates__/graphics/icons/rubber.png",
+              icon_size = 32, icon_mipmaps = 1,
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.petrochem.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32
+          1, angelsmods.petrochem.number_tint),
       },
       {
         name = "solid-rubber",
         subgroup = "petrochem-solids-2",
         order = "b[rubber]-b[solid]-a",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__bobplates__/graphics/icons/rubber.png"
+            {
+              icon = "__bobplates__/graphics/icons/rubber.png",
+              icon_size = 32, icon_mipmaps = 1,
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            tint = angelsmods.petrochem.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          }
-        },
-        icon_size = 32
+          2, angelsmods.petrochem.number_tint),
       }
     }
   )
diff --git a/angelspetrochem/prototypes/global-override/bobrevamp.lua b/angelspetrochem/prototypes/global-override/bobrevamp.lua
index 8ac722ee1..0fc800231 100644
--- a/angelspetrochem/prototypes/global-override/bobrevamp.lua
+++ b/angelspetrochem/prototypes/global-override/bobrevamp.lua
@@ -20,8 +20,8 @@ if mods["bobrevamp"] then
   OV.remove_unlock("angels-oil-processing", "solid-fuel-naphtha")
   OV.remove_unlock("gas-processing", "solid-fuel-methane")
 
-  OV.add_unlock("flammables", "solid-fuel-naphtha")
   OV.add_unlock("flammables", "solid-fuel-fuel-oil")
+  OV.add_unlock("flammables", "solid-fuel-naphtha")
   OV.add_unlock("angels-advanced-gas-processing", "solid-fuel-methane")
 
   OV.add_prereq("angels-advanced-gas-processing", "flammables")
@@ -54,6 +54,28 @@ if mods["bobrevamp"] then
   angelsmods.functions.add_flag("sour-gas", "hidden")
   angelsmods.functions.disable_barreling_recipes("sour-gas")
 
+  OV.hide_recipe("ammonia")
+  OV.converter_fluid("ammonia", "gas-ammonia")
+  angelsmods.functions.disable_barreling_recipes("ammonia")
+
+  if mods["bobplates"] and settings.startup["bobmods-revamp-old-oil"] then
+    OV.hide_recipe(
+      {
+        "oil-processing-with-sulfur",
+        "oil-processing-with-sulfur-dioxide",
+        "oil-processing-with-sulfur-dioxide-2",
+        "oil-processing-with-sulfur-dioxide-3",
+      }
+    )
+  end
+  if mods["bobplates"] and settings.startup["bobmods-revamp-oil"] then
+    OV.hide_recipe(
+      {
+        "solid-fuel-from-sour-gas",
+      }
+    )
+  end
+
   if angelsmods.trigger.disable_bobs_chemical_plants then
     OV.global_replace_technology("chemical-plant", "basic-chemistry-2")
   end
@@ -62,17 +84,19 @@ if mods["bobrevamp"] then
   -- HARDMODE -----------------------------------------------------------------
   -----------------------------------------------------------------------------
   if mods["bobplates"] and settings.startup["bobmods-revamp-hardmode"].value then
+    OV.hide_recipe("carbon-dioxide-oil-processing")
     --disable all the recipes
     --NaClO3+H2O-->NaClO4+H2
-    OV.remove_unlock("lithium-processing", "sodium-perchlorate")
+    --OV.remove_unlock("lithium-processing", "sodium-perchlorate")
     --NaCl+H2O-->NaClO3+H2O
-    OV.remove_unlock("lithium-processing", "sodium-chlorate")
+    --OV.remove_unlock("lithium-processing", "sodium-chlorate")
+    OV.disable_recipe({"sodium-chlorate","sodium-perchlorate"})
     --make pre-reqs match new unlock point
     OV.add_prereq("battery-2", "chlorine-processing-3")
 
     OV.converter_fluid("carbon-dioxide", "gas-carbon-dioxide")
     angelsmods.functions.disable_barreling_recipes("carbon-dioxide")
-    OV.remove_unlock("chemical-processing-2", "carbon-dioxide")
+    --OV.remove_unlock("chemical-processing-2", "carbon-dioxide")
 
     OV.global_replace_item("sodium-carbonate", "solid-sodium-carbonate")
     angelsmods.functions.add_flag("sodium-carbonate", "hidden")
@@ -83,12 +107,9 @@ if mods["bobrevamp"] then
     OV.global_replace_item("sodium-chlorate", "solid-sodium-chlorate")
     angelsmods.functions.add_flag("sodium-chlorate", "hidden")
 
-    OV.converter_fluid("ammonia", "gas-ammonia")
-    angelsmods.functions.disable_barreling_recipes("ammonia")
-
     OV.converter_fluid("nitric-oxide", "gas-nitrogen-monoxide")
     angelsmods.functions.disable_barreling_recipes("nitric-oxide")
-
+    
     OV.converter_fluid("nitric-dioxide", "gas-nitrogen-dioxide")
     angelsmods.functions.disable_barreling_recipes("nitric-dioxide")
 
@@ -103,7 +124,17 @@ if mods["bobrevamp"] then
     OV.global_replace_technology("hydrazine", "angels-nitrogen-processing-3")
 
     --OV.global_replace_technology("rocket-fuel", "angels-rocket-fuel")
-    OV.remove_unlock("rocket-fuel", "dinitrogen-tetroxide")
+    --OV.remove_unlock("rocket-fuel", "dinitrogen-tetroxide")
+    OV.disable_recipe(
+      {
+        "dinitrogen-tetroxide",
+        "nitric-oxide",
+        "hydrazine",
+        "hydrogen-peroxide",
+        "carbon-dioxide",
+        "enriched-fuel-from-hydrazine",
+      }
+    )
   end
 
   -----------------------------------------------------------------------------
diff --git a/angelspetrochem/prototypes/global-override/bobtech.lua b/angelspetrochem/prototypes/global-override/bobtech.lua
index 42682458f..1a20d9470 100644
--- a/angelspetrochem/prototypes/global-override/bobtech.lua
+++ b/angelspetrochem/prototypes/global-override/bobtech.lua
@@ -4,10 +4,5 @@ local OV = angelsmods.functions.OV
 -- STEAM BURNER PHASE ---------------------------------------------------------
 -------------------------------------------------------------------------------
 if mods["bobtech"] and settings.startup["bobmods-burnerphase"].value then
-  OV.add_prereq("basic-chemistry", "ore-crushing")
-
-  OV.add_prereq("angels-fluid-control", "steel-processing")
-  if mods["bobplates"] then
-    OV.add_prereq("angels-fluid-control", "electrolysis-1")
-  end
-end
\ No newline at end of file
+  --do nothing
+end
diff --git a/angelspetrochem/prototypes/override/angelspetrochem.lua b/angelspetrochem/prototypes/override/angelspetrochem.lua
index b71e4714f..66131f962 100644
--- a/angelspetrochem/prototypes/override/angelspetrochem.lua
+++ b/angelspetrochem/prototypes/override/angelspetrochem.lua
@@ -174,6 +174,15 @@ else -- special vanilla
   )
 end
 
+-------------------------------------------------------------------------------
+-- VALVES ---------------------------------------------------------------------
+-------------------------------------------------------------------------------
+if angelsmods.trigger.enableconverter then
+else
+  angelsmods.functions.add_flag("valve-converter", "hidden")
+  OV.disable_recipe("valve-converter")
+end
+
 -------------------------------------------------------------------------------
 -- SPECIAL VANILLA ------------------------------------------------------------
 -------------------------------------------------------------------------------
diff --git a/angelspetrochem/prototypes/override/angelsrefining.lua b/angelspetrochem/prototypes/override/angelsrefining.lua
index 061e75c80..b3dd6dec2 100644
--- a/angelspetrochem/prototypes/override/angelsrefining.lua
+++ b/angelspetrochem/prototypes/override/angelsrefining.lua
@@ -6,16 +6,16 @@ local move_item = angelsmods.functions.move_item
 -------------------------------------------------------------------------------
 if angelsmods.refining then
   move_item("liquifier", "petrochem-buildings-electrolyser", "c[liquifier]-a")
-  data.raw["item"]["liquifier"].icons[2].tint = angelsmods.petrochem.number_tint
+  data.raw["item"]["liquifier"].icons[3].tint = angelsmods.petrochem.number_tint
 
   move_item("liquifier-2", "petrochem-buildings-electrolyser", "c[liquifier]-b")
-  data.raw["item"]["liquifier-2"].icons[2].tint = angelsmods.petrochem.number_tint
+  data.raw["item"]["liquifier-2"].icons[3].tint = angelsmods.petrochem.number_tint
 
   move_item("liquifier-3", "petrochem-buildings-electrolyser", "c[liquifier]-c")
-  data.raw["item"]["liquifier-3"].icons[2].tint = angelsmods.petrochem.number_tint
+  data.raw["item"]["liquifier-3"].icons[3].tint = angelsmods.petrochem.number_tint
 
   move_item("liquifier-4", "petrochem-buildings-electrolyser", "c[liquifier]-d")
-  data.raw["item"]["liquifier-4"].icons[2].tint = angelsmods.petrochem.number_tint
+  data.raw["item"]["liquifier-4"].icons[3].tint = angelsmods.petrochem.number_tint
 
   angelsmods.functions.add_crafting_category("assembling-machine", "advanced-chemical-plant", "liquifying")
   angelsmods.functions.add_crafting_category("assembling-machine", "advanced-chemical-plant-2", "liquifying")
diff --git a/angelspetrochem/prototypes/override/base-game.lua b/angelspetrochem/prototypes/override/base-game.lua
index a406e0216..365a1d18e 100644
--- a/angelspetrochem/prototypes/override/base-game.lua
+++ b/angelspetrochem/prototypes/override/base-game.lua
@@ -81,7 +81,7 @@ local function remove_item(tab, liquid)
     end
   end
 end
-
+--do we want to add all "thermal fluids" to this list... in particular, in exploration?
 local turret_params = data.raw["fluid-turret"]["flamethrower-turret"].attack_parameters.fluids
 remove_item(turret_params, {"heavy-oil", "light-oil"})
 table.insert(turret_params, {type = "liquid-naphtha", damage_modifier = 1.05})
@@ -135,3 +135,14 @@ OV.add_prereq("rocketry", "rocket-booster-1")
 
 angelsmods.functions.move_item("cliff-explosives", "petrochem-solids", "b[petrochem-solids-2]-b[cliff-explosives]", "capsule")
 angelsmods.functions.move_item("cliff-explosives", "petrochem-solids-2", "a[explosives]-d", "recipe")
+--hide disabled vanilla recipes
+OV.hide_recipe({
+  "basic-oil-processing",
+  "advanced-oil-processing",
+  "solid-fuel-from-light-oil",
+  "solid-fuel-from-petroleum-gas",
+  "solid-fuel-from-heavy-oil",
+  "light-oil-cracking",
+  "heavy-oil-cracking",
+  "sulfuric-acid"
+})
diff --git a/angelspetrochem/prototypes/override/bobplates.lua b/angelspetrochem/prototypes/override/bobplates.lua
index 48f95464b..5ebc07d23 100644
--- a/angelspetrochem/prototypes/override/bobplates.lua
+++ b/angelspetrochem/prototypes/override/bobplates.lua
@@ -6,7 +6,6 @@ if mods["bobplates"] then
 
   OV.set_science_pack("electric-engine", "chemical-science-pack")
 end
-
 -------------------------------------------------------------------------------
 -- CONVERT FLUIDS TO ANGELS VERSION -------------------------------------------
 -------------------------------------------------------------------------------
@@ -61,64 +60,49 @@ end
 --Do this regardless of settings
 --base fluid is methane, all others are based on relative real values
 --==BASED ON VOULMETRIC NUMBERS divided by 10, using methane as the base
-if mods["bobplates"] then
+local Energy_table = {
   --liquid Naphtha (heavy oil), bobs value is 1MJ (Heavy fuel oil 38.2 MJ/L)(39 MJ/kg)
-  data.raw.fluid["liquid-naphtha"].fuel_value = "244.7kJ"
-  data.raw.fluid["liquid-naphtha"].emissions_multiplier = 3
-
+  ["liquid-naphtha"]  = { fv = 244.7, em = 3, turr = false}, 
+  ["heavy-oil"]       = { fv = angelsmods.trigger.enableconverter and 244.7 or nil, turr = angelsmods.trigger.enableconverter and true or false},
   --liquid Fuel oil (light oil), bobs value 1.5MJ (light fuel oil 39 MJ/L)(40.6 MJ/kg)
-  data.raw.fluid["liquid-fuel-oil"].fuel_value = "249.9kJ" -- was 24.99kJ
-  data.raw.fluid["liquid-fuel-oil"].emissions_multiplier = 2
-
-  --gas methane (petrogas), bobs value 2.3MJ (methane 35.9 MJ/L)(49.85 MJ/kg)
-  data.raw.fluid["gas-methane"].fuel_value = "230.0kJ"
-
-  --gas ethane (), - (ethane 60.7 MJ/L)(47.2 MJ/kg)
-  data.raw.fluid["gas-ethane"].fuel_value = "388.9kJ"
-  data.raw.fluid["gas-ethane"].emissions_multiplier = 1.5
-
-  --gas butane (), - (butane 110.9 MJ/L)(46.46 MJ/kg)
-  data.raw.fluid["gas-butane"].fuel_value = "710.5kJ"
-  data.raw.fluid["gas-butane"].emissions_multiplier = 1.8
-
-  --gas propene (), - (propylene 81.4 MJ/L)(45.8 MJ/kg)
-  data.raw.fluid["gas-propene"].fuel_value = "521.5kJ"
-  data.raw.fluid["gas-propene"].emissions_multiplier = 5
-
-  --gas methanol (), - (methanol(L) 15.8 MJ/L)(19.9 MJ/kg)
-  data.raw.fluid["gas-methanol"].fuel_value = "101.2kJ"
-
-  --gas ethylene (), - (ethylene 57.0 MJ/L)(47.7 MJ/kg)
-  data.raw.fluid["gas-ethylene"].fuel_value = "365.2kJ"
-
-  --gas benzene (), - (benzene 133.8 MJ/L)(40.5 MJ/kg)
-  data.raw.fluid["gas-benzene"].fuel_value = "857.2kJ"
-
-  --liquid crude (crude oil)
-  data.raw.fluid["crude-oil"].fuel_value = "1000kJ"
-
-  --gas hydrogen (), bobs value is 45kJ (hydrogen 10.3 MJ/L)(120.1 MJ/kg)
-  -->>(may need to go much lower) meant to be 66kJ, but dropped to 33 for reasons.
-  data.raw.fluid["gas-hydrogen"].fuel_value = "33kJ"
-  data.raw.fluid["gas-hydrogen"].emissions_multiplier = 0.2
-
-  --gas hydrazine (), bobs value is 340kJ (hydrazine 19.8 MJ/L)(19.4 MJ/kg)
-  data.raw.fluid["gas-hydrazine"].fuel_value = "126.9kJ"
-  data.raw.fluid["gas-hydrazine"].emissions_multiplier = 0.1
-
+  ["liquid-fuel-oil"] = { fv = 249.9, em = 2, turr = false}, --was 24.99kJ
+  ["light-oil"]       = { fv = angelsmods.trigger.enableconverter and 249.9 or nil, turr = angelsmods.trigger.enableconverter and true or false},
+  --gas methane (petrogas), bobs value 2.3MJ (methane 35.9 MJ/L)(49.85 MJ/kg) 
+  ["gas-methane"]     = { fv = 230},
+  ["petroleum-gas"]   = { fv = angelsmods.trigger.enableconverter and 230 or nil, turr = angelsmods.trigger.enableconverter and true or false}, 
+  ["gas-ethane"]      = { fv = 388.9, em = 1.5}, --gas ethane (), - (ethane 60.7 MJ/L)(47.2 MJ/kg)
+  ["gas-butane"]      = { fv = 710.5, em = 1.8}, --gas butane (), - (butane 110.9 MJ/L)(46.46 MJ/kg)
+  ["gas-propene"]     = { fv = 521.5, em = 5}, --gas propene (), - (propylene 81.4 MJ/L)(45.8 MJ/kg)
+  ["gas-methanol"]    = { fv = 101.2}, --gas methanol (), - (methanol(L) 15.8 MJ/L)(19.9 MJ/kg)
+  ["gas-ethylene"]    = { fv = 365.2}, --gas ethylene (), - (ethylene 57.0 MJ/L)(47.7 MJ/kg)
+  ["crude-oil"]       = { fv = 1000, turr = false}, --liquid crude (crude oil)
+  ["gas-hydrogen"]    = { fv = 33, em = 0.2--[[>>(may need to go much lower) meant to be 66kJ, but dropped to 33 for reasons.]]}, --gas hydrogen (), bobs value is 45kJ (hydrogen 10.3 MJ/L)(120.1 MJ/kg)
+  ["gas-hydrazine"]   = { fv = 126.9, em = 0.1}, --gas hydrazine (), bobs value is 340kJ (hydrazine 19.8 MJ/L)(19.4 MJ/kg)
+  ["liquid-fuel"]     = { fv = 300, em = 1.5, turr = false}, --down from 2.3MJ
+  ["gas-ethanol"]     = { fv = mods["angelsbioprocessing"] and 135.2 or nil}, --liquid ethanol (), - (ethanol(L) 21.1 MJ/L)(26.7 MJ/kg)
+}
+local turret_params = data.raw["fluid-turret"]["flamethrower-turret"].attack_parameters.fluids
+  
+if mods["bobplates"] then
+  for fluid, vals in pairs(Energy_table) do
+    if vals.fv then
+      data.raw.fluid[fluid].fuel_value = vals.fv .."kJ"
+      data.raw.fluid[fluid].emmissions_multiplier = vals.em or 1
+      if vals.turr ~= false then
+        table.insert(turret_params, {type = fluid, damage_modifier = vals.fv/Energy_table["gas-methane"].fv})
+      end
+    end
+  end
   --fuel oil balancing
-  data.raw.fluid["liquid-fuel"].fuel_value = "300kJ" --down from 2.3MJ
   data.raw.recipe["enriched-fuel-from-liquid-fuel"].ingredients = {{type = "fluid", name = "liquid-fuel", amount = 100}} --up from 20
-
-  if mods["angelsbioprocessing"] then
-    --liquid ethanol (), - (ethanol(L) 21.1 MJ/L)(26.7 MJ/kg)
-    data.raw.fluid["gas-ethanol"].fuel_value = "135.2kJ"
-  end
-  --updates for conversion valve settings
-  if angelsmods.trigger.enableconverter then
-    data.raw.fluid["heavy-oil"].fuel_value = "244.7kJ"
-    data.raw.fluid["light-oil"].fuel_value = "249.9kJ"
-    data.raw.fluid["petroleum-gas"].fuel_value = "230.0kJ"
-    --data.raw.fluid["crude-oil"].fuel_value = "1000kJ"
-  end
 end
+-------------------------------------------------------------------------------
+-- TECH TREE CLEANUP ----------------------------------------------------------
+-------------------------------------------------------------------------------
+if mods["bobplates"] then 
+  -- electronics tech patch ---------------------------------------------------
+  OV.remove_prereq("electronics","alloy-processing")
+  if mods["bobelectronics"] then
+    OV.add_prereq("electronics","angels-coal-processing")
+  end
+end
\ No newline at end of file
diff --git a/angelspetrochem/prototypes/recipes/petrochem-basics.lua b/angelspetrochem/prototypes/recipes/petrochem-basics.lua
index e535710ba..ef20ce8a5 100644
--- a/angelspetrochem/prototypes/recipes/petrochem-basics.lua
+++ b/angelspetrochem/prototypes/recipes/petrochem-basics.lua
@@ -59,6 +59,25 @@ data:extend(
         {type = "item", name = "slag", amount = 1}
       },
       always_show_products = true,
+      --icons = angelsmods.functions.create_gas_recipe_icon(
+      --  {
+      --    {"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72},
+      --    {"__angelspetrochem__/graphics/icons/molecules/hydrogen.png", 72}
+      --  },
+      --  "ohh",
+      --  {
+      --    {
+      --      {
+      --        icon = "__angelsrefining__/graphics/icons/num_1.png",
+      --        icon_size = 32,
+      --        tint = angelsmods.petrochem.number_tint
+      --        --scale = 0.32,
+      --        --shift = {-12, -12},
+      --      }
+      --    },
+      --    "water"
+      --  }
+      --),
       icons = angelsmods.functions.create_gas_recipe_icon(
         {
           {"__angelspetrochem__/graphics/icons/molecules/oxygen.png", 72},
@@ -66,15 +85,7 @@ data:extend(
         },
         "ohh",
         {
-          {
-            {
-              icon = "__angelsrefining__/graphics/icons/num_1.png",
-              icon_size = 32,
-              tint = angelsmods.petrochem.number_tint
-              --scale = 0.32,
-              --shift = {-12, -12},
-            }
-          },
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint),
           "water"
         }
       ),
@@ -110,15 +121,7 @@ data:extend(
         },
         "ohh",
         {
-          {
-            {
-              icon = "__angelsrefining__/graphics/icons/num_2.png",
-              icon_size = 32,
-              tint = angelsmods.petrochem.number_tint
-              --scale = 0.32,
-              --shift = {-12, -12},
-            }
-          },
+          angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint),
           "water"
         }
       ),
@@ -151,15 +154,7 @@ data:extend(
         },
         "ohh",
         {
-          {
-            {
-              icon = "__angelsrefining__/graphics/icons/num_1.png",
-              icon_size = 32,
-              tint = angelsmods.petrochem.number_tint
-              --scale = 0.32,
-              --shift = {-12, -12},
-            }
-          },
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint),
           "water-purified"
         }
       ),
@@ -194,15 +189,7 @@ data:extend(
         },
         "ohh",
         {
-          {
-            {
-              icon = "__angelsrefining__/graphics/icons/num_2.png",
-              icon_size = 32,
-              tint = angelsmods.petrochem.number_tint
-              --scale = 0.32,
-              --shift = {-12, -12},
-            }
-          },
+          angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint),
           "water-purified"
         }
       ),
@@ -492,18 +479,9 @@ data:extend(
       results = {
         {type = "item", name = "solid-carbon", amount = 3}
       },
-      icons = {
-        {
-          icon = "__angelspetrochem__/graphics/icons/solid-carbon.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-carbon"),
+        1, angelsmods.petrochem.number_tint),
       order = "d[coke-purification]",
       crafting_machine_tint = {
         primary = {r = 1, g = 0.5, b = 0.5, a = 0},
@@ -528,18 +506,9 @@ data:extend(
         {type = "item", name = "solid-sodium-carbonate", amount = 1},
         {type = "fluid", name = "water", amount = 10}
       },
-      icons = {
-        {
-          icon = "__angelspetrochem__/graphics/icons/solid-carbon.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-carbon"),
+        2, angelsmods.petrochem.number_tint),
       order = "d[coke-purification]",
       crafting_machine_tint = {
         primary = {r = 1, g = 0.5, b = 0.5, a = 0},
@@ -577,18 +546,9 @@ data:extend(
       results = {
         {type = "item", name = "solid-coke", amount = 2}
       },
-      icons = {
-        {
-          icon = "__angelspetrochem__/graphics/icons/solid-coke.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-coke"),
+        1, angelsmods.petrochem.number_tint),
       order = "b[coal-crushed]"
     },
     {
@@ -606,18 +566,9 @@ data:extend(
         {type = "item", name = "solid-coke", amount = 2},
         {type = "fluid", name = "water-yellow-waste", amount = 50}
       },
-      icons = {
-        {
-          icon = "__angelspetrochem__/graphics/icons/solid-coke.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("solid-coke"),
+        2, angelsmods.petrochem.number_tint),
       order = "c[solid-coke-sulfur]",
       crafting_machine_tint = {
         primary = {r = 1, g = 0.5, b = 0.5, a = 0},
@@ -668,11 +619,7 @@ data:extend(
         },
         "odh",
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            icon_size = 32,
-            tint = angelsmods.refining.number_tint
-          },
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.refining.number_tint),
           {
             icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png",
             icon_size = 72
@@ -706,11 +653,7 @@ data:extend(
         },
         "odh",
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            icon_size = 32,
-            tint = angelsmods.refining.number_tint
-          },
+          angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.refining.number_tint),
           {
             icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png",
             icon_size = 72
@@ -744,11 +687,7 @@ data:extend(
         },
         "odh",
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_3.png",
-            icon_size = 32,
-            tint = angelsmods.refining.number_tint
-          },
+          angelsmods.functions.add_number_icon_layer({}, 3, angelsmods.refining.number_tint),
           {
             icon = "__angelspetrochem__/graphics/icons/molecules/hydrogen-sulfide.png",
             icon_size = 72
@@ -780,11 +719,7 @@ data:extend(
         },
         "odh",
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            icon_size = 32,
-            tint = angelsmods.refining.number_tint
-          },
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.refining.number_tint),
           mods["angelssmelting"] and
             {
               icon = "__angelssmelting__/graphics/icons/liquid-coolant.png",
@@ -818,11 +753,7 @@ data:extend(
         },
         "odh",
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            icon_size = 32,
-            tint = angelsmods.refining.number_tint
-          },
+          angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.refining.number_tint),
           mods["angelssmelting"] and
             {
               icon = "__angelssmelting__/graphics/icons/liquid-coolant.png",
@@ -856,11 +787,7 @@ data:extend(
         },
         "odh",
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_3.png",
-            icon_size = 32,
-            tint = angelsmods.refining.number_tint
-          },
+          angelsmods.functions.add_number_icon_layer({}, 3, angelsmods.refining.number_tint),
           mods["angelssmelting"] and
             {
               icon = "__angelssmelting__/graphics/icons/liquid-coolant.png",
@@ -955,15 +882,7 @@ data:extend(
         },
         "odd",
         {
-          {
-            {
-              icon = "__angelsrefining__/graphics/icons/num_1.png",
-              icon_size = 32,
-              tint = angelsmods.petrochem.number_tint
-              --scale = 0.32,
-              --shift = {-12, -12},
-            }
-          },
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint),
           {"__angelspetrochem__/graphics/icons/molecules/heavy-water.png", 64}
         }
       ),
@@ -998,15 +917,7 @@ data:extend(
         },
         "odd",
         {
-          {
-            {
-              icon = "__angelsrefining__/graphics/icons/num_2.png",
-              icon_size = 32,
-              tint = angelsmods.petrochem.number_tint
-              --scale = 0.32,
-              --shift = {-12, -12},
-            }
-          },
+          angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint),
           {"__angelspetrochem__/graphics/icons/molecules/heavy-water.png", 64}
         }
       ),
diff --git a/angelspetrochem/prototypes/recipes/petrochem-solids.lua b/angelspetrochem/prototypes/recipes/petrochem-solids.lua
index 2533b850d..b21ab28aa 100644
--- a/angelspetrochem/prototypes/recipes/petrochem-solids.lua
+++ b/angelspetrochem/prototypes/recipes/petrochem-solids.lua
@@ -49,11 +49,7 @@ data:extend(
         nil,
         {{255, 255, 255}, {255, 255, 255}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            icon_size = 32,
-            tint = angelsmods.petrochem.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint),
         }
       ),
       order = "a[plastic]-a[liquid]-a"
@@ -77,11 +73,7 @@ data:extend(
         nil,
         {{255, 255, 255}, {255, 255, 255}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            icon_size = 32,
-            tint = angelsmods.petrochem.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint),
         }
       ),
       order = "a[plastic]-a[liquid]-b"
@@ -105,11 +97,7 @@ data:extend(
         nil,
         {{255, 255, 255}, {255, 255, 255}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_3.png",
-            icon_size = 32,
-            tint = angelsmods.petrochem.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 3, angelsmods.petrochem.number_tint),
         }
       ),
       order = "a[plastic]-a[liquid]-c"
@@ -164,11 +152,7 @@ data:extend(
         nil,
         {{255, 225, 155}, {255, 225, 155}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            icon_size = 32,
-            tint = angelsmods.petrochem.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint),
         }
       ),
       order = "b[resin]-a[liquid]-a"
@@ -192,11 +176,7 @@ data:extend(
         nil,
         {{255, 225, 155}, {255, 225, 155}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            icon_size = 32,
-            tint = angelsmods.petrochem.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 2, angelsmods.petrochem.number_tint),
         }
       ),
       order = "b[resin]-a[liquid]-b"
@@ -220,11 +200,7 @@ data:extend(
         nil,
         {{255, 225, 155}, {255, 225, 155}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_3.png",
-            icon_size = 32,
-            tint = angelsmods.petrochem.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 3, angelsmods.petrochem.number_tint),
         }
       ),
       order = "b[resin]-a[liquid]-c"
@@ -279,11 +255,7 @@ data:extend(
         nil,
         {{193, 197, 255}, {193, 197, 255}},
         {
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            icon_size = 32,
-            tint = angelsmods.petrochem.number_tint
-          }
+          angelsmods.functions.add_number_icon_layer({}, 1, angelsmods.petrochem.number_tint),
         }
       ),
       order = "b[rubber]-a[liquid]"
@@ -587,19 +559,9 @@ data:extend(
       results = {
         {type = "item", name = "explosives", amount = 2}
       },
-      icons = {
-        {
-          icon = "__base__/graphics/icons/explosives.png",
-          icon_size = 64
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("explosives"),
+        2, angelsmods.petrochem.number_tint),
       main_product = "explosives",
       order = "a[explosives]-b"
     },
@@ -620,19 +582,9 @@ data:extend(
         {type = "item", name = "explosives", amount = 3},
         {type = "fluid", name = "water-yellow-waste", amount = 25}
       },
-      icons = {
-        {
-          icon = "__base__/graphics/icons/explosives.png",
-          icon_size = 64
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.petrochem.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("explosives"),
+        3, angelsmods.petrochem.number_tint),
       main_product = "explosives",
       order = "a[explosives]-c"
     }
diff --git a/angelspetrochem/settings-updates.lua b/angelspetrochem/settings-updates.lua
index cd469fb58..dfd252a06 100644
--- a/angelspetrochem/settings-updates.lua
+++ b/angelspetrochem/settings-updates.lua
@@ -1,16 +1,7 @@
-local function hide_setting(setting_type, setting_name, setting_default)
-  if data.raw[setting_type] and data.raw[setting_type][setting_name] then
-    data.raw[setting_type][setting_name].hidden = true
-    if setting_default ~= nil then
-      data.raw[setting_type][setting_name].default_value = setting_default
-    end
-  end
-end
-
 if mods["bobplates"] then
-  hide_setting("bool-setting", "angels-disable-vanilla-chemical-plants", true)
+  angelsmods.settings.hide_setting("bool-setting", "angels-disable-vanilla-chemical-plants", true)
 else
-  hide_setting("bool-setting", "angels-disable-bobs-electrolysers", true)
-  hide_setting("bool-setting", "angels-disable-bobs-chemical-plants", true)
-  hide_setting("bool-setting", "angels-disable-bobs-distilleries", true)
+  angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-electrolysers", true)
+  angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-chemical-plants", true)
+  angelsmods.settings.hide_setting("bool-setting", "angels-disable-bobs-distilleries", true)
 end
\ No newline at end of file
diff --git a/angelsrefining/changelog.txt b/angelsrefining/changelog.txt
index 5159b9938..9a182f0f2 100644
--- a/angelsrefining/changelog.txt
+++ b/angelsrefining/changelog.txt
@@ -8,11 +8,25 @@ Date: ??
     - Locked bobs gem refining behind technology rather than unlocking from the start (455)
     - Renamed gode crystallization 2 to geode processing 3
     - Make voiding recipes hidden_from_player_crafting instead of plain hidden (492)
+    - Tweaked the lib to hide all objects (entities, items, fluids, tools etc) when a flag is set
+      - NOT just the first thing found.
+      - Also updated the remove flag script to do the same thing
+    - Tweaked the lib to show icons next to the autoplace controls (542)
+    - Sorting Facility 4 no longer has an ingredient limit (defaults to 255) (514)
+    - Added HQ tier numbering icons
+    - Burner crusher is now not counted as tier 1 (but as tier 0, currently without icon) (513)
+    - Hides the unused settings now properly for consistency (538)
+    - Allowed the hydro-plant to be unlocked slightly earlier (550)
+    - Changed and expanded locale strings and text descriptions (489)
   Bugfixes:
     - Fixed geode crystalisation 1 did exist without any unlocks
     - Fixed incorrect localisation on hidding voiding recipes
     - Removed obsolete inventory slots in the clarifier
     - Fixed that recipes were not being hidden correctly and showing in lookup mods (491)
+    - Improved the limited flow capacity in the Thermal bore/extractor (509)
+    - Fixed an issue with Yuoki's icons not being updated (with the old ones already removed)
+    - Fixed that the method for removing autoplace controls was not universally used (373)
+    - Fixed deadlock for bobclasses "fighter" and component mode (394, 559)
 ---------------------------------------------------------------------------------------------------
 Version: 0.11.19
 Date: 26.11.2020
diff --git a/angelsrefining/control.lua b/angelsrefining/control.lua
index c7d50bdb5..6d7ccc4dc 100644
--- a/angelsrefining/control.lua
+++ b/angelsrefining/control.lua
@@ -1,13 +1,18 @@
 script.on_init(function()
-  if remote.interfaces["freeplay"] then -- give ore crushers
+  if remote.interfaces["freeplay"] then
     local items_to_insert = remote.call("freeplay", "get_created_items")
+    local technology_overhaul = settings.startup["angels-enable-tech"].value
+    local components_overhaul = technology_overhaul or settings.startup["angels-enable-components"].value
+    
+    -- give ore crushers
     items_to_insert["burner-ore-crusher"] = (items_to_insert["burner-ore-crusher"] or 0) + 1
-    remote.call("freeplay", "set_created_items", items_to_insert)
-  end
-
-  if game.active_mods["bobclasses"] and remote.interfaces['freeplay'] then -- give an extra miner
-    local items_to_insert = remote.call("freeplay", "get_created_items")
-    items_to_insert["burner-mining-drill"] = (items_to_insert["burner-mining-drill"] or 0) + 1 -- 2 additional plates
+    if game.active_mods["bobclasses"] then
+      -- fix character classes starting point
+      if components_overhaul then
+	-- give two additional iron plates
+        items_to_insert["iron-plate"] = (items_to_insert["iron-plate"] or 0) + 2
+      end
+    end
     remote.call("freeplay", "set_created_items", items_to_insert)
   end
 end)
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-aluminium-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-aluminium-sorting.png
deleted file mode 100644
index b3c0b097a..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-aluminium-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-chrome-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-chrome-sorting.png
deleted file mode 100644
index 2f76ff0be..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-chrome-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-cobalt-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-cobalt-sorting.png
deleted file mode 100644
index fa20164a8..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-cobalt-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-copper-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-copper-sorting.png
deleted file mode 100644
index dddfadff0..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-copper-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-gold-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-gold-sorting.png
deleted file mode 100644
index b46947a98..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-gold-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-iron-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-iron-sorting.png
deleted file mode 100644
index 3f6704007..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-iron-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-lead-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-lead-sorting.png
deleted file mode 100644
index 0c8f28aa3..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-lead-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-manganese-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-manganese-sorting.png
deleted file mode 100644
index fd9748b98..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-manganese-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-nickel-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-nickel-sorting.png
deleted file mode 100644
index de5e9309f..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-nickel-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-nuc-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-nuc-sorting.png
deleted file mode 100644
index c36c855da..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-nuc-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-platinum-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-platinum-sorting.png
deleted file mode 100644
index accf76c1f..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-platinum-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-silica-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-silica-sorting.png
deleted file mode 100644
index 2d87bcaf4..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-silica-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-silver-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-silver-sorting.png
deleted file mode 100644
index 7286f1dcd..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-silver-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-tin-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-tin-sorting.png
deleted file mode 100644
index 37bea0055..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-tin-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-titanium-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-titanium-sorting.png
deleted file mode 100644
index 4e385202e..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-titanium-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-tungsten-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-tungsten-sorting.png
deleted file mode 100644
index 9c3b493fc..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-tungsten-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-up1-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-up1-sorting.png
deleted file mode 100644
index f88391c26..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-up1-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-up2-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-up2-sorting.png
deleted file mode 100644
index 57525efdb..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-up2-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-yi1-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-yi1-sorting.png
deleted file mode 100644
index b67a686ce..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-yi1-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-yi2-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-yi2-sorting.png
deleted file mode 100644
index 23fe6573b..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-yi2-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore-mix-zinc-sorting.png b/angelsrefining/graphics/icons/angels-ore-mix-zinc-sorting.png
deleted file mode 100644
index 9553f5bdf..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore-mix-zinc-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore1-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore1-chunk-sorting.png
deleted file mode 100644
index 96d4a5786..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore1-chunk-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore1-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore1-crushed-sorting.png
deleted file mode 100644
index bb4893984..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore1-crushed-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore1-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore1-crystal-sorting.png
deleted file mode 100644
index 300d17918..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore1-crystal-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore1-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore1-pure-sorting.png
deleted file mode 100644
index 7fcdfb8b1..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore1-pure-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore2-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore2-chunk-sorting.png
deleted file mode 100644
index 246e9aad8..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore2-chunk-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore2-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore2-crushed-sorting.png
deleted file mode 100644
index 6ef5cc5a0..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore2-crushed-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore2-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore2-crystal-sorting.png
deleted file mode 100644
index 1a2fae5c0..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore2-crystal-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore2-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore2-pure-sorting.png
deleted file mode 100644
index 0a6b02580..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore2-pure-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore3-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore3-chunk-sorting.png
deleted file mode 100644
index a3231400c..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore3-chunk-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore3-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore3-crushed-sorting.png
deleted file mode 100644
index e42826bbf..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore3-crushed-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore3-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore3-crystal-sorting.png
deleted file mode 100644
index 096f554d1..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore3-crystal-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore3-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore3-pure-sorting.png
deleted file mode 100644
index 2ad90ff6a..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore3-pure-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore4-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore4-chunk-sorting.png
deleted file mode 100644
index 32692d875..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore4-chunk-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore4-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore4-crushed-sorting.png
deleted file mode 100644
index 7726428c4..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore4-crushed-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore4-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore4-crystal-sorting.png
deleted file mode 100644
index b9c6e7f2a..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore4-crystal-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore4-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore4-pure-sorting.png
deleted file mode 100644
index fbaee4ffc..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore4-pure-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore5-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore5-chunk-sorting.png
deleted file mode 100644
index 1bc5d1b9e..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore5-chunk-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore5-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore5-crushed-sorting.png
deleted file mode 100644
index c122e72ec..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore5-crushed-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore5-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore5-crystal-sorting.png
deleted file mode 100644
index b5f908c1b..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore5-crystal-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore5-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore5-pure-sorting.png
deleted file mode 100644
index e4fbef69f..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore5-pure-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore6-chunk-sorting.png b/angelsrefining/graphics/icons/angels-ore6-chunk-sorting.png
deleted file mode 100644
index f809467bf..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore6-chunk-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore6-crushed-sorting.png b/angelsrefining/graphics/icons/angels-ore6-crushed-sorting.png
deleted file mode 100644
index fe3059896..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore6-crushed-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore6-crystal-sorting.png b/angelsrefining/graphics/icons/angels-ore6-crystal-sorting.png
deleted file mode 100644
index 00a92de0b..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore6-crystal-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore6-pure-sorting.png b/angelsrefining/graphics/icons/angels-ore6-pure-sorting.png
deleted file mode 100644
index cd150695a..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore6-pure-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore8-anode-sludge.png b/angelsrefining/graphics/icons/angels-ore8-anode-sludge.png
deleted file mode 100644
index 9bb576d9a..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore8-anode-sludge.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore8-slime-filtering.png b/angelsrefining/graphics/icons/angels-ore8-slime-filtering.png
deleted file mode 100644
index a3da3cb37..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore8-slime-filtering.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore8-slime.png b/angelsrefining/graphics/icons/angels-ore8-slime.png
deleted file mode 100644
index a2829460f..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore8-slime.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore8-sludge.png b/angelsrefining/graphics/icons/angels-ore8-sludge.png
deleted file mode 100644
index 9300c94d6..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore8-sludge.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore8-solution.png b/angelsrefining/graphics/icons/angels-ore8-solution.png
deleted file mode 100644
index 4257e02f0..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore8-solution.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore9-anode-sludge.png b/angelsrefining/graphics/icons/angels-ore9-anode-sludge.png
deleted file mode 100644
index 9b06f1af8..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore9-anode-sludge.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore9-slime-filtering.png b/angelsrefining/graphics/icons/angels-ore9-slime-filtering.png
deleted file mode 100644
index 24bc9367b..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore9-slime-filtering.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore9-slime.png b/angelsrefining/graphics/icons/angels-ore9-slime.png
deleted file mode 100644
index 83cf6ae5c..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore9-slime.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore9-sludge.png b/angelsrefining/graphics/icons/angels-ore9-sludge.png
deleted file mode 100644
index 2ad1ccbb3..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore9-sludge.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angels-ore9-solution.png b/angelsrefining/graphics/icons/angels-ore9-solution.png
deleted file mode 100644
index 1ca761552..000000000
Binary files a/angelsrefining/graphics/icons/angels-ore9-solution.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angelsore7-chunk-mix-processing.png b/angelsrefining/graphics/icons/angelsore7-chunk-mix-processing.png
deleted file mode 100644
index 7bebf9757..000000000
Binary files a/angelsrefining/graphics/icons/angelsore7-chunk-mix-processing.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angelsore7-crushed-mix-processing.png b/angelsrefining/graphics/icons/angelsore7-crushed-mix-processing.png
deleted file mode 100644
index cb0c59959..000000000
Binary files a/angelsrefining/graphics/icons/angelsore7-crushed-mix-processing.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angelsore7-crystal-mix-processing.png b/angelsrefining/graphics/icons/angelsore7-crystal-mix-processing.png
deleted file mode 100644
index 2dc32570b..000000000
Binary files a/angelsrefining/graphics/icons/angelsore7-crystal-mix-processing.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/angelsore7-pure-mix-processing.png b/angelsrefining/graphics/icons/angelsore7-pure-mix-processing.png
deleted file mode 100644
index 142b8952a..000000000
Binary files a/angelsrefining/graphics/icons/angelsore7-pure-mix-processing.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/clarifier-void-1.png b/angelsrefining/graphics/icons/clarifier-void-1.png
deleted file mode 100644
index 10dd419e6..000000000
Binary files a/angelsrefining/graphics/icons/clarifier-void-1.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/clarifier-void-2.png b/angelsrefining/graphics/icons/clarifier-void-2.png
deleted file mode 100644
index 8bc0274a8..000000000
Binary files a/angelsrefining/graphics/icons/clarifier-void-2.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/clarifier-void-3.png b/angelsrefining/graphics/icons/clarifier-void-3.png
deleted file mode 100644
index 7acb69fc8..000000000
Binary files a/angelsrefining/graphics/icons/clarifier-void-3.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/clarifier-void-4.png b/angelsrefining/graphics/icons/clarifier-void-4.png
deleted file mode 100644
index a0ab88151..000000000
Binary files a/angelsrefining/graphics/icons/clarifier-void-4.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/clarifier-void-5.png b/angelsrefining/graphics/icons/clarifier-void-5.png
deleted file mode 100644
index b52c58064..000000000
Binary files a/angelsrefining/graphics/icons/clarifier-void-5.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/clarifier-void-6.png b/angelsrefining/graphics/icons/clarifier-void-6.png
deleted file mode 100644
index 7ed8085ba..000000000
Binary files a/angelsrefining/graphics/icons/clarifier-void-6.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/clarifier-void-7.png b/angelsrefining/graphics/icons/clarifier-void-7.png
deleted file mode 100644
index 8a0ec72ca..000000000
Binary files a/angelsrefining/graphics/icons/clarifier-void-7.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/copper-ore-chunk-sorting.png b/angelsrefining/graphics/icons/copper-ore-chunk-sorting.png
deleted file mode 100644
index 57f874058..000000000
Binary files a/angelsrefining/graphics/icons/copper-ore-chunk-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/copper-ore-chunk.png b/angelsrefining/graphics/icons/copper-ore-chunk.png
deleted file mode 100644
index 7693550b4..000000000
Binary files a/angelsrefining/graphics/icons/copper-ore-chunk.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/copper-ore-crushed-sorting.png b/angelsrefining/graphics/icons/copper-ore-crushed-sorting.png
deleted file mode 100644
index 00c0d9686..000000000
Binary files a/angelsrefining/graphics/icons/copper-ore-crushed-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/copper-ore-crushed.png b/angelsrefining/graphics/icons/copper-ore-crushed.png
deleted file mode 100644
index 26fa1640c..000000000
Binary files a/angelsrefining/graphics/icons/copper-ore-crushed.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/copper-ore-crystal-sorting.png b/angelsrefining/graphics/icons/copper-ore-crystal-sorting.png
deleted file mode 100644
index f6c8f0f9f..000000000
Binary files a/angelsrefining/graphics/icons/copper-ore-crystal-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/copper-ore-crystal.png b/angelsrefining/graphics/icons/copper-ore-crystal.png
deleted file mode 100644
index 908ee56f6..000000000
Binary files a/angelsrefining/graphics/icons/copper-ore-crystal.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/copper-ore-pure-sorting.png b/angelsrefining/graphics/icons/copper-ore-pure-sorting.png
deleted file mode 100644
index 3941986a5..000000000
Binary files a/angelsrefining/graphics/icons/copper-ore-pure-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/copper-ore-pure.png b/angelsrefining/graphics/icons/copper-ore-pure.png
deleted file mode 100644
index e49d7412e..000000000
Binary files a/angelsrefining/graphics/icons/copper-ore-pure.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/crystal-filtering-1.png b/angelsrefining/graphics/icons/crystal-filtering-1.png
deleted file mode 100644
index d11ff894f..000000000
Binary files a/angelsrefining/graphics/icons/crystal-filtering-1.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/crystal-filtering-2.png b/angelsrefining/graphics/icons/crystal-filtering-2.png
deleted file mode 100644
index 483cec9bb..000000000
Binary files a/angelsrefining/graphics/icons/crystal-filtering-2.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/crystal-filtering-conversion-1.png b/angelsrefining/graphics/icons/crystal-filtering-conversion-1.png
deleted file mode 100644
index d11ff894f..000000000
Binary files a/angelsrefining/graphics/icons/crystal-filtering-conversion-1.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/crystal-filtering-conversion-2.png b/angelsrefining/graphics/icons/crystal-filtering-conversion-2.png
deleted file mode 100644
index 483cec9bb..000000000
Binary files a/angelsrefining/graphics/icons/crystal-filtering-conversion-2.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/crystal-matrix.png b/angelsrefining/graphics/icons/crystal-matrix.png
deleted file mode 100644
index 24fe6cb67..000000000
Binary files a/angelsrefining/graphics/icons/crystal-matrix.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/crystal-seedling.png b/angelsrefining/graphics/icons/crystal-seedling.png
deleted file mode 100644
index 3b1612db2..000000000
Binary files a/angelsrefining/graphics/icons/crystal-seedling.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/crystal-slurry.png b/angelsrefining/graphics/icons/crystal-slurry.png
deleted file mode 100644
index efe88beaf..000000000
Binary files a/angelsrefining/graphics/icons/crystal-slurry.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/electrolysis-salt-water.png b/angelsrefining/graphics/icons/electrolysis-salt-water.png
deleted file mode 100644
index c6ee8848f..000000000
Binary files a/angelsrefining/graphics/icons/electrolysis-salt-water.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/fissure.png b/angelsrefining/graphics/icons/fissure.png
new file mode 100644
index 000000000..d214f16f2
Binary files /dev/null and b/angelsrefining/graphics/icons/fissure.png differ
diff --git a/angelsrefining/graphics/icons/gem-crystallization-amethyst.png b/angelsrefining/graphics/icons/gem-crystallization-amethyst.png
deleted file mode 100644
index 622d838be..000000000
Binary files a/angelsrefining/graphics/icons/gem-crystallization-amethyst.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/gem-crystallization-diamond.png b/angelsrefining/graphics/icons/gem-crystallization-diamond.png
deleted file mode 100644
index bc1563e5b..000000000
Binary files a/angelsrefining/graphics/icons/gem-crystallization-diamond.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/gem-crystallization-emerald.png b/angelsrefining/graphics/icons/gem-crystallization-emerald.png
deleted file mode 100644
index 75998e104..000000000
Binary files a/angelsrefining/graphics/icons/gem-crystallization-emerald.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/gem-crystallization-ruby.png b/angelsrefining/graphics/icons/gem-crystallization-ruby.png
deleted file mode 100644
index a0b16c16c..000000000
Binary files a/angelsrefining/graphics/icons/gem-crystallization-ruby.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/gem-crystallization-sapphire.png b/angelsrefining/graphics/icons/gem-crystallization-sapphire.png
deleted file mode 100644
index f10fda38d..000000000
Binary files a/angelsrefining/graphics/icons/gem-crystallization-sapphire.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/gem-crystallization-topaz.png b/angelsrefining/graphics/icons/gem-crystallization-topaz.png
deleted file mode 100644
index 9faa28280..000000000
Binary files a/angelsrefining/graphics/icons/gem-crystallization-topaz.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/iron-ore-chunk-sorting.png b/angelsrefining/graphics/icons/iron-ore-chunk-sorting.png
deleted file mode 100644
index 797f357ef..000000000
Binary files a/angelsrefining/graphics/icons/iron-ore-chunk-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/iron-ore-chunk.png b/angelsrefining/graphics/icons/iron-ore-chunk.png
deleted file mode 100644
index 40eca45d0..000000000
Binary files a/angelsrefining/graphics/icons/iron-ore-chunk.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/iron-ore-crushed-sorting.png b/angelsrefining/graphics/icons/iron-ore-crushed-sorting.png
deleted file mode 100644
index e370fc159..000000000
Binary files a/angelsrefining/graphics/icons/iron-ore-crushed-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/iron-ore-crushed.png b/angelsrefining/graphics/icons/iron-ore-crushed.png
deleted file mode 100644
index 58e5c3e38..000000000
Binary files a/angelsrefining/graphics/icons/iron-ore-crushed.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/iron-ore-crystal-sorting.png b/angelsrefining/graphics/icons/iron-ore-crystal-sorting.png
deleted file mode 100644
index 695a6f840..000000000
Binary files a/angelsrefining/graphics/icons/iron-ore-crystal-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/iron-ore-crystal.png b/angelsrefining/graphics/icons/iron-ore-crystal.png
deleted file mode 100644
index fe14c8a59..000000000
Binary files a/angelsrefining/graphics/icons/iron-ore-crystal.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/iron-ore-pure-sorting.png b/angelsrefining/graphics/icons/iron-ore-pure-sorting.png
deleted file mode 100644
index 201fc715a..000000000
Binary files a/angelsrefining/graphics/icons/iron-ore-pure-sorting.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/iron-ore-pure.png b/angelsrefining/graphics/icons/iron-ore-pure.png
deleted file mode 100644
index c7c41c88c..000000000
Binary files a/angelsrefining/graphics/icons/iron-ore-pure.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/liquify-blank.png b/angelsrefining/graphics/icons/liquify-blank.png
deleted file mode 100644
index d77e96675..000000000
Binary files a/angelsrefining/graphics/icons/liquify-blank.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/liquify-blue.png b/angelsrefining/graphics/icons/liquify-blue.png
deleted file mode 100644
index 774384d32..000000000
Binary files a/angelsrefining/graphics/icons/liquify-blue.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/liquify-cyan.png b/angelsrefining/graphics/icons/liquify-cyan.png
deleted file mode 100644
index b5e3b4661..000000000
Binary files a/angelsrefining/graphics/icons/liquify-cyan.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/liquify-lightgreen.png b/angelsrefining/graphics/icons/liquify-lightgreen.png
deleted file mode 100644
index 161045a88..000000000
Binary files a/angelsrefining/graphics/icons/liquify-lightgreen.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/liquify-purple.png b/angelsrefining/graphics/icons/liquify-purple.png
deleted file mode 100644
index 3d14773fa..000000000
Binary files a/angelsrefining/graphics/icons/liquify-purple.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/liquify-red.png b/angelsrefining/graphics/icons/liquify-red.png
deleted file mode 100644
index 3a0c5a57e..000000000
Binary files a/angelsrefining/graphics/icons/liquify-red.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/liquify-yellow.png b/angelsrefining/graphics/icons/liquify-yellow.png
deleted file mode 100644
index 603d184f6..000000000
Binary files a/angelsrefining/graphics/icons/liquify-yellow.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/mineral-sludge.png b/angelsrefining/graphics/icons/mineral-sludge.png
deleted file mode 100644
index 1b9e2c701..000000000
Binary files a/angelsrefining/graphics/icons/mineral-sludge.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/nodule-crushed.png b/angelsrefining/graphics/icons/nodule-crushed.png
deleted file mode 100644
index 228720458..000000000
Binary files a/angelsrefining/graphics/icons/nodule-crushed.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/nodule-sludge.png b/angelsrefining/graphics/icons/nodule-sludge.png
deleted file mode 100644
index cd3908188..000000000
Binary files a/angelsrefining/graphics/icons/nodule-sludge.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/nodule-slurry.png b/angelsrefining/graphics/icons/nodule-slurry.png
deleted file mode 100644
index eef337e83..000000000
Binary files a/angelsrefining/graphics/icons/nodule-slurry.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/nodule-slurrying.png b/angelsrefining/graphics/icons/nodule-slurrying.png
deleted file mode 100644
index 5a85c74f5..000000000
Binary files a/angelsrefining/graphics/icons/nodule-slurrying.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/numerals/num-1-outline.png b/angelsrefining/graphics/icons/numerals/num-1-outline.png
new file mode 100644
index 000000000..c5ed12047
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-1-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-1.png b/angelsrefining/graphics/icons/numerals/num-1.png
new file mode 100644
index 000000000..6f25a75da
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-1.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-10-outline.png b/angelsrefining/graphics/icons/numerals/num-10-outline.png
new file mode 100644
index 000000000..ba46aaf29
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-10-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-10.png b/angelsrefining/graphics/icons/numerals/num-10.png
new file mode 100644
index 000000000..2a531ca62
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-10.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-2-outline.png b/angelsrefining/graphics/icons/numerals/num-2-outline.png
new file mode 100644
index 000000000..e733c5567
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-2-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-2.png b/angelsrefining/graphics/icons/numerals/num-2.png
new file mode 100644
index 000000000..aac23f47c
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-2.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-3-outline.png b/angelsrefining/graphics/icons/numerals/num-3-outline.png
new file mode 100644
index 000000000..137cbb67a
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-3-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-3.png b/angelsrefining/graphics/icons/numerals/num-3.png
new file mode 100644
index 000000000..693fe81a1
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-3.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-4-outline.png b/angelsrefining/graphics/icons/numerals/num-4-outline.png
new file mode 100644
index 000000000..4df5a8984
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-4-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-4.png b/angelsrefining/graphics/icons/numerals/num-4.png
new file mode 100644
index 000000000..7c0d40c55
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-4.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-5-outline.png b/angelsrefining/graphics/icons/numerals/num-5-outline.png
new file mode 100644
index 000000000..e8216997a
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-5-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-5.png b/angelsrefining/graphics/icons/numerals/num-5.png
new file mode 100644
index 000000000..53fb265d1
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-5.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-6-outline.png b/angelsrefining/graphics/icons/numerals/num-6-outline.png
new file mode 100644
index 000000000..38dc6f031
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-6-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-6.png b/angelsrefining/graphics/icons/numerals/num-6.png
new file mode 100644
index 000000000..e5994e0b9
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-6.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-7-outline.png b/angelsrefining/graphics/icons/numerals/num-7-outline.png
new file mode 100644
index 000000000..6af274929
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-7-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-7.png b/angelsrefining/graphics/icons/numerals/num-7.png
new file mode 100644
index 000000000..b5f4fbf9c
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-7.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-8-outline.png b/angelsrefining/graphics/icons/numerals/num-8-outline.png
new file mode 100644
index 000000000..a8f1268ff
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-8-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-8.png b/angelsrefining/graphics/icons/numerals/num-8.png
new file mode 100644
index 000000000..237c32d71
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-8.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-9-outline.png b/angelsrefining/graphics/icons/numerals/num-9-outline.png
new file mode 100644
index 000000000..cc24e9dfb
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-9-outline.png differ
diff --git a/angelsrefining/graphics/icons/numerals/num-9.png b/angelsrefining/graphics/icons/numerals/num-9.png
new file mode 100644
index 000000000..83120ff7c
Binary files /dev/null and b/angelsrefining/graphics/icons/numerals/num-9.png differ
diff --git a/angelsrefining/graphics/icons/slag-filtering-1.png b/angelsrefining/graphics/icons/slag-filtering-1.png
deleted file mode 100644
index 88e048b63..000000000
Binary files a/angelsrefining/graphics/icons/slag-filtering-1.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-filtering-2.png b/angelsrefining/graphics/icons/slag-filtering-2.png
deleted file mode 100644
index 47160592e..000000000
Binary files a/angelsrefining/graphics/icons/slag-filtering-2.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-angel1.png b/angelsrefining/graphics/icons/slag-processing-angel1.png
deleted file mode 100644
index a6eb273b6..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-angel1.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-angel2.png b/angelsrefining/graphics/icons/slag-processing-angel2.png
deleted file mode 100644
index cee3107dd..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-angel2.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-angel3.png b/angelsrefining/graphics/icons/slag-processing-angel3.png
deleted file mode 100644
index 38b6409e9..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-angel3.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-angel4.png b/angelsrefining/graphics/icons/slag-processing-angel4.png
deleted file mode 100644
index 1f39ccb41..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-angel4.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-angel5.png b/angelsrefining/graphics/icons/slag-processing-angel5.png
deleted file mode 100644
index c7e4ea38c..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-angel5.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-angel6.png b/angelsrefining/graphics/icons/slag-processing-angel6.png
deleted file mode 100644
index 01391b50e..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-angel6.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-angel7.png b/angelsrefining/graphics/icons/slag-processing-angel7.png
deleted file mode 100644
index 76da918ea..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-angel7.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-angel8.png b/angelsrefining/graphics/icons/slag-processing-angel8.png
deleted file mode 100644
index 882f25fab..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-angel8.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-blank.png b/angelsrefining/graphics/icons/slag-processing-blank.png
deleted file mode 100644
index 810f88d44..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-blank.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-bob1.png b/angelsrefining/graphics/icons/slag-processing-bob1.png
deleted file mode 100644
index a6eb273b6..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-bob1.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-bob2.png b/angelsrefining/graphics/icons/slag-processing-bob2.png
deleted file mode 100644
index cee3107dd..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-bob2.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-bob3.png b/angelsrefining/graphics/icons/slag-processing-bob3.png
deleted file mode 100644
index affc9dbbe..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-bob3.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-bob4.png b/angelsrefining/graphics/icons/slag-processing-bob4.png
deleted file mode 100644
index 864bbf4da..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-bob4.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-bob5.png b/angelsrefining/graphics/icons/slag-processing-bob5.png
deleted file mode 100644
index 0e4c4ba79..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-bob5.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-bob6.png b/angelsrefining/graphics/icons/slag-processing-bob6.png
deleted file mode 100644
index 978a98e0a..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-bob6.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-nuc.png b/angelsrefining/graphics/icons/slag-processing-nuc.png
deleted file mode 100644
index 602467b95..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-nuc.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-up.png b/angelsrefining/graphics/icons/slag-processing-up.png
deleted file mode 100644
index e83efc2c4..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-up.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-vanilla1.png b/angelsrefining/graphics/icons/slag-processing-vanilla1.png
deleted file mode 100644
index 3119d2267..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-vanilla1.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-vanilla2.png b/angelsrefining/graphics/icons/slag-processing-vanilla2.png
deleted file mode 100644
index 7e06435e1..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-vanilla2.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-vanilla3.png b/angelsrefining/graphics/icons/slag-processing-vanilla3.png
deleted file mode 100644
index db3a9a508..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-vanilla3.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-vanilla4.png b/angelsrefining/graphics/icons/slag-processing-vanilla4.png
deleted file mode 100644
index 04c7fa341..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-vanilla4.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-processing-yi.png b/angelsrefining/graphics/icons/slag-processing-yi.png
deleted file mode 100644
index 681e33e51..000000000
Binary files a/angelsrefining/graphics/icons/slag-processing-yi.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slag-slurry.png b/angelsrefining/graphics/icons/slag-slurry.png
deleted file mode 100644
index bf6f04833..000000000
Binary files a/angelsrefining/graphics/icons/slag-slurry.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/slurry.png b/angelsrefining/graphics/icons/slurry.png
deleted file mode 100644
index a9364d28f..000000000
Binary files a/angelsrefining/graphics/icons/slurry.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/thermal-water-barrel.png b/angelsrefining/graphics/icons/thermal-water-barrel.png
deleted file mode 100644
index 50dd001e9..000000000
Binary files a/angelsrefining/graphics/icons/thermal-water-barrel.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-concentrated-mud.png b/angelsrefining/graphics/icons/water-concentrated-mud.png
deleted file mode 100644
index b0a551c83..000000000
Binary files a/angelsrefining/graphics/icons/water-concentrated-mud.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-green-waste-purification.png b/angelsrefining/graphics/icons/water-green-waste-purification.png
deleted file mode 100644
index 8f29280ca..000000000
Binary files a/angelsrefining/graphics/icons/water-green-waste-purification.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-green-waste.png b/angelsrefining/graphics/icons/water-green-waste.png
deleted file mode 100644
index 10c6e310a..000000000
Binary files a/angelsrefining/graphics/icons/water-green-waste.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-greenyellow-waste-purification.png b/angelsrefining/graphics/icons/water-greenyellow-waste-purification.png
deleted file mode 100644
index bf84c78be..000000000
Binary files a/angelsrefining/graphics/icons/water-greenyellow-waste-purification.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-greenyellow-waste.png b/angelsrefining/graphics/icons/water-greenyellow-waste.png
deleted file mode 100644
index fe5dc1945..000000000
Binary files a/angelsrefining/graphics/icons/water-greenyellow-waste.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-heavy-mud.png b/angelsrefining/graphics/icons/water-heavy-mud.png
deleted file mode 100644
index f9495cba8..000000000
Binary files a/angelsrefining/graphics/icons/water-heavy-mud.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-light-mud.png b/angelsrefining/graphics/icons/water-light-mud.png
deleted file mode 100644
index 01c01d1c0..000000000
Binary files a/angelsrefining/graphics/icons/water-light-mud.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-lithia.png b/angelsrefining/graphics/icons/water-lithia.png
deleted file mode 100644
index 2e50bdac3..000000000
Binary files a/angelsrefining/graphics/icons/water-lithia.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-mineralized.png b/angelsrefining/graphics/icons/water-mineralized.png
deleted file mode 100644
index aa88e7e08..000000000
Binary files a/angelsrefining/graphics/icons/water-mineralized.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-purification.png b/angelsrefining/graphics/icons/water-purification.png
deleted file mode 100644
index 92290cae6..000000000
Binary files a/angelsrefining/graphics/icons/water-purification.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-purified.png b/angelsrefining/graphics/icons/water-purified.png
deleted file mode 100644
index 85002ee18..000000000
Binary files a/angelsrefining/graphics/icons/water-purified.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-red-waste-purification.png b/angelsrefining/graphics/icons/water-red-waste-purification.png
deleted file mode 100644
index 650464823..000000000
Binary files a/angelsrefining/graphics/icons/water-red-waste-purification.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-red-waste.png b/angelsrefining/graphics/icons/water-red-waste.png
deleted file mode 100644
index d727c612e..000000000
Binary files a/angelsrefining/graphics/icons/water-red-waste.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-saline.png b/angelsrefining/graphics/icons/water-saline.png
deleted file mode 100644
index ea0834d30..000000000
Binary files a/angelsrefining/graphics/icons/water-saline.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-thermal-lithia.png b/angelsrefining/graphics/icons/water-thermal-lithia.png
deleted file mode 100644
index a8f12e601..000000000
Binary files a/angelsrefining/graphics/icons/water-thermal-lithia.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-thermal-purification.png b/angelsrefining/graphics/icons/water-thermal-purification.png
deleted file mode 100644
index 1e5b11ef7..000000000
Binary files a/angelsrefining/graphics/icons/water-thermal-purification.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-thermal.png b/angelsrefining/graphics/icons/water-thermal.png
deleted file mode 100644
index c66bd54fd..000000000
Binary files a/angelsrefining/graphics/icons/water-thermal.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-thin-mud.png b/angelsrefining/graphics/icons/water-thin-mud.png
deleted file mode 100644
index 5847edd7f..000000000
Binary files a/angelsrefining/graphics/icons/water-thin-mud.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-viscous-mud.png b/angelsrefining/graphics/icons/water-viscous-mud.png
deleted file mode 100644
index 38e052386..000000000
Binary files a/angelsrefining/graphics/icons/water-viscous-mud.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-yellow-waste-purification-yi.png b/angelsrefining/graphics/icons/water-yellow-waste-purification-yi.png
deleted file mode 100644
index 602bd21ea..000000000
Binary files a/angelsrefining/graphics/icons/water-yellow-waste-purification-yi.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-yellow-waste-purification.png b/angelsrefining/graphics/icons/water-yellow-waste-purification.png
deleted file mode 100644
index 772bd3bc2..000000000
Binary files a/angelsrefining/graphics/icons/water-yellow-waste-purification.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water-yellow-waste.png b/angelsrefining/graphics/icons/water-yellow-waste.png
deleted file mode 100644
index 7ffd56b28..000000000
Binary files a/angelsrefining/graphics/icons/water-yellow-waste.png and /dev/null differ
diff --git a/angelsrefining/graphics/icons/water.png b/angelsrefining/graphics/icons/water.png
deleted file mode 100644
index a780689b1..000000000
Binary files a/angelsrefining/graphics/icons/water.png and /dev/null differ
diff --git a/angelsrefining/info.json b/angelsrefining/info.json
index 4b56c7f22..44ed572ee 100644
--- a/angelsrefining/info.json
+++ b/angelsrefining/info.json
@@ -9,7 +9,7 @@
   "description": "Adds ore refining to the game. Compound ores have to be refined before you are able to smelt and cast them into plates. Works best in conjunction with Angel's industries and/or Bob's mods and supports additional mods like Yuoki Industries, Uranium Power and Nucular.",
   "dependencies": [
 
-    "base >= 1.0.0",
+    "base >= 1.1.24",
     "? bobplates >= 0.18.8",
     "? bobrevamp >= 0.18.5",
     "? rso-mod >= 2.3.3",
diff --git a/angelsrefining/locale/en/ore-refining-refining.cfg b/angelsrefining/locale/en/ore-refining-refining.cfg
index 87e0cfff4..559658918 100644
--- a/angelsrefining/locale/en/ore-refining-refining.cfg
+++ b/angelsrefining/locale/en/ore-refining-refining.cfg
@@ -47,8 +47,8 @@ angels-ore5-pure=Purified rubyte
 angels-ore6-pure=Purified bobmonium
 
 [item-description]
-angels-ore-refining=Can be refined and sorted for smeltable ores:
-angels-ore-sorting=Can be sorted for smeltable ores:
+angels-ore-refining=Can be refined and sorted for pure ores:
+angels-ore-sorting=Can be sorted for pure ores:
 angels-ore-refining-again=Can be refined further prior to sorting for:
 
 loc-space= 
@@ -170,6 +170,10 @@ ore-leaching=Chemical refining
 ore-refining=Thermal refining
 
 [technology-description]
+ore-crushing=Crushing and sorting of compound ores produces a variety of pure ores ready to be smelted.
+ore-floatation=Froth flotation of crushed compound ores provides higher yield of pure ores upon sorting.
+ore-leaching=Chemical leaching of compound ore chunks provides additional yield of pure ores upon sorting.
+ore-refining=Thermal refining of compound ore crystals provides optimal yield of pure ores upon sorting.
 
 [mod-setting-name]
 
diff --git a/angelsrefining/locale/en/ore-refining-sorting.cfg b/angelsrefining/locale/en/ore-refining-sorting.cfg
index df0cbfd3b..d2e67c1ba 100644
--- a/angelsrefining/locale/en/ore-refining-sorting.cfg
+++ b/angelsrefining/locale/en/ore-refining-sorting.cfg
@@ -63,7 +63,7 @@ angelsore6-pure-processing=Purified bobmonium sorting
 ; slag processing
 slag_processing_2=Processing mineral sludge into __1__, and __2__
 slag_processing_3=Processing mineral sludge into __1__, __2__, and __3__
-slag_processing_1=Processing mineral sludge __1__
+slag_processing_1=Processing mineral sludge into __1__
 [recipe-description]
 
 [item-group-name]
diff --git a/angelsrefining/locale/en/ore-refining.cfg b/angelsrefining/locale/en/ore-refining.cfg
index 06e7c04d5..42a5c1372 100644
--- a/angelsrefining/locale/en/ore-refining.cfg
+++ b/angelsrefining/locale/en/ore-refining.cfg
@@ -37,9 +37,9 @@ liquifier-2=Liquefier 2
 liquifier-3=Liquefier 3
 liquifier-4=Liquefier 4
 
-electro-whinning-cell=Electrowinning Cell 1
-electro-whinning-cell-2=Electrowinning Cell 2
-electro-whinning-cell-3=Electrowinning Cell 3
+electro-whinning-cell=Electrowinning cell 1
+electro-whinning-cell-2=Electrowinning cell 2
+electro-whinning-cell-3=Electrowinning cell 3
 
 ore-powderizer=Ore powderizer 1
 ore-powderizer-2=Ore powderizer 2
@@ -53,6 +53,52 @@ crystallizer-2=Crystallizer 2
 thermal-bore=Thermal water bore
 thermal-extractor=Thermal water extractor
 
+[entity-description]
+angels-fissure=Source of hot and mineral-rich water.
+
+burner-ore-crusher=Crushes compound ores. Don't stick your fingers in.
+ore-crusher=Crushes compound ores. Don't stick your fingers in.
+ore-crusher-2=Crushes compound ores. Don't stick your fingers in.
+ore-crusher-3=Crushes compound ores. Don't stick your fingers in.
+
+ore-floatation-cell=Further refines crushed ores using froth flotation.
+ore-floatation-cell-2=Further refines crushed ores using froth flotation.
+ore-floatation-cell-3=Further refines crushed ores using froth flotation.
+
+ore-leaching-plant=Further refines ore chunks using chemical leaching.
+ore-leaching-plant-2=Further refines ore chunks using chemical leaching.
+ore-leaching-plant-3=Further refines ore chunks using chemical leaching.
+
+ore-refinery=Further refines ore crystals using heating and roasting processes.
+ore-refinery-2=Further refines ore crystals using heating and roasting processes.
+ore-refinery-3=Further refines ore crystals using heating and roasting processes.
+
+ore-sorting-facility=Sorts refined compound ores into pure ores.
+ore-sorting-facility-2=Sorts refined compound ores into pure ores.
+ore-sorting-facility-3=Sorts refined compound ores into pure ores.
+ore-sorting-facility-4=Sorts refined compound ores into pure ores.
+
+liquifier=Versatile machine, can process up to one fluid input and/or 1 fluid output.
+liquifier-2=Versatile machine, can process up to one fluid input and/or 1 fluid output.
+liquifier-3=Versatile machine, can process up to one fluid input and/or 1 fluid output.
+liquifier-4=Versatile machine, can process up to one fluid input and/or 1 fluid output.
+
+electro-whinning-cell=Uses an electrolytic bath for additional purification.
+electro-whinning-cell-2=Uses an electrolytic bath for additional purification.
+electro-whinning-cell-3=Uses an electrolytic bath for additional purification.
+
+ore-powderizer=Uses milling drums to turn solid material into powder.
+ore-powderizer-2=Uses milling drums to turn solid material into powder.
+ore-powderizer-3=Uses milling drums to turn solid material into powder.
+
+filtration-unit=Filters out impurities from liquids.
+filtration-unit-2=Filters out impurities from liquids.
+crystallizer=Forces the crystallization of higher elements from chemical solutions.
+crystallizer-2=Forces the crystallization of higher elements from chemical solutions.
+
+thermal-bore=A simple machine that uses a fissure to extract mineral rich thermal water from deep underground. Not the ideal setup.
+thermal-extractor=Specialized machine that uses a fissure to extract mineral rich thermal water from deep underground at a reasonable rate.
+
 [autoplace-control-names]
 angels-ore1=Saphirite
 angels-ore2=Jivolite
@@ -102,6 +148,9 @@ angels-void=Something went wrong
 
 gas-canister=Empty bottle
 
+[item-description]
+angels-void=You are missing dependencies or something went wrong. If the error persists, please report it in the Bugs thread on the forum.
+
 [fluid-name]
 thermal-water=Thermal water
 slag-slurry=Slag slurry
@@ -145,7 +194,7 @@ angelsore7-crystallization-5=Crystallizing to __1__
 angelsore7-crystallization-6=Crystallizing to __1__
 
 slag-processing-dissolution=Liquefy slag to slurry
-stone-crushed-dissolution=Liquefy crushed stone to Slurry
+stone-crushed-dissolution=Liquefy crushed stone to slurry
 slag-processing-filtering-1=Slurry coal filtering
 slag-processing-filtering-2=Slurry ceramic filtering
 slag-processing-stone=Slag processing to stone
@@ -176,12 +225,24 @@ thermal-water-processing=Thermal water processing
 slag-processing=Slag processing
 
 geode-processing=Geode processing
-geode-crystallization=Geode crystallization
+geode-crystallization=Gem crystallization
 
 [technology-description]
+ore-advanced-crushing=High yield of pure ores via special ore mixtures.
+ore-powderizer=High yield of pure ores via special ore mixtures.
+ore-advanced-floatation=High yield of pure ores via special ore mixtures.
+ore-electro-whinning-cell=High yield of pure ores via special ore mixtures.
+
+advanced-ore-refining=High yield of pure ores via special catalytic sorting.
+
 thermal-water-extraction=Extract mineral rich thermal water from deep underground.
 thermal-water-processing=Process mineral rich thermal water from deep underground.
 
+slag-processing=Recovery of valuable materials from mineral by-products.
+
+geode-processing=Crystalline by-products of hydro-refining can act as catalysts for advanced ore sorting.
+geode-crystallization=Re-crystallization of crystal seedling into precious stones.
+
 [mod-setting-name]
 angels-enable-auto-barreling=Auto-barreling
 angels-enable-hide-void=Hide voiding recipes
@@ -226,64 +287,3 @@ angels-enable-biters=Biters are not required if you play without Angel's Explora
 
 angels-pavement-stack-size=Pavement items are items like stone, concrete, landfill which can be used to build tiles and paths.
 
-[item-description]
-burner-ore-crusher=Don't stick your fingers in. Crushes raw ores.
-ore-crusher=Don't stick your fingers in. Crushes raw ores.
-ore-crusher-2=Don't stick your fingers in. Crushes raw ores.
-ore-crusher-3=Don't stick your fingers in. Crushes raw ores.
-
-ore-floatation-cell=Further refines crushed ores using froth flotation.
-ore-floatation-cell-2=Further refines crushed ores using froth flotation.
-ore-floatation-cell-3=Further refines crushed ores using froth flotation.
-
-ore-leaching-plant=Further refines ore chunks using chemical leaching.
-ore-leaching-plant-2=Further refines ore chunks using chemical leaching.
-ore-leaching-plant-3=Further refines ore chunks using chemical leaching.
-
-ore-refinery=Further refines ore crystals using heating and roasting processes.
-ore-refinery-2=Further refines ore crystals using heating and roasting processes.
-ore-refinery-3=Further refines ore crystals using heating and roasting processes.
-
-ore-sorting-facility=Sorts refined raw ores into smeltable ores.
-ore-sorting-facility-2=Sorts refined raw ores into smeltable ores.
-ore-sorting-facility-3=Sorts refined raw ores into smeltable ores.
-ore-sorting-facility-4=Sorts refined raw ores into smeltable ores.
-
-filtration-unit=Filters out impurities from liquids.
-crystallizer=Forces the crystallization of higher elements from chemical solutions.
-
-thermal-bore=A machine that uses a fissure to extract mineral rich thermal water from deep underground. Not the ideal setup.
-thermal-extractor=Specialized machine that uses a fissure to extract mineral rich thermal water from deep underground at a reasonable rate.
-
-angels-void=You are missing dependencies or something went wrong. If the error persists, please report it on Bugs thread in the forum.
-
-[entity-description]
-burner-ore-crusher=Don't stick your fingers in. Crushes raw ores.
-ore-crusher=Don't stick your fingers in. Crushes raw ores.
-ore-crusher-2=Don't stick your fingers in. Crushes raw ores.
-ore-crusher-3=Don't stick your fingers in. Crushes raw ores.
-
-ore-floatation-cell=Further refines crushed ores using froth flotation.
-ore-floatation-cell-2=Further refines crushed ores using froth flotation.
-ore-floatation-cell-3=Further refines crushed ores using froth flotation.
-
-ore-leaching-plant=Further refines ore chunks using chemical leaching.
-ore-leaching-plant-2=Further refines ore chunks using chemical leaching.
-ore-leaching-plant-3=Further refines ore chunks using chemical leaching.
-
-ore-refinery=Further refines ore crystals using heating and roasting processes.
-ore-refinery-2=Further refines ore crystals using heating and roasting processes.
-ore-refinery-3=Further refines ore crystals using heating and roasting processes.
-
-ore-sorting-facility=Sorts refined raw ores into smeltable ores.
-ore-sorting-facility-2=Sorts refined raw ores into smeltable ores.
-ore-sorting-facility-3=Sorts refined raw ores into smeltable ores.
-ore-sorting-facility-4=Sorts refined raw ores into smeltable ores.
-
-filtration-unit=Filters out impurities from liquids.
-filtration-unit-2=Filters out impurities from liquids.
-crystallizer=Forces the crystallization of higher elements from chemical solutions.
-crystallizer-2=Forces the crystallization of higher elements from chemical solutions.
-
-thermal-bore=A machine that uses a fissure to extract mineral rich thermal water from deep underground. Not the ideal setup.
-thermal-extractor=Specialized machine that uses a fissure to extract mineral rich thermal water from deep underground at a reasonable rate.
diff --git a/angelsrefining/locale/en/water-treatment.cfg b/angelsrefining/locale/en/water-treatment.cfg
index c8739baa5..692840fd2 100644
--- a/angelsrefining/locale/en/water-treatment.cfg
+++ b/angelsrefining/locale/en/water-treatment.cfg
@@ -56,6 +56,19 @@ washing-plant-2=Washing plant 2
 barreling-pump=Barreling pump
 ground-water-pump=Ground water bore
 
+[entity-description]
+hydro-plant=Purifies water and separates impurities from waste water.
+hydro-plant-2=Purifies water and separates impurities from waste water.
+hydro-plant-3=Purifies water and separates impurities from waste water.
+clarifier=Helps you to get rid of all the water you don't want.
+salination-plant=Increases salinity of water via evaporation.
+salination-plant-2=Increases salinity of water via evaporation.
+seafloor-pump=Extracts visous mud water from a body of water.
+washing-plant=Dilutes mud water or extracts sediments.
+washing-plant-2=Dilutes mud water or extracts sediments.
+barreling-pump=Fills or empties fluid containers.
+ground-water-pump=Pumps water from a deep aquifer. Slow but readily available.
+
 [item-name]
 solid-mud=Mud
 solid-limestone=Limestone
@@ -74,14 +87,7 @@ water-washing=Washing
 nodule-processing=Nodule processing
 
 [technology-description]
-water-treatment=Water treatment
-angels-fluid-barreling=Fluid barreling
-water-washing=Washing
-nodule-processing=Nodule processing
+water-treatment=Essential methods for the treatment of impure water.
+angels-fluid-barreling=Methods to fill fluids into containers for alternative transport.
+water-washing=Processing of mud water and extraction of sediments.
 
-[entity-description]
-clarifier=Helps you to get rid of all the water you don't want (water void).
-seafloor-pump=Provides mud water for washing plant.
-washing-plant=Processes mud water.
-washing-plant-2=Processes mud water.
-ground-water-pump=Pumps fluid from a deep underground reservoir. Slow but readily available.
diff --git a/angelsrefining/prototypes/angels-functions.lua b/angelsrefining/prototypes/angels-functions.lua
index 7142ca5e3..2936a2dfc 100644
--- a/angelsrefining/prototypes/angels-functions.lua
+++ b/angelsrefining/prototypes/angels-functions.lua
@@ -1,24 +1,24 @@
 -------------------------------------------------------------------------------
---GET ICON/ICONS FROM FLUID/ITEM ----------------------------------------------
+-- GET ICON/ICONS FROM FLUID/ITEM ---------------------------------------------
 -------------------------------------------------------------------------------
 local function get_icons(object_name)
-  for _, prototype in pairs({"item", "fluid", "capsule"}) do
+  for _, prototype in pairs({"item", "fluid", "ammo", "capsule"}) do
     local object = data.raw[prototype][object_name]
     if object then
+      if object.icons then -- icons has precedence over icon
+        return object.icons
+      end
       if object.icon then
-        local scale = 32 / (object.icon_size or 32)
+        -- local scale = 32 / (object.icon_size or 32)
         return {
           {
             icon = object.icon,
             icon_size = object.icon_size or 32,
             icon_mipmaps = object.icon_mipmaps ~= 1 and object.icon_mipmaps or nil,
-            scale = scale ~= 1 and scale or nil
+            scale = 32 / (object.icon_size or 32)
           }
         }
       end
-      if object.icons then
-        return object.icons
-      end
     end
   end
   --something is wrong here but we need to return something
@@ -110,15 +110,36 @@ local function clean_table(t)
   return t
 end
 
-function angelsmods.functions.add_number_icon_layer(icon_layers, number_tier, number_tint)
+function angelsmods.functions.add_number_icon_layer(icon_layers, number_tier, number_tint, outline_tint)
   -- adds a new layer to icon_layers to show the tier number (with a color)
-  local icon_size_scale = (icon_layers[1].icon_size or 32) * (icon_layers[1].scale or 1) / 32
+  -- outline_tint is optional
+  local icon_size_scale = 0.5
+  local icon_size_shift = {0, 0}
+
+  icon_layers = icon_layers or {}
+  if #icon_layers == 0 then
+    -- if the icon_layer is empty, we make sure it will be a full sized number after usage in the recipe functions
+    icon_size_scale = 0.5 * 32 / 10.24
+    icon_size_shift = {11.5 * icon_size_scale * 2, 12 * icon_size_scale * 2}
+  elseif icon_layers[1].scale then
+    icon_size_scale = (icon_layers[1].icon_size or 32) * (icon_layers[1].scale) / 64
+  end
+
   return angelsmods.functions.add_icon_layer(icon_layers, {
-    icon = "__angelsrefining__/graphics/icons/num_"..number_tier..".png",
-    icon_size = 32, icon_mipmaps = 1,
-    tint = unify_tint(number_tint),
-    scale = 0.32 * icon_size_scale,
-    shift = {-12 * icon_size_scale, -12 * icon_size_scale},
+    {
+      icon = "__angelsrefining__/graphics/icons/numerals/num-"..number_tier.."-outline.png",
+      icon_size = 64, icon_mipmaps = 2,
+      tint = unify_tint(outline_tint or {0, 0, 0, 1}),
+      scale = icon_size_scale,
+      shift = icon_size_shift
+    },
+    {
+      icon = "__angelsrefining__/graphics/icons/numerals/num-"..number_tier..".png",
+      icon_size = 64, icon_mipmaps = 2,
+      tint = unify_tint(number_tint),
+      scale = icon_size_scale,
+      shift = icon_size_shift
+    }
   })
 end
 
@@ -148,7 +169,7 @@ local icon_tint_table = {
 local function create_recipe_molecule_icons(molecules_icon, molecules_shift, molecules_scale)
   molecules_icon = clean_table(molecules_icon) or {}
   molecules_shift = molecules_shift or {{-11.5, 12}, {11.5, 12}, {0, 12}}
-  molecules_scale = molecules_scale or 10.24 / 32 -- assume base 32 size
+  molecules_scale = molecules_scale or (10.24 / 32) -- assume base 32 size
 
   for molecule_index, molecule_icon in pairs(molecules_icon) do
     if type(molecule_icon) ~= "table" and get_icons(molecule_icon) ~= "__angelsrefining__/graphics/icons/void.png" then
@@ -1006,6 +1027,25 @@ end
 -------------------------------------------------------------------------------
 -- MODIFY FLAGS ---------------------------------------------------------------
 -------------------------------------------------------------------------------
+local building_types = {
+  "assembling-machine",
+  "mining-drill",
+  "lab",
+  "furnace",
+  "offshore-pump",
+  "pump",
+  "rocket-silo",
+  "radar",
+  "beacon",
+  "boiler",
+  "generator",
+  "solar-panel",
+  "accumulator",
+  "reactor",
+  "electric-pole",
+  "wall",
+  "gate"
+}
 function angelsmods.functions.add_flag(entity, flag) -- Adds a flag to an item/fluid (may be a table containing a list of items/fluids)
   if type(entity) == "table" then
     for _, ent in pairs(entity) do
@@ -1014,27 +1054,29 @@ function angelsmods.functions.add_flag(entity, flag) -- Adds a flag to an item/f
     return
   end
 
-  local to_add = data.raw.item[entity] or data.raw.tool[entity] or data.raw["item-with-entity-data"][entity] or nil
-  if to_add then
-    if to_add.flags then
-      table.insert(to_add.flags, flag)
-    else
-      to_add.flags = {flag}
+  for _,type in pairs({"item","tool","item-with-entity-data","fluid"}) do --list of things to hide
+    local to_add = data.raw[type][entity] or nil
+    if to_add then
+      if to_add.flags then
+        table.insert(to_add.flags, flag)
+      else
+        to_add.flags = {flag}
+      end
+      if type == "fluid" and flag == "hidden" then --also remove barrel if a fluid
+        angelsmods.functions.disable_barreling_recipes(entity)
+      end
     end
-    return
   end
-
-  to_add = data.raw.fluid[entity]
-  if to_add then
-    if flag == "hidden" then
-      to_add.hidden = true
-      angelsmods.functions.disable_barreling_recipes(entity)
-    elseif to_add.flags then
-      table.insert(to_add.flags, flag)
-    else
-      to_add.flags = {flag}
+  --actual entity if not not just an item
+  for _,type in pairs(building_types) do
+    to_add = data.raw[type][entity] --entity-types...
+    if to_add then
+      if to_add.flags then
+        table.insert(to_add.flags, flag)
+      else
+        to_add.flags = {flag}
+      end
     end
-    return
   end
 end
 
@@ -1046,24 +1088,27 @@ function angelsmods.functions.remove_flag(entity, flag_to_remove) -- Removes a f
     return
   end
 
-  local to_remove = data.raw.item[entity] or data.raw.tool[entity] or data.raw["item-with-entity-data"][entity] or nil
-  if to_remove then
-    for flag_index, flag in pairs(to_remove.flags or {}) do
-      if flag == flag_to_remove then
-        table.remove(to_remove.flags, flag_index)
-        return
+  for _,type in pairs({"item","tool","item-with-entity-data","fluid"}) do --list of things to hide
+     -- THIS DOES NOT RE-ENABLE THE BARRELING RECIPES FOR THIS FLUID!
+    local to_remove = data.raw[type][entity] or nil
+    if to_remove then
+      if to_remove.flags then
+        table.insert(to_remove.flags, flag)
+      else
+        to_remove.flags = {flag}
       end
     end
-    return
   end
-
-  to_remove = data.raw.fluid[entity]
-  if to_remove then
-    if flag == "hidden" then
-      to_remove.hidden = false
-      -- THIS DOES NOT RE-ENABLE THE BARRELING RECIPES FOR THIS FLUID!
+  --actual entity if not not just an item
+  for _,type in pairs(building_types) do
+    to_remove = data.raw[type][entity] --entity-types...
+    if to_remove then
+      for flag_index, flag in pairs(to_remove.flags or {}) do
+        if flag == flag_to_remove then
+          table.remove(to_remove.flags, flag_index)
+        end
+      end
     end
-    return
   end
 end
 
@@ -1137,7 +1182,7 @@ function angelsmods.functions.create_barreling_fluid_subgroup(fluids_to_move)
 
   local items = data.raw.item
   local recipes = data.raw.recipe
-  
+
   if not fluids_to_move or #fluids_to_move == 0 then
     fluids_to_move = data.raw.fluid
   end
@@ -1445,7 +1490,7 @@ function angelsmods.functions.add_crafting_category(crafting_machine_type, craft
 
   local crafting_machine_prototype = data.raw[crafting_machine_type][crafting_machine_name]
   crafting_machine_prototype.crafting_categories = crafting_machine_prototype.crafting_categories or {}
-  
+
   for _, category_name in pairs(crafting_machine_prototype.crafting_categories) do
     if category_name == crafting_category then
       return -- already present
@@ -1453,7 +1498,7 @@ function angelsmods.functions.add_crafting_category(crafting_machine_type, craft
   end
 
   table.insert(crafting_machine_prototype.crafting_categories, crafting_category)
-  
+
   if crafting_category ~= "angels-unused-machine" then
     angelsmods.functions.remove_crafting_category(crafting_machine_type, crafting_machine_name, "angels-unused-machine")
   end
@@ -1475,7 +1520,7 @@ function angelsmods.functions.remove_crafting_category(crafting_machine_type, cr
   for category_index, category_name in pairs(crafting_machine_categories) do
     if category_name == crafting_category then
       table.remove(crafting_machine_categories, category_index)
-      
+
       if next(crafting_machine_categories) then
         return
       else
diff --git a/angelsrefining/prototypes/angels-settings.lua b/angelsrefining/prototypes/angels-settings.lua
new file mode 100644
index 000000000..9dee86ea1
--- /dev/null
+++ b/angelsrefining/prototypes/angels-settings.lua
@@ -0,0 +1,15 @@
+angelsmods = angelsmods or {}
+angelsmods.settings = angelsmods.settings or {}
+
+function angelsmods.settings.hide_setting(setting_type, setting_name, forced_setting_value)
+  if data.raw[setting_type] and data.raw[setting_type][setting_name] then
+    data.raw[setting_type][setting_name].hidden = true
+    if forced_setting_value ~= nil then
+      data.raw[setting_type][setting_name].forced_value = forced_setting_value
+    else
+      data.raw[setting_type][setting_name].forced_value = data.raw[setting_type][setting_name].default_value
+    end
+  else
+    log("Could not find setting '" .. setting_name .. "'.")
+  end
+end
diff --git a/angelsrefining/prototypes/buildings/crystallizer.lua b/angelsrefining/prototypes/buildings/crystallizer.lua
index 1b646d8e5..7e0c3fc4c 100644
--- a/angelsrefining/prototypes/buildings/crystallizer.lua
+++ b/angelsrefining/prototypes/buildings/crystallizer.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "crystallizer",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/crystallizer.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/crystallizer.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "c[crystallizer]-a[mk1]",
       place_result = "crystallizer",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "crystallizer",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/crystallizer.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/crystallizer.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "crystallizer"},
       fast_replaceable_group = "crystallizer",
@@ -103,18 +95,14 @@ data:extend(
     {
       type = "item",
       name = "crystallizer-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/crystallizer.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/crystallizer.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "c[crystallizer]-b[mk2]",
       place_result = "crystallizer-2",
@@ -123,18 +111,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "crystallizer-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/crystallizer.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/crystallizer.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "crystallizer-2"},
       fast_replaceable_group = "crystallizer",
diff --git a/angelsrefining/prototypes/buildings/electro-whinning-cell.lua b/angelsrefining/prototypes/buildings/electro-whinning-cell.lua
index a805674be..77cba84c8 100644
--- a/angelsrefining/prototypes/buildings/electro-whinning-cell.lua
+++ b/angelsrefining/prototypes/buildings/electro-whinning-cell.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "electro-whinning-cell",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "ore-whinning",
       order = "d",
       place_result = "electro-whinning-cell",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "electro-whinning-cell",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "electro-whinning-cell"},
       fast_replaceable_group = "electro-whinning-cell",
@@ -122,18 +114,14 @@ data:extend(
     {
       type = "item",
       name = "electro-whinning-cell-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "ore-whinning",
       order = "e",
       place_result = "electro-whinning-cell-2",
@@ -142,18 +130,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "electro-whinning-cell-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "electro-whinning-cell-2"},
       fast_replaceable_group = "electro-whinning-cell",
@@ -241,18 +225,14 @@ data:extend(
     {
       type = "item",
       name = "electro-whinning-cell-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       subgroup = "ore-whinning",
       order = "f",
       place_result = "electro-whinning-cell-3",
@@ -261,18 +241,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "electro-whinning-cell-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/electro-whinning-cell-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "electro-whinning-cell-3"},
       fast_replaceable_group = "electro-whinning-cell",
diff --git a/angelsrefining/prototypes/buildings/filtration-unit.lua b/angelsrefining/prototypes/buildings/filtration-unit.lua
index a2c67b194..528091116 100644
--- a/angelsrefining/prototypes/buildings/filtration-unit.lua
+++ b/angelsrefining/prototypes/buildings/filtration-unit.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "filtration-unit",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/filtration-unit.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/filtration-unit.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "b[filtration-unit]-a[mk1]",
       place_result = "filtration-unit",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "filtration-unit",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/filtration-unit.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/filtration-unit.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "filtration-unit"},
       fast_replaceable_group = "filtration-unit",
@@ -118,18 +110,14 @@ data:extend(
     {
       type = "item",
       name = "filtration-unit-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/filtration-unit.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/filtration-unit.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "b[filtration-unit]-b[mk2]",
       place_result = "filtration-unit-2",
@@ -138,18 +126,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "filtration-unit-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/filtration-unit.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/filtration-unit.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "filtration-unit-2"},
       fast_replaceable_group = "filtration-unit",
diff --git a/angelsrefining/prototypes/buildings/hydro-plant.lua b/angelsrefining/prototypes/buildings/hydro-plant.lua
index 0b8428895..0c96bff6f 100644
--- a/angelsrefining/prototypes/buildings/hydro-plant.lua
+++ b/angelsrefining/prototypes/buildings/hydro-plant.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "hydro-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/hydro-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/hydro-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "water-treatment-building",
       order = "a[hydro-plant]",
       place_result = "hydro-plant",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "hydro-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/hydro-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/hydro-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "hydro-plant"},
       fast_replaceable_group = "hydro-plant",
@@ -116,18 +108,14 @@ data:extend(
     {
       type = "item",
       name = "hydro-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/hydro-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/hydro-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "water-treatment-building",
       order = "b[hydro-plant2-]",
       place_result = "hydro-plant-2",
@@ -136,18 +124,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "hydro-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/hydro-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/hydro-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "hydro-plant-2"},
       fast_replaceable_group = "hydro-plant",
@@ -229,18 +213,14 @@ data:extend(
     {
       type = "item",
       name = "hydro-plant-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/hydro-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/hydro-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       subgroup = "water-treatment-building",
       order = "b[hydro-plant2-]",
       place_result = "hydro-plant-3",
@@ -249,18 +229,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "hydro-plant-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/hydro-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/hydro-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "hydro-plant-3"},
       fast_replaceable_group = "hydro-plant",
diff --git a/angelsrefining/prototypes/buildings/liquifier.lua b/angelsrefining/prototypes/buildings/liquifier.lua
index f55a348de..0f39ae7b7 100644
--- a/angelsrefining/prototypes/buildings/liquifier.lua
+++ b/angelsrefining/prototypes/buildings/liquifier.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "liquifier",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/liquifier.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/liquifier.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "f[liquifier]",
       place_result = "liquifier",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "liquifier",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/liquifier.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/liquifier.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "liquifier"},
       fast_replaceable_group = "liquifier",
@@ -106,18 +98,14 @@ data:extend(
     {
       type = "item",
       name = "liquifier-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/liquifier.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/liquifier.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "g[liquifier-2]",
       place_result = "liquifier-2",
@@ -126,18 +114,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "liquifier-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/liquifier.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/liquifier.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "liquifier-2"},
       fast_replaceable_group = "liquifier",
@@ -209,18 +193,14 @@ data:extend(
     {
       type = "item",
       name = "liquifier-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/liquifier.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/liquifier.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "h[liquifier-3]",
       place_result = "liquifier-3",
@@ -229,18 +209,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "liquifier-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/liquifier.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/liquifier.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "liquifier-3"},
       fast_replaceable_group = "liquifier",
@@ -312,18 +288,14 @@ data:extend(
     {
       type = "item",
       name = "liquifier-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/liquifier.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/liquifier.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "i[liquifier-4]",
       place_result = "liquifier-4",
@@ -332,18 +304,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "liquifier-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/liquifier.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/liquifier.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "liquifier-4"},
       fast_replaceable_group = "liquifier",
diff --git a/angelsrefining/prototypes/buildings/ore-crusher.lua b/angelsrefining/prototypes/buildings/ore-crusher.lua
index a748477d5..329596395 100644
--- a/angelsrefining/prototypes/buildings/ore-crusher.lua
+++ b/angelsrefining/prototypes/buildings/ore-crusher.lua
@@ -4,18 +4,14 @@ data:extend(
     {
       type = "item",
       name = "burner-ore-crusher",
-      icons = {
+      icons = --angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-crusher-burner.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-crusher-burner.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        --1, angelsmods.refining.number_tint),
       subgroup = "ore-crusher",
       order = "a[burner-ore-crusher]",
       place_result = "burner-ore-crusher",
@@ -24,18 +20,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "burner-ore-crusher",
-      icons = {
+      icons = --angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-crusher-burner.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-crusher-burner.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        --1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 0.5, result = "burner-ore-crusher"},
       fast_replaceable_group = "ore-crusher",
@@ -101,18 +93,14 @@ data:extend(
     {
       type = "item",
       name = "ore-crusher",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-crusher.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-crusher.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "ore-crusher",
       order = "b[ore-crusher]",
       place_result = "ore-crusher",
@@ -121,18 +109,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-crusher",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-crusher.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-crusher.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-crusher"},
       fast_replaceable_group = "ore-crusher",
@@ -175,18 +159,14 @@ data:extend(
     {
       type = "item",
       name = "ore-crusher-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-crusher-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-crusher-2.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "ore-crusher",
       order = "c[ore-crusher-2]",
       place_result = "ore-crusher-2",
@@ -195,18 +175,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-crusher-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-crusher-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-crusher-2.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-crusher-2"},
       fast_replaceable_group = "ore-crusher",
@@ -263,18 +239,14 @@ data:extend(
     {
       type = "item",
       name = "ore-crusher-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-crusher-3.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-crusher-3.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       subgroup = "ore-crusher",
       order = "d[ore-crusher-3]",
       place_result = "ore-crusher-3",
@@ -283,18 +255,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-crusher-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-crusher-3.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-crusher-3.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-crusher-3"},
       fast_replaceable_group = "ore-crusher",
diff --git a/angelsrefining/prototypes/buildings/ore-floatation-cell.lua b/angelsrefining/prototypes/buildings/ore-floatation-cell.lua
index bc58162f1..bbb48fbf0 100644
--- a/angelsrefining/prototypes/buildings/ore-floatation-cell.lua
+++ b/angelsrefining/prototypes/buildings/ore-floatation-cell.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "ore-floatation-cell",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "ore-floatation",
       order = "a[ore-floatation-cell]",
       place_result = "ore-floatation-cell",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-floatation-cell",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-floatation-cell.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-floatation-cell"},
       fast_replaceable_group = "ore-floatation-cell",
@@ -95,18 +87,14 @@ data:extend(
     {
       type = "item",
       name = "ore-floatation-cell-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-2.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "ore-floatation",
       order = "b[ore-floatation-cell-2]",
       place_result = "ore-floatation-cell-2",
@@ -115,18 +103,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-floatation-cell-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-2.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-floatation-cell-2"},
       fast_replaceable_group = "ore-floatation-cell",
@@ -201,18 +185,14 @@ data:extend(
     {
       type = "item",
       name = "ore-floatation-cell-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-3.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-3.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       subgroup = "ore-floatation",
       order = "c[ore-floatation-cell-3]",
       place_result = "ore-floatation-cell-3",
@@ -221,18 +201,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-floatation-cell-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-3.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-floatation-cell-3.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-floatation-cell-3"},
       fast_replaceable_group = "ore-floatation-cell",
diff --git a/angelsrefining/prototypes/buildings/ore-leaching-plant.lua b/angelsrefining/prototypes/buildings/ore-leaching-plant.lua
index fb30ffc24..66e03e59b 100644
--- a/angelsrefining/prototypes/buildings/ore-leaching-plant.lua
+++ b/angelsrefining/prototypes/buildings/ore-leaching-plant.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "ore-leaching-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-leaching-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-leaching-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "ore-leaching",
       order = "a[ore-leaching-plant]",
       place_result = "ore-leaching-plant",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-leaching-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-leaching-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-leaching-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-leaching-plant"},
       fast_replaceable_group = "ore-leaching-plant",
@@ -92,17 +84,14 @@ data:extend(
     {
       type = "item",
       name = "ore-leaching-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-2.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.refining.number_tint),
       icon_size = 32,
       subgroup = "ore-leaching",
       order = "b[ore-leaching-plant-2]",
@@ -112,18 +101,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-leaching-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-2.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-leaching-plant-2"},
       fast_replaceable_group = "ore-leaching-plant",
@@ -194,18 +179,14 @@ data:extend(
     {
       type = "item",
       name = "ore-leaching-plant-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-3.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-3.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       subgroup = "ore-leaching",
       order = "c[ore-leaching-plant-3]",
       place_result = "ore-leaching-plant-3",
@@ -214,18 +195,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-leaching-plant-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-3.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-leaching-plant-3.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-leaching-plant-3"},
       fast_replaceable_group = "ore-leaching-plant",
diff --git a/angelsrefining/prototypes/buildings/ore-refinery.lua b/angelsrefining/prototypes/buildings/ore-refinery.lua
index 627ec3875..a01e9bb08 100644
--- a/angelsrefining/prototypes/buildings/ore-refinery.lua
+++ b/angelsrefining/prototypes/buildings/ore-refinery.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "ore-refinery",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-refinery.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-refinery.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "ore-refining",
       order = "a[ore-refinery]",
       place_result = "ore-refinery",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-refinery",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-refinery.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-refinery.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-refinery"},
       fast_replaceable_group = "ore-refinery",
@@ -107,18 +99,14 @@ data:extend(
     {
       type = "item",
       name = "ore-refinery-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-refinery-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-refinery.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "ore-refining",
       order = "b[ore-refinery-2]",
       place_result = "ore-refinery-2",
@@ -127,18 +115,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-refinery-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-refinery-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-refinery.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-refinery-2"},
       fast_replaceable_group = "ore-refinery",
diff --git a/angelsrefining/prototypes/buildings/ore-sorting-facility.lua b/angelsrefining/prototypes/buildings/ore-sorting-facility.lua
index 1a505f716..66fc5f63d 100644
--- a/angelsrefining/prototypes/buildings/ore-sorting-facility.lua
+++ b/angelsrefining/prototypes/buildings/ore-sorting-facility.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "ore-sorting-facility",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "ore-sorter",
       order = "a[ore-sorting-facility]",
       place_result = "ore-sorting-facility",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-sorting-facility",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-sorting-facility.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-sorting-facility"},
       fast_replaceable_group = "ore-sorting-facility",
@@ -91,18 +83,14 @@ data:extend(
     {
       type = "item",
       name = "ore-sorting-facility-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-2.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "ore-sorter",
       order = "b[ore-sorting-facility-2]",
       place_result = "ore-sorting-facility-2",
@@ -111,18 +99,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-sorting-facility-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-2.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-2.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-sorting-facility-2"},
       fast_replaceable_group = "ore-sorting-facility",
@@ -180,18 +164,14 @@ data:extend(
     {
       type = "item",
       name = "ore-sorting-facility-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-3.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-3.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       subgroup = "ore-sorter",
       order = "c[ore-sorting-facility-3]",
       place_result = "ore-sorting-facility-3",
@@ -200,18 +180,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-sorting-facility-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-3.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-3.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-sorting-facility-3"},
       fast_replaceable_group = "ore-sorting-facility",
@@ -269,18 +245,14 @@ data:extend(
     {
       type = "item",
       name = "ore-sorting-facility-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-4.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-4.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.refining.number_tint),
       subgroup = "ore-sorter",
       order = "d[ore-sorting-facility-4]",
       place_result = "ore-sorting-facility-4",
@@ -289,18 +261,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-sorting-facility-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-4.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/ore-sorting-facility-4.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        4, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-sorting-facility-4"},
       fast_replaceable_group = "ore-sorting-facility",
@@ -321,7 +289,7 @@ data:extend(
         emissions_per_minute = 0.06 * 60
       },
       energy_usage = "300kW",
-      ingredient_count = 6,
+      --ingredient_count = 6,
       animation = {
         layers = {
           {
diff --git a/angelsrefining/prototypes/buildings/powderizer.lua b/angelsrefining/prototypes/buildings/powderizer.lua
index 10f3a5af9..0d521c546 100644
--- a/angelsrefining/prototypes/buildings/powderizer.lua
+++ b/angelsrefining/prototypes/buildings/powderizer.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "ore-powderizer",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/powderizer-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/powderizer-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "ore-powderizer",
       order = "a",
       place_result = "ore-powderizer",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-powderizer",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/powderizer-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/powderizer-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-powderizer"},
       fast_replaceable_group = "ore-powderizer",
@@ -88,18 +80,14 @@ data:extend(
     {
       type = "item",
       name = "ore-powderizer-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/powderizer-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/powderizer-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "ore-powderizer",
       order = "b",
       place_result = "ore-powderizer-2",
@@ -108,18 +96,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-powderizer-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/powderizer-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/powderizer-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-powderizer-2"},
       fast_replaceable_group = "ore-powderizer",
@@ -173,18 +157,14 @@ data:extend(
     {
       type = "item",
       name = "ore-powderizer-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/powderizer-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/powderizer-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       subgroup = "ore-powderizer",
       order = "c",
       place_result = "ore-powderizer-3",
@@ -193,18 +173,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-powderizer-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/powderizer-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/powderizer-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        3, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-powderizer-3"},
       fast_replaceable_group = "ore-powderizer",
diff --git a/angelsrefining/prototypes/buildings/salination-plant.lua b/angelsrefining/prototypes/buildings/salination-plant.lua
index 40858cd64..498f4f4bd 100644
--- a/angelsrefining/prototypes/buildings/salination-plant.lua
+++ b/angelsrefining/prototypes/buildings/salination-plant.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "salination-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/salination-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/salination-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "water-treatment-building",
       order = "d[salination-plant]",
       place_result = "salination-plant",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "salination-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/salination-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/salination-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "salination-plant"},
       fast_replaceable_group = "salination-plant",
@@ -95,18 +87,14 @@ data:extend(
     {
       type = "item",
       name = "salination-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/salination-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/salination-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "water-treatment-building",
       order = "e[salination-plant2-]",
       place_result = "salination-plant-2",
@@ -115,18 +103,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "salination-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/salination-plant.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/salination-plant.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "salination-plant-2"},
       fast_replaceable_group = "salination-plant",
diff --git a/angelsrefining/prototypes/buildings/thermal-extractor.lua b/angelsrefining/prototypes/buildings/thermal-extractor.lua
index 84b7ff455..6ddd294f9 100644
--- a/angelsrefining/prototypes/buildings/thermal-extractor.lua
+++ b/angelsrefining/prototypes/buildings/thermal-extractor.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "thermal-bore",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/thermal-extractor.png",
+          {
+            icon = "__angelsrefining__/graphics/icons/thermal-extractor.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "a[thermal-extractor]-a[bore]",
       place_result = "thermal-bore",
@@ -23,8 +19,14 @@ data:extend(
     {
       type = "mining-drill",
       name = "thermal-bore",
-      icon = "__angelsrefining__/graphics/icons/thermal-extractor.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsrefining__/graphics/icons/thermal-extractor.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
+        },
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "thermal-bore"},
       resource_categories = {"angels-fissure"},
@@ -43,7 +45,7 @@ data:extend(
         usage_priority = "secondary-input"
       },
       output_fluid_box = {
-        base_area = 1,
+        base_area = 5,
         base_level = 1,
         pipe_covers = pipecoverspictures(),
         pipe_connections =
@@ -171,18 +173,14 @@ data:extend(
     {
       type = "item",
       name = "thermal-extractor",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/thermal-extractor.png",
+          {
+            icon = "__angelsrefining__/graphics/icons/thermal-extractor.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "refining-buildings",
       order = "a[thermal-extractor]-b[extractor]",
       place_result = "thermal-extractor",
@@ -191,8 +189,14 @@ data:extend(
     {
       type = "mining-drill",
       name = "thermal-extractor",
-      icon = "__angelsrefining__/graphics/icons/thermal-extractor.png",
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        {
+          {
+            icon = "__angelsrefining__/graphics/icons/thermal-extractor.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
+        },
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "thermal-extractor"},
       resource_categories = {"angels-fissure"},
@@ -211,7 +215,7 @@ data:extend(
         usage_priority = "secondary-input"
       },
       output_fluid_box = {
-        base_area = 1,
+        base_area = 10,
         base_level = 1,
         pipe_covers = pipecoverspictures(),
         pipe_connections = {
diff --git a/angelsrefining/prototypes/buildings/washing-plant.lua b/angelsrefining/prototypes/buildings/washing-plant.lua
index bbe2730b0..217e19ff7 100644
--- a/angelsrefining/prototypes/buildings/washing-plant.lua
+++ b/angelsrefining/prototypes/buildings/washing-plant.lua
@@ -3,18 +3,14 @@ data:extend(
     {
       type = "item",
       name = "washing-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       subgroup = "washing-building",
       order = "b",
       place_result = "washing-plant",
@@ -23,18 +19,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "washing-plant",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "washing-plant"},
       fast_replaceable_group = "washing-plant",
@@ -109,18 +101,14 @@ data:extend(
     {
       type = "item",
       name = "washing-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       subgroup = "washing-building",
       order = "c",
       place_result = "washing-plant-2",
@@ -129,18 +117,14 @@ data:extend(
     {
       type = "assembling-machine",
       name = "washing-plant-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png"
+          {
+            icon = "__angelsrefining__/graphics/icons/washing-plant-ico.png",
+            icon_size = 32, icon_mipmaps = 1
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.refining.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "washing-plant-2"},
       fast_replaceable_group = "washing-plant",
diff --git a/angelsrefining/prototypes/generation/angels-fissure.lua b/angelsrefining/prototypes/generation/angels-fissure.lua
index 05008df21..1bfb3593b 100644
--- a/angelsrefining/prototypes/generation/angels-fissure.lua
+++ b/angelsrefining/prototypes/generation/angels-fissure.lua
@@ -7,6 +7,7 @@ data:extend(
     {
       type = "autoplace-control",
       name = "angels-fissure",
+      localised_name = {"", "[entity=angels-fissure] ", {"entity-name.angels-fissure"}},
       richness = true,
       order = "b-e",
       category = "resource"
@@ -14,7 +15,7 @@ data:extend(
     {
       type = "resource",
       name = "angels-fissure",
-      icon = "__base__/graphics/icons/crude-oil-resource.png",
+      icon = "__angelsrefining__/graphics/icons/fissure.png",
       icon_size = 64,
       icon_mipmaps = 4,
       flags = {"placeable-neutral"},
diff --git a/angelsrefining/prototypes/generation/angels-ore.lua b/angelsrefining/prototypes/generation/angels-ore.lua
index 366e36b40..ba776f28d 100644
--- a/angelsrefining/prototypes/generation/angels-ore.lua
+++ b/angelsrefining/prototypes/generation/angels-ore.lua
@@ -175,7 +175,7 @@ angelsmods.functions.add_resource(
     output_name = "thermal-water",
     output_min = 20,
     output_max = 20,
-    icon = "__base__/graphics/icons/crude-oil-resource.png",
+    icon = "__angelsrefining__/graphics/icons/fissure.png",
     icon_size = 64,
     icon_mipmaps = 4,
     autoplace = {
diff --git a/angelsrefining/prototypes/generation/angels-override.lua b/angelsrefining/prototypes/generation/angels-override.lua
index c620f7224..63c796bf7 100644
--- a/angelsrefining/prototypes/generation/angels-override.lua
+++ b/angelsrefining/prototypes/generation/angels-override.lua
@@ -34,21 +34,16 @@ if not angelsmods.refining.disable_ore_override then
 
   --YUOKI
   if data.raw.resource["y-res1"] then
-    data.raw.resource["y-res1"] = nil
-    data.raw["autoplace-control"]["y-res1"] = nil
-
-    data.raw.resource["y-res2"] = nil
-    data.raw["autoplace-control"]["y-res2"] = nil
+    angelsmods.functions.remove_resource("y-res1")
+    angelsmods.functions.remove_resource("y-res2")
   end
 
   --URANIUM POWER
   if data.raw.resource["uraninite"] then
-    data.raw.resource["fluorite"] = nil
-    data.raw["autoplace-control"]["fluorite"] = nil
-    data.raw["item"]["fluorite"].icon = "__angelsinfiniteores__/graphics/icons/up-fluorite.png"
+    angelsmods.functions.remove_resource("uraninite")
+    angelsmods.functions.remove_resource("fluorite")
 
-    data.raw.resource["uraninite"] = nil
-    data.raw["autoplace-control"]["uraninite"] = nil
+    data.raw["item"]["fluorite"].icon = "__angelsinfiniteores__/graphics/icons/up-fluorite.png"
     data.raw["item"]["uraninite"].icon = "__angelsinfiniteores__/graphics/icons/up-uraninite.png"
   end
 end
diff --git a/angelsrefining/prototypes/generation/resource-builder.lua b/angelsrefining/prototypes/generation/resource-builder.lua
index 9d2cb6477..ba73be5a6 100644
--- a/angelsrefining/prototypes/generation/resource-builder.lua
+++ b/angelsrefining/prototypes/generation/resource-builder.lua
@@ -9,6 +9,7 @@ local function make_resautoplace(input)
       {
         type = "autoplace-control",
         name = input.name,
+        localised_name = {"", "[entity="..input.name.."] ", {"entity-name."..input.name}},
         richness = true,
         order = "b-" .. input.order,
         category = "resource"
diff --git a/angelsrefining/prototypes/items/refining-ores.lua b/angelsrefining/prototypes/items/refining-ores.lua
index 161c7be0c..84abfb0f2 100644
--- a/angelsrefining/prototypes/items/refining-ores.lua
+++ b/angelsrefining/prototypes/items/refining-ores.lua
@@ -1,26 +1,26 @@
-angel_ore_3 = {
-		type = "item",
-		name = "angels-ore3",
-		subgroup = "angels-ores",
-		order = "c[angels-ore3]",
-		stack_size = 200
+local angel_ore_3 = {
+  type = "item",
+  name = "angels-ore3",
+  subgroup = "angels-ores",
+  order = "c[angels-ore3]",
+  stack_size = 200
 }
 if settings.startup["angels-tryptophobia-friendly-stiratite"].value == true then
-	angel_ore_3["icon"] = "__angelsrefining__/graphics/icons/angels-ore3.png"
-	angel_ore_3["icon_size"] = 32
+  angel_ore_3["icon"] = "__angelsrefining__/graphics/icons/angels-ore3.png"
+  angel_ore_3["icon_size"] = 32
 else
-	angel_ore_3["icon"] = "__angelsrefining__/graphics/icons/angels-ore3-HR.png"
-	angel_ore_3["icon_size"] = 64
-	angel_ore_3["pictures"] = {
-      { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-1.png",   scale = 0.25, mipmap_count = 1 },
-      { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-2.png",   scale = 0.25, mipmap_count = 1 },
-      { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-3.png",   scale = 0.25, mipmap_count = 1 },
-      { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-4.png",   scale = 0.25, mipmap_count = 1 },
-      { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-5.png",   scale = 0.25, mipmap_count = 1 },
-      { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-6.png",   scale = 0.25, mipmap_count = 1 },
-      { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-7.png",   scale = 0.25, mipmap_count = 1 },
-      { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-8.png",   scale = 0.25, mipmap_count = 1 },
-    }
+  angel_ore_3["icon"] = "__angelsrefining__/graphics/icons/angels-ore3-HR.png"
+  angel_ore_3["icon_size"] = 64
+  angel_ore_3["pictures"] = {
+    { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-1.png",   scale = 0.25, mipmap_count = 1 },
+    { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-2.png",   scale = 0.25, mipmap_count = 1 },
+    { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-3.png",   scale = 0.25, mipmap_count = 1 },
+    { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-4.png",   scale = 0.25, mipmap_count = 1 },
+    { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-5.png",   scale = 0.25, mipmap_count = 1 },
+    { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-6.png",   scale = 0.25, mipmap_count = 1 },
+    { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-7.png",   scale = 0.25, mipmap_count = 1 },
+    { size = 64, filename = "__angelsrefining__/graphics/icons/angels-ore3/angels-ore3-8.png",   scale = 0.25, mipmap_count = 1 },
+  }
 end
 
 data:extend(
diff --git a/angelsrefining/prototypes/override/refining-override-bobmining.lua b/angelsrefining/prototypes/override/refining-override-bobmining.lua
index c66448d89..a2cf30ba7 100644
--- a/angelsrefining/prototypes/override/refining-override-bobmining.lua
+++ b/angelsrefining/prototypes/override/refining-override-bobmining.lua
@@ -21,5 +21,15 @@ if mods["bobmining"] then
         "water-miner-5"
       }
     )
+
+    OV.hide_recipe(
+      {
+        "water-miner-1",
+        "water-miner-2",
+        "water-miner-3",
+        "water-miner-4",
+        "water-miner-5"
+      }
+    )
   end
   
\ No newline at end of file
diff --git a/angelsrefining/prototypes/override/refining-override-bobplates.lua b/angelsrefining/prototypes/override/refining-override-bobplates.lua
index 4fc395fc3..d1ae0526a 100644
--- a/angelsrefining/prototypes/override/refining-override-bobplates.lua
+++ b/angelsrefining/prototypes/override/refining-override-bobplates.lua
@@ -11,6 +11,15 @@ if mods["bobplates"] then
     "water-pump-3",
     "water-pump-4"
   }, "hidden")
+  
+  OV.hide_recipe(
+    {
+      "water-pump",
+      "water-pump-2",
+      "water-pump-3",
+      "water-pump-4"
+    }
+  )
 
   angelsmods.functions.set_next_upgrade("assembling-machine", "water-pump", nil)
   angelsmods.functions.set_next_upgrade("assembling-machine", "water-pump-2", nil)
diff --git a/angelsrefining/prototypes/override/refining-override-bobrevamp.lua b/angelsrefining/prototypes/override/refining-override-bobrevamp.lua
index 77a134f0f..c38341f83 100644
--- a/angelsrefining/prototypes/override/refining-override-bobrevamp.lua
+++ b/angelsrefining/prototypes/override/refining-override-bobrevamp.lua
@@ -24,7 +24,9 @@ if mods["bobrevamp"] then
       end
     end
   end
-
+  if mods["bobplates"] and settings.startup["bobmods-revamp-old-oil"] then
+    OV.hide_recipe({"sulfuric-acid","sulfur"})
+  end
 end
   
 --local ammonium = data.raw.recipe["ammonium-chloride-recycling"]
diff --git a/angelsrefining/prototypes/override/refining-override-sorting.lua b/angelsrefining/prototypes/override/refining-override-sorting.lua
index c558f5492..38101ed04 100644
--- a/angelsrefining/prototypes/override/refining-override-sorting.lua
+++ b/angelsrefining/prototypes/override/refining-override-sorting.lua
@@ -577,6 +577,17 @@ else
       "ore-electro-whinning-cell"
     }
   )
+  --also hide buildings
+  OV.hide_recipe({
+    "ore-powderizer",
+    "ore-powderizer-2",
+    "ore-powderizer-3",
+    "milling-drum",
+    "milling-drum-used",
+    "electro-whinning-cell",
+    "electro-whinning-cell-2",
+    "electro-whinning-cell-3",
+  })
 end
 
 if ore_enabled("ferrous") and ore_enabled("cupric") then
@@ -584,6 +595,14 @@ else
   OV.remove_unlock("ore-electro-whinning-cell", "angelsore-crystal-mix6-processing")
   OV.disable_recipe("angelsore-crystal-mix6-processing")
 end
+if not ore_enabled("ferrous") then
+--I DON'T KNOW WHY THIS IS STILL GETTING THROUGH!!!
+  OV.disable_recipe({"angelsore8-crushed","angelsore8-crushed-processing"})
+end
+if not ore_enabled("cupric") then
+--I DON'T KNOW WHY THIS IS STILL GETTING THROUGH!!!
+  OV.disable_recipe({"angelsore9-crushed","angelsore9-crushed-processing"})
+end
 
 -------------------------------------------------------------------------------
 -- MIXED SORTING --------------------------------------------------------------
@@ -708,16 +727,17 @@ OV.patch_recipes(
         {type = "item", name = "thorium-ore", amount = 3}
       },
       {
-        --[[1]] special_vanilla and {
-          {icon = "__angelsrefining__/graphics/icons/sort-icon.png"},
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.refining.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          },
+        --[[1]] special_vanilla and angelsmods.functions.add_icon_layer(
+          angelsmods.functions.add_number_icon_layer(
+            {
+              {
+                icon = "__angelsrefining__/graphics/icons/sort-icon.png",
+                icon_size = 32, icon_mipmaps = 1
+              }
+            },
+            1, angelsmods.refining.number_tint),
           tweaked_icon_lookup("uranium-ore", 0.5, {10, 10})
-        } or {
+        ) or {
           {icon = "__angelsrefining__/graphics/icons/sort-icon.png"},
           tweaked_icon_lookup("rutile-ore", 0.5, {10, 10})
         },
@@ -752,16 +772,17 @@ OV.patch_recipes(
         "unused"
       },
       {
-        --[[1]] special_vanilla and {
-          {icon = "__angelsrefining__/graphics/icons/sort-icon.png"},
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            tint = angelsmods.refining.number_tint,
-            scale = 0.32,
-            shift = {-12, -12}
-          },
+        --[[1]] special_vanilla and angelsmods.functions.add_icon_layer(
+          angelsmods.functions.add_number_icon_layer(
+            {
+              {
+                icon = "__angelsrefining__/graphics/icons/sort-icon.png",
+                icon_size = 32, icon_mipmaps = 1
+              }
+            },
+            2, angelsmods.refining.number_tint),
           tweaked_icon_lookup("uranium-ore", 0.5, {10, 10})
-        } or {
+        ) or {
           {icon = "__angelsrefining__/graphics/icons/sort-icon.png"},
           tweaked_icon_lookup("tungsten-ore", 0.5, {10, 10})
         },
diff --git a/angelsrefining/prototypes/override/refining-override-water-treatment.lua b/angelsrefining/prototypes/override/refining-override-water-treatment.lua
index ac08560f4..3776cf2e3 100644
--- a/angelsrefining/prototypes/override/refining-override-water-treatment.lua
+++ b/angelsrefining/prototypes/override/refining-override-water-treatment.lua
@@ -51,6 +51,25 @@ end
 if angelsmods.trigger.washing_tech == false then --not angelsmods.smelting then
   OV.disable_technology({"water-washing-1", "water-washing-2"})
   OV.remove_prereq("geode-processing-2", "water-washing-2")
+  OV.hide_recipe(
+    {
+      "water-viscous-mud",
+      "washing-1",
+      "washing-2",
+      "washing-3",
+      "washing-4",
+      "washing-5",
+      "solid-mud-landfill",
+      "solid-geodes",
+      "solid-clay",
+      "solid-limestone",
+      "solid-sand",
+      --hide buildings too
+      "seafloor-pump",
+      "washing-plant",
+      "washing-plant-2"
+    }
+  )
 end
 
 angelsmods.functions.move_item("offshore-pump", "washing-building", "d")
@@ -80,8 +99,18 @@ if mods["bobplates"] then
             {type = "fluid", name = "chlorine", amount = 20},
             {type = "fluid", name = "hydrogen", amount = 20}
           },
-          icon = "__angelsrefining__/graphics/icons/electrolysis-salt-water.png",
-          icon_size = 32,
+          --icon = "__angelsrefining__/graphics/icons/electrolysis-salt-water.png",
+          --icon_size = 32,
+          icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
+            {
+              "chlorine",
+              "hydrogen",
+              "sodium-hydroxide"
+            },
+            {
+              {039, 112, 194}, {168, 173, 173}, {070, 133, 232}, {185, 185, 185, 0.8}
+            }
+          ),
           subgroup = "bob-fluid-electrolysis",
           order = "b[fluid-chemistry]-b[salt-water-electrolysis]"
         }
@@ -95,8 +124,10 @@ end
 -- LITHIA WATER ---------------------------------------------------------------
 -------------------------------------------------------------------------------
 if mods["bobplates"] then
-  data.raw.fluid["lithia-water"].icon = "__angelsrefining__/graphics/icons/water-lithia.png"
-  data.raw.fluid["lithia-water"].icon_size = 32 --icon size of 64 overriding caused issues
+  data.raw.fluid["lithia-water"].icons = angelsmods.functions.create_viscous_liquid_fluid_icon(nil, { {032,118,206}, {248,083,099}, {038,137,237,0.8}, {255,073,072,0.8} })
+  data.raw.fluid["lithia-water"].icon = nil
+  data.raw.fluid["lithia-water"].icon_size = nil
+  data.raw.fluid["lithia-water"].icon_mipmaps = nil
   angelsmods.functions.move_item("lithia-water", "water-treatment-fluid", "ea", "fluid")
 
   data:extend(
diff --git a/angelsrefining/prototypes/recipes/water-treatment-recipes.lua b/angelsrefining/prototypes/recipes/water-treatment-recipes.lua
index f480ada35..7415d7487 100644
--- a/angelsrefining/prototypes/recipes/water-treatment-recipes.lua
+++ b/angelsrefining/prototypes/recipes/water-treatment-recipes.lua
@@ -49,6 +49,7 @@ data:extend(
       subgroup = "water-treatment",
       energy_required = 1,
       enabled = false,
+      hidden = true,
       ingredients = {
         {type = "fluid", name = "thermal-water", amount = 50}
       },
diff --git a/angelsrefining/prototypes/refining-override.lua b/angelsrefining/prototypes/refining-override.lua
index 3a218379f..db35171cf 100644
--- a/angelsrefining/prototypes/refining-override.lua
+++ b/angelsrefining/prototypes/refining-override.lua
@@ -132,6 +132,7 @@ if data.raw.item["y-res1"] then
   )
 
   --RECIPES
+  local slag_color = {{202, 099, 017}, {097, 052, 020}, {097, 052, 020}}
   data:extend(
     {
       {
@@ -148,8 +149,13 @@ if data.raw.item["y-res1"] then
           {type = "item", name = "y-res1", amount = 1, probability = 0.5},
           {type = "item", name = "y-res2", amount = 1, probability = 0.5}
         },
-        icon = "__angelsrefining__/graphics/icons/slag-processing-yi.png",
-        icon_size = 32,
+        icons = angelsmods.functions.create_liquid_recipe_icon(
+          {
+            "y-res1",
+            "y-res2"
+          },
+          slag_color
+        ),
         order = "a-a [slag-processing-yi]"
       },
       {
@@ -167,8 +173,10 @@ if data.raw.item["y-res1"] then
         results = {
           {type = "item", name = "y-res1", amount = 6}
         },
-        icon = "__angelsrefining__/graphics/icons/angels-ore-mix-yi1-sorting.png",
-        icon_size = 32,
+        icons = {
+          {icon = "__angelsrefining__/graphics/icons/sort-icon.png", icon_size = 32},
+          {icon = "__Yuoki__/graphics/icons/uni-com-pur.png", icon_size = 32, scale = 0.5, shift = {10, 10}},
+        },
         order = "c-i-g[angelsore-chunk-mix-yi1-processing]"
       },
       {
@@ -186,8 +194,10 @@ if data.raw.item["y-res1"] then
         results = {
           {type = "item", name = "y-res2", amount = 6}
         },
-        icon = "__angelsrefining__/graphics/icons/angels-ore-mix-yi2-sorting.png",
-        icon_size = 32,
+        icons = {
+          {icon = "__angelsrefining__/graphics/icons/sort-icon.png", icon_size = 32},
+          {icon = "__Yuoki__/graphics/icons/yi-res-2-pur.png", icon_size = 32, scale = 0.5, shift = {10, 10}},
+        },
         order = "c-i-g[angelsore-chunk-mix-yi2-processing]"
       },
       {
@@ -205,8 +215,14 @@ if data.raw.item["y-res1"] then
           {type = "fluid", name = "water-purified", amount = 70},
           {type = "item", name = "sulfur", amount = 1}
         },
-        icon = "__angelsrefining__/graphics/icons/water-yellow-waste-purification-yi.png",
-        icon_size = 32,
+        icons = angelsmods.functions.create_liquid_recipe_icon(
+          {
+            "y-con_water",
+            "water-purified",
+            mods["angelspetrochem"] and {"__angelspetrochem__/graphics/icons/solid-sulfur.png", 32} or "sulfur"
+          },
+          "wss"
+        ),--
         order = "a[yellow-waste-water-purification-yi]"
       }
     }
diff --git a/angelsrefining/prototypes/technology/water-treatment-technology.lua b/angelsrefining/prototypes/technology/water-treatment-technology.lua
index d36ef8fbb..673579e72 100644
--- a/angelsrefining/prototypes/technology/water-treatment-technology.lua
+++ b/angelsrefining/prototypes/technology/water-treatment-technology.lua
@@ -33,7 +33,7 @@ data:extend(
       icon = "__angelsrefining__/graphics/technology/water-treatment.png",
       icon_size = 128,
       prerequisites = {
-        "electronics"
+        mods["angelspetrochem"] and "angels-fluid-control" or "electronics"
       },
       effects = {
         {
diff --git a/angelsrefining/settings-updates.lua b/angelsrefining/settings-updates.lua
index 008dbe422..3a060362c 100644
--- a/angelsrefining/settings-updates.lua
+++ b/angelsrefining/settings-updates.lua
@@ -1,69 +1,60 @@
-local function hide_setting(setting_type, setting_name, setting_default)
-  if data.raw[setting_type] and data.raw[setting_type][setting_name] then
-    data.raw[setting_type][setting_name].hidden = true
-    if setting_default ~= nil then
-      data.raw[setting_type][setting_name].default_value = setting_default
-    end
-  end
-end
-
 if mods["bobplates"] then
-  hide_setting("bool-setting", "bobmods-plates-oreoverride")
-  hide_setting("bool-setting", "bobmods-plates-groundwater")
-  hide_setting("bool-setting", "bobmods-plates-vanillabarrelling")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-oreoverride")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-groundwater")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-vanillabarrelling")
   
   if mods["angelspetrochem"] then
-    hide_setting("bool-setting", "bobmods-plates-purewater")
+    angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-purewater")
   end
 
   if mods["angelsindustries"] then
-    hide_setting("bool-setting", "bobmods-plates-bluedeuterium")
-    hide_setting("bool-setting", "bobmods-plates-nuclearupdate")
+    angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-bluedeuterium")
+    angelsmods.settings.hide_setting("bool-setting", "bobmods-plates-nuclearupdate")
   end
 end
 
 if mods["bobores"] then
   --ores
-  hide_setting("bool-setting", "bobmods-ores-enablebauxite")
-  hide_setting("bool-setting", "bobmods-ores-enablecobaltore")
-  hide_setting("bool-setting", "bobmods-ores-enablegemsore")
-  hide_setting("bool-setting", "bobmods-ores-enablegoldore")
-  hide_setting("bool-setting", "bobmods-ores-enableleadore")
-  hide_setting("bool-setting", "bobmods-ores-enablenickelore")
-  hide_setting("bool-setting", "bobmods-ores-enablequartz")
-  hide_setting("bool-setting", "bobmods-ores-enablerutile")
-  hide_setting("bool-setting", "bobmods-ores-enablesilverore")
-  hide_setting("bool-setting", "bobmods-ores-enablesulfur")
-  hide_setting("bool-setting", "bobmods-ores-enabletinore")
-  hide_setting("bool-setting", "bobmods-ores-enabletungstenore")
-  hide_setting("bool-setting", "bobmods-ores-enablezincore")
-  --hide_setting("bool-setting", "bobmods-ores-enablewaterores")
-  hide_setting("bool-setting", "bobmods-ores-enablethoriumore")
-
-  hide_setting("bool-setting", "bobmods-ores-leadgivesnickel")
-  hide_setting("double-setting", "bobmods-ores-leadnickelratio")
-  hide_setting("bool-setting", "bobmods-ores-nickelgivescobalt")
-  hide_setting("double-setting", "bobmods-ores-nickelcobaltratio")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablebauxite")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablecobaltore")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablegemsore")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablegoldore")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enableleadore")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablenickelore")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablequartz")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablerutile")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablesilverore")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablesulfur")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enabletinore")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enabletungstenore")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablezincore")
+  --angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablewaterores")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-enablethoriumore")
+
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-leadgivesnickel")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-ores-leadnickelratio")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-nickelgivescobalt")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-ores-nickelcobaltratio")
 
   --gems
-  hide_setting("bool-setting", "bobmods-ores-unsortedgemore")
-  hide_setting("double-setting", "bobmods-gems-rubyratio")
-  hide_setting("double-setting", "bobmods-gems-sapphireratio")
-  hide_setting("double-setting", "bobmods-gems-emeraldratio")
-  hide_setting("double-setting", "bobmods-gems-amethystratio")
-  hide_setting("double-setting", "bobmods-gems-topazratio")
-  hide_setting("double-setting", "bobmods-gems-diamondratio")
-
-  hide_setting("bool-setting", "bobmods-ores-gemsfromotherores")
-  hide_setting("double-setting", "bobmods-ores-gemprobability")
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-unsortedgemore")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-gems-rubyratio")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-gems-sapphireratio")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-gems-emeraldratio")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-gems-amethystratio")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-gems-topazratio")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-gems-diamondratio")
+
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-ores-gemsfromotherores")
+  angelsmods.settings.hide_setting("double-setting", "bobmods-ores-gemprobability")
 end
 
 if mods["bobassembly"] then
-  hide_setting("bool-setting", "bobmods-assembly-limits", false)
+  angelsmods.settings.hide_setting("bool-setting", "bobmods-assembly-limits", false)
 end
 
 if mods["boblogistics"] then
   if mods["angelsindustries"] then
-    hide_setting("bool-setting", "bobmods-logistics-inserterrequireprevious")
+    angelsmods.settings.hide_setting("bool-setting", "bobmods-logistics-inserterrequireprevious")
   end
 end
\ No newline at end of file
diff --git a/angelsrefining/settings.lua b/angelsrefining/settings.lua
index c1f97ae6a..cf55bf2cb 100644
--- a/angelsrefining/settings.lua
+++ b/angelsrefining/settings.lua
@@ -1,3 +1,5 @@
+require "prototypes.angels-settings"
+
 data:extend(
 {
   {
diff --git a/angelssmelting/changelog.txt b/angelssmelting/changelog.txt
index 3061b97e6..374decee3 100644
--- a/angelssmelting/changelog.txt
+++ b/angelssmelting/changelog.txt
@@ -5,11 +5,19 @@ Date: ??
     - Split smelting technologies in two parts: (498)
       - Smelting to ingots, faster tech progress to allow additional mid-tier improvements
       - Casting to usable products (plates, wires, rods), similar tech progress as before
-    - Added new graphics to technology, ingots, molted metals, metal rolls and metal wire coils
+    - Added new graphics to
+      - technology,
+      - processed metals, pellets, powder,
+      - ingots, molted metals,
+      - metal rolls and metal wire coils.
     - Tweaked some technology tree prerequisites as cleanup (428)
     - Disabled some ore to plate smelting recipes to enforce angels metallurgy smelting (456, 329)
+    - Updated electronics to not rely on steel processing if bobs is installed (550)
+    - Changed and expanded locale strings and text descriptions (489)
+    - Removed angels iron rod (in favour of the vanilla iron stick) (484,485)
   Bugfixes:
     - Fixed rod stack converting recipes could not use producitivity modules
+    - Fixed bronze and brass smelting missed some prerequisites (551)
 ---------------------------------------------------------------------------------------------------
 Version: 0.6.14
 Date: 26.11.2020
diff --git a/angelssmelting/graphics/icons/molten-aluminium.png b/angelssmelting/graphics/icons/molten-aluminium.png
index 9f0879b67..310ffadbd 100644
Binary files a/angelssmelting/graphics/icons/molten-aluminium.png and b/angelssmelting/graphics/icons/molten-aluminium.png differ
diff --git a/angelssmelting/graphics/icons/molten-brass.png b/angelssmelting/graphics/icons/molten-brass.png
index 239fc98d3..ffd1ff28a 100644
Binary files a/angelssmelting/graphics/icons/molten-brass.png and b/angelssmelting/graphics/icons/molten-brass.png differ
diff --git a/angelssmelting/graphics/icons/molten-bronze.png b/angelssmelting/graphics/icons/molten-bronze.png
index c984f732d..f927af0f9 100644
Binary files a/angelssmelting/graphics/icons/molten-bronze.png and b/angelssmelting/graphics/icons/molten-bronze.png differ
diff --git a/angelssmelting/graphics/icons/molten-chrome.png b/angelssmelting/graphics/icons/molten-chrome.png
index f70a03582..c51a276c0 100644
Binary files a/angelssmelting/graphics/icons/molten-chrome.png and b/angelssmelting/graphics/icons/molten-chrome.png differ
diff --git a/angelssmelting/graphics/icons/molten-cobalt-steel.png b/angelssmelting/graphics/icons/molten-cobalt-steel.png
index 42d8b2a30..6ae2720cc 100644
Binary files a/angelssmelting/graphics/icons/molten-cobalt-steel.png and b/angelssmelting/graphics/icons/molten-cobalt-steel.png differ
diff --git a/angelssmelting/graphics/icons/molten-cobalt.png b/angelssmelting/graphics/icons/molten-cobalt.png
index 6b55c45ae..eb2045885 100644
Binary files a/angelssmelting/graphics/icons/molten-cobalt.png and b/angelssmelting/graphics/icons/molten-cobalt.png differ
diff --git a/angelssmelting/graphics/icons/molten-concrete.png b/angelssmelting/graphics/icons/molten-concrete.png
index ebc496dfc..c80e2960d 100644
Binary files a/angelssmelting/graphics/icons/molten-concrete.png and b/angelssmelting/graphics/icons/molten-concrete.png differ
diff --git a/angelssmelting/graphics/icons/molten-copper.png b/angelssmelting/graphics/icons/molten-copper.png
index 0de918998..d6e5218ce 100644
Binary files a/angelssmelting/graphics/icons/molten-copper.png and b/angelssmelting/graphics/icons/molten-copper.png differ
diff --git a/angelssmelting/graphics/icons/molten-glass.png b/angelssmelting/graphics/icons/molten-glass.png
index 85b89e857..9df551feb 100644
Binary files a/angelssmelting/graphics/icons/molten-glass.png and b/angelssmelting/graphics/icons/molten-glass.png differ
diff --git a/angelssmelting/graphics/icons/molten-gold.png b/angelssmelting/graphics/icons/molten-gold.png
index 9e873b8d1..ec578c8e8 100644
Binary files a/angelssmelting/graphics/icons/molten-gold.png and b/angelssmelting/graphics/icons/molten-gold.png differ
diff --git a/angelssmelting/graphics/icons/molten-gunmetal.png b/angelssmelting/graphics/icons/molten-gunmetal.png
index 2b43fac6e..4aa45f52f 100644
Binary files a/angelssmelting/graphics/icons/molten-gunmetal.png and b/angelssmelting/graphics/icons/molten-gunmetal.png differ
diff --git a/angelssmelting/graphics/icons/molten-invar.png b/angelssmelting/graphics/icons/molten-invar.png
index bae0a6c9a..62d796f54 100644
Binary files a/angelssmelting/graphics/icons/molten-invar.png and b/angelssmelting/graphics/icons/molten-invar.png differ
diff --git a/angelssmelting/graphics/icons/molten-iron.png b/angelssmelting/graphics/icons/molten-iron.png
index f37390b61..381285634 100644
Binary files a/angelssmelting/graphics/icons/molten-iron.png and b/angelssmelting/graphics/icons/molten-iron.png differ
diff --git a/angelssmelting/graphics/icons/molten-lead.png b/angelssmelting/graphics/icons/molten-lead.png
index 442168349..4764fecb1 100644
Binary files a/angelssmelting/graphics/icons/molten-lead.png and b/angelssmelting/graphics/icons/molten-lead.png differ
diff --git a/angelssmelting/graphics/icons/molten-manganese.png b/angelssmelting/graphics/icons/molten-manganese.png
index 0d0887388..75e1c6d5a 100644
Binary files a/angelssmelting/graphics/icons/molten-manganese.png and b/angelssmelting/graphics/icons/molten-manganese.png differ
diff --git a/angelssmelting/graphics/icons/molten-nickel.png b/angelssmelting/graphics/icons/molten-nickel.png
index 9dcc3ae6d..39c7f271c 100644
Binary files a/angelssmelting/graphics/icons/molten-nickel.png and b/angelssmelting/graphics/icons/molten-nickel.png differ
diff --git a/angelssmelting/graphics/icons/molten-nitinol.png b/angelssmelting/graphics/icons/molten-nitinol.png
index bd42ea481..3bc7b1412 100644
Binary files a/angelssmelting/graphics/icons/molten-nitinol.png and b/angelssmelting/graphics/icons/molten-nitinol.png differ
diff --git a/angelssmelting/graphics/icons/molten-platinum.png b/angelssmelting/graphics/icons/molten-platinum.png
index bc737a208..ea2e23105 100644
Binary files a/angelssmelting/graphics/icons/molten-platinum.png and b/angelssmelting/graphics/icons/molten-platinum.png differ
diff --git a/angelssmelting/graphics/icons/molten-silicon.png b/angelssmelting/graphics/icons/molten-silicon.png
index 9e170c8ee..09df7ad1d 100644
Binary files a/angelssmelting/graphics/icons/molten-silicon.png and b/angelssmelting/graphics/icons/molten-silicon.png differ
diff --git a/angelssmelting/graphics/icons/molten-silver.png b/angelssmelting/graphics/icons/molten-silver.png
index 0f2d7b217..848cd3ad7 100644
Binary files a/angelssmelting/graphics/icons/molten-silver.png and b/angelssmelting/graphics/icons/molten-silver.png differ
diff --git a/angelssmelting/graphics/icons/molten-solder.png b/angelssmelting/graphics/icons/molten-solder.png
index 03b05b398..c4edd9919 100644
Binary files a/angelssmelting/graphics/icons/molten-solder.png and b/angelssmelting/graphics/icons/molten-solder.png differ
diff --git a/angelssmelting/graphics/icons/molten-steel.png b/angelssmelting/graphics/icons/molten-steel.png
index 972fee80a..3a29cc75e 100644
Binary files a/angelssmelting/graphics/icons/molten-steel.png and b/angelssmelting/graphics/icons/molten-steel.png differ
diff --git a/angelssmelting/graphics/icons/molten-tin.png b/angelssmelting/graphics/icons/molten-tin.png
index f04944e1c..93ebd2c7d 100644
Binary files a/angelssmelting/graphics/icons/molten-tin.png and b/angelssmelting/graphics/icons/molten-tin.png differ
diff --git a/angelssmelting/graphics/icons/molten-titanium.png b/angelssmelting/graphics/icons/molten-titanium.png
index f0c15b6c4..2858d2ab1 100644
Binary files a/angelssmelting/graphics/icons/molten-titanium.png and b/angelssmelting/graphics/icons/molten-titanium.png differ
diff --git a/angelssmelting/graphics/icons/molten-zinc.png b/angelssmelting/graphics/icons/molten-zinc.png
index 192e6532a..2262ed571 100644
Binary files a/angelssmelting/graphics/icons/molten-zinc.png and b/angelssmelting/graphics/icons/molten-zinc.png differ
diff --git a/angelssmelting/graphics/icons/pellet-aluminium.png b/angelssmelting/graphics/icons/pellet-aluminium.png
index eb08796db..5902b2231 100644
Binary files a/angelssmelting/graphics/icons/pellet-aluminium.png and b/angelssmelting/graphics/icons/pellet-aluminium.png differ
diff --git a/angelssmelting/graphics/icons/pellet-chrome.png b/angelssmelting/graphics/icons/pellet-chrome.png
index fbcba0212..d62b5d1d2 100644
Binary files a/angelssmelting/graphics/icons/pellet-chrome.png and b/angelssmelting/graphics/icons/pellet-chrome.png differ
diff --git a/angelssmelting/graphics/icons/pellet-cobalt.png b/angelssmelting/graphics/icons/pellet-cobalt.png
index ecdda9668..1bad25ae5 100644
Binary files a/angelssmelting/graphics/icons/pellet-cobalt.png and b/angelssmelting/graphics/icons/pellet-cobalt.png differ
diff --git a/angelssmelting/graphics/icons/pellet-copper.png b/angelssmelting/graphics/icons/pellet-copper.png
index e5cfa0d0f..88c47d2fa 100644
Binary files a/angelssmelting/graphics/icons/pellet-copper.png and b/angelssmelting/graphics/icons/pellet-copper.png differ
diff --git a/angelssmelting/graphics/icons/pellet-gold.png b/angelssmelting/graphics/icons/pellet-gold.png
index ce4163fd2..813e997f3 100644
Binary files a/angelssmelting/graphics/icons/pellet-gold.png and b/angelssmelting/graphics/icons/pellet-gold.png differ
diff --git a/angelssmelting/graphics/icons/pellet-iron.png b/angelssmelting/graphics/icons/pellet-iron.png
index c85696cf1..76fe82b2e 100644
Binary files a/angelssmelting/graphics/icons/pellet-iron.png and b/angelssmelting/graphics/icons/pellet-iron.png differ
diff --git a/angelssmelting/graphics/icons/pellet-lead.png b/angelssmelting/graphics/icons/pellet-lead.png
index 29451026c..cea25c2a7 100644
Binary files a/angelssmelting/graphics/icons/pellet-lead.png and b/angelssmelting/graphics/icons/pellet-lead.png differ
diff --git a/angelssmelting/graphics/icons/pellet-manganese.png b/angelssmelting/graphics/icons/pellet-manganese.png
index aea656e6d..9067bdc56 100644
Binary files a/angelssmelting/graphics/icons/pellet-manganese.png and b/angelssmelting/graphics/icons/pellet-manganese.png differ
diff --git a/angelssmelting/graphics/icons/pellet-nickel.png b/angelssmelting/graphics/icons/pellet-nickel.png
index 393799813..81b2ce48f 100644
Binary files a/angelssmelting/graphics/icons/pellet-nickel.png and b/angelssmelting/graphics/icons/pellet-nickel.png differ
diff --git a/angelssmelting/graphics/icons/pellet-platinum.png b/angelssmelting/graphics/icons/pellet-platinum.png
index 803f62ea4..957a56064 100644
Binary files a/angelssmelting/graphics/icons/pellet-platinum.png and b/angelssmelting/graphics/icons/pellet-platinum.png differ
diff --git a/angelssmelting/graphics/icons/pellet-silica.png b/angelssmelting/graphics/icons/pellet-silica.png
index 078acafe3..2da5746f5 100644
Binary files a/angelssmelting/graphics/icons/pellet-silica.png and b/angelssmelting/graphics/icons/pellet-silica.png differ
diff --git a/angelssmelting/graphics/icons/pellet-silver.png b/angelssmelting/graphics/icons/pellet-silver.png
index f41796a81..82be1b52a 100644
Binary files a/angelssmelting/graphics/icons/pellet-silver.png and b/angelssmelting/graphics/icons/pellet-silver.png differ
diff --git a/angelssmelting/graphics/icons/pellet-tin.png b/angelssmelting/graphics/icons/pellet-tin.png
index 7a277e77d..2545358b4 100644
Binary files a/angelssmelting/graphics/icons/pellet-tin.png and b/angelssmelting/graphics/icons/pellet-tin.png differ
diff --git a/angelssmelting/graphics/icons/pellet-titanium.png b/angelssmelting/graphics/icons/pellet-titanium.png
index 12c5b22d3..8b75bc855 100644
Binary files a/angelssmelting/graphics/icons/pellet-titanium.png and b/angelssmelting/graphics/icons/pellet-titanium.png differ
diff --git a/angelssmelting/graphics/icons/pellet-tungsten.png b/angelssmelting/graphics/icons/pellet-tungsten.png
index 954eeabbb..9723930ae 100644
Binary files a/angelssmelting/graphics/icons/pellet-tungsten.png and b/angelssmelting/graphics/icons/pellet-tungsten.png differ
diff --git a/angelssmelting/graphics/icons/pellet-zinc.png b/angelssmelting/graphics/icons/pellet-zinc.png
index acb8a46fe..7fa58cb33 100644
Binary files a/angelssmelting/graphics/icons/pellet-zinc.png and b/angelssmelting/graphics/icons/pellet-zinc.png differ
diff --git a/angelssmelting/graphics/icons/powder-aluminium.png b/angelssmelting/graphics/icons/powder-aluminium.png
index 7aa35aafb..1d52075ec 100644
Binary files a/angelssmelting/graphics/icons/powder-aluminium.png and b/angelssmelting/graphics/icons/powder-aluminium.png differ
diff --git a/angelssmelting/graphics/icons/powder-chrome.png b/angelssmelting/graphics/icons/powder-chrome.png
index 2e7f32db6..1a869d766 100644
Binary files a/angelssmelting/graphics/icons/powder-chrome.png and b/angelssmelting/graphics/icons/powder-chrome.png differ
diff --git a/angelssmelting/graphics/icons/powder-cobalt.png b/angelssmelting/graphics/icons/powder-cobalt.png
index 53d810fdc..5e58c9354 100644
Binary files a/angelssmelting/graphics/icons/powder-cobalt.png and b/angelssmelting/graphics/icons/powder-cobalt.png differ
diff --git a/angelssmelting/graphics/icons/powder-copper.png b/angelssmelting/graphics/icons/powder-copper.png
index 71037ba51..48aaee252 100644
Binary files a/angelssmelting/graphics/icons/powder-copper.png and b/angelssmelting/graphics/icons/powder-copper.png differ
diff --git a/angelssmelting/graphics/icons/powder-gold.png b/angelssmelting/graphics/icons/powder-gold.png
index a45754fc1..a62d704ae 100644
Binary files a/angelssmelting/graphics/icons/powder-gold.png and b/angelssmelting/graphics/icons/powder-gold.png differ
diff --git a/angelssmelting/graphics/icons/powder-iron.png b/angelssmelting/graphics/icons/powder-iron.png
index 2a28ab86f..ab1f4c327 100644
Binary files a/angelssmelting/graphics/icons/powder-iron.png and b/angelssmelting/graphics/icons/powder-iron.png differ
diff --git a/angelssmelting/graphics/icons/powder-lead.png b/angelssmelting/graphics/icons/powder-lead.png
index 78bf6f962..16893a504 100644
Binary files a/angelssmelting/graphics/icons/powder-lead.png and b/angelssmelting/graphics/icons/powder-lead.png differ
diff --git a/angelssmelting/graphics/icons/powder-manganese.png b/angelssmelting/graphics/icons/powder-manganese.png
index e42a29d00..6a047d8ab 100644
Binary files a/angelssmelting/graphics/icons/powder-manganese.png and b/angelssmelting/graphics/icons/powder-manganese.png differ
diff --git a/angelssmelting/graphics/icons/powder-nickel.png b/angelssmelting/graphics/icons/powder-nickel.png
index f67730b17..b89a49216 100644
Binary files a/angelssmelting/graphics/icons/powder-nickel.png and b/angelssmelting/graphics/icons/powder-nickel.png differ
diff --git a/angelssmelting/graphics/icons/powder-platinum.png b/angelssmelting/graphics/icons/powder-platinum.png
index b09c18d5f..d3d8ae738 100644
Binary files a/angelssmelting/graphics/icons/powder-platinum.png and b/angelssmelting/graphics/icons/powder-platinum.png differ
diff --git a/angelssmelting/graphics/icons/powder-silica.png b/angelssmelting/graphics/icons/powder-silica.png
index afc77b95c..97270d832 100644
Binary files a/angelssmelting/graphics/icons/powder-silica.png and b/angelssmelting/graphics/icons/powder-silica.png differ
diff --git a/angelssmelting/graphics/icons/powder-silver.png b/angelssmelting/graphics/icons/powder-silver.png
index fd6f2d613..7530d54af 100644
Binary files a/angelssmelting/graphics/icons/powder-silver.png and b/angelssmelting/graphics/icons/powder-silver.png differ
diff --git a/angelssmelting/graphics/icons/powder-steel.png b/angelssmelting/graphics/icons/powder-steel.png
index 2b1485e94..0df066d6c 100644
Binary files a/angelssmelting/graphics/icons/powder-steel.png and b/angelssmelting/graphics/icons/powder-steel.png differ
diff --git a/angelssmelting/graphics/icons/powder-tin.png b/angelssmelting/graphics/icons/powder-tin.png
index db8156aa2..be6d4120e 100644
Binary files a/angelssmelting/graphics/icons/powder-tin.png and b/angelssmelting/graphics/icons/powder-tin.png differ
diff --git a/angelssmelting/graphics/icons/powder-titanium.png b/angelssmelting/graphics/icons/powder-titanium.png
index 8dc3c45ce..1477a4195 100644
Binary files a/angelssmelting/graphics/icons/powder-titanium.png and b/angelssmelting/graphics/icons/powder-titanium.png differ
diff --git a/angelssmelting/graphics/icons/powder-tungsten-mixture.png b/angelssmelting/graphics/icons/powder-tungsten-mixture.png
index 2339b889e..733738fd0 100644
Binary files a/angelssmelting/graphics/icons/powder-tungsten-mixture.png and b/angelssmelting/graphics/icons/powder-tungsten-mixture.png differ
diff --git a/angelssmelting/graphics/icons/powder-tungsten.png b/angelssmelting/graphics/icons/powder-tungsten.png
index c55c2b509..5c4a6e0a9 100644
Binary files a/angelssmelting/graphics/icons/powder-tungsten.png and b/angelssmelting/graphics/icons/powder-tungsten.png differ
diff --git a/angelssmelting/graphics/icons/powder-zinc.png b/angelssmelting/graphics/icons/powder-zinc.png
index a1c9291a7..0e0eb2c94 100644
Binary files a/angelssmelting/graphics/icons/powder-zinc.png and b/angelssmelting/graphics/icons/powder-zinc.png differ
diff --git a/angelssmelting/graphics/icons/processed-aluminium.png b/angelssmelting/graphics/icons/processed-aluminium.png
index 793bc9bc5..ad8e64e40 100644
Binary files a/angelssmelting/graphics/icons/processed-aluminium.png and b/angelssmelting/graphics/icons/processed-aluminium.png differ
diff --git a/angelssmelting/graphics/icons/processed-chrome.png b/angelssmelting/graphics/icons/processed-chrome.png
index 154a7fd21..4ea0d26e3 100644
Binary files a/angelssmelting/graphics/icons/processed-chrome.png and b/angelssmelting/graphics/icons/processed-chrome.png differ
diff --git a/angelssmelting/graphics/icons/processed-cobalt.png b/angelssmelting/graphics/icons/processed-cobalt.png
index bb0ccb24f..1dde36aab 100644
Binary files a/angelssmelting/graphics/icons/processed-cobalt.png and b/angelssmelting/graphics/icons/processed-cobalt.png differ
diff --git a/angelssmelting/graphics/icons/processed-copper.png b/angelssmelting/graphics/icons/processed-copper.png
index c409e02bf..431dec1d7 100644
Binary files a/angelssmelting/graphics/icons/processed-copper.png and b/angelssmelting/graphics/icons/processed-copper.png differ
diff --git a/angelssmelting/graphics/icons/processed-gold.png b/angelssmelting/graphics/icons/processed-gold.png
index 53713b35f..555de8037 100644
Binary files a/angelssmelting/graphics/icons/processed-gold.png and b/angelssmelting/graphics/icons/processed-gold.png differ
diff --git a/angelssmelting/graphics/icons/processed-iron.png b/angelssmelting/graphics/icons/processed-iron.png
index 02d01784b..b65c4a4a0 100644
Binary files a/angelssmelting/graphics/icons/processed-iron.png and b/angelssmelting/graphics/icons/processed-iron.png differ
diff --git a/angelssmelting/graphics/icons/processed-lead.png b/angelssmelting/graphics/icons/processed-lead.png
index 4645f1b44..128a7efb5 100644
Binary files a/angelssmelting/graphics/icons/processed-lead.png and b/angelssmelting/graphics/icons/processed-lead.png differ
diff --git a/angelssmelting/graphics/icons/processed-manganese.png b/angelssmelting/graphics/icons/processed-manganese.png
index 7386bb56b..9d13d73a6 100644
Binary files a/angelssmelting/graphics/icons/processed-manganese.png and b/angelssmelting/graphics/icons/processed-manganese.png differ
diff --git a/angelssmelting/graphics/icons/processed-nickel.png b/angelssmelting/graphics/icons/processed-nickel.png
index 5498fc502..86a247121 100644
Binary files a/angelssmelting/graphics/icons/processed-nickel.png and b/angelssmelting/graphics/icons/processed-nickel.png differ
diff --git a/angelssmelting/graphics/icons/processed-platinum.png b/angelssmelting/graphics/icons/processed-platinum.png
index fd3e8f243..32eb0d1f2 100644
Binary files a/angelssmelting/graphics/icons/processed-platinum.png and b/angelssmelting/graphics/icons/processed-platinum.png differ
diff --git a/angelssmelting/graphics/icons/processed-silica.png b/angelssmelting/graphics/icons/processed-silica.png
index cbc62b8aa..c14a04c3e 100644
Binary files a/angelssmelting/graphics/icons/processed-silica.png and b/angelssmelting/graphics/icons/processed-silica.png differ
diff --git a/angelssmelting/graphics/icons/processed-silver.png b/angelssmelting/graphics/icons/processed-silver.png
index 24e9ccc0b..34a50431a 100644
Binary files a/angelssmelting/graphics/icons/processed-silver.png and b/angelssmelting/graphics/icons/processed-silver.png differ
diff --git a/angelssmelting/graphics/icons/processed-tin.png b/angelssmelting/graphics/icons/processed-tin.png
index 5eab3c082..39e06d1b8 100644
Binary files a/angelssmelting/graphics/icons/processed-tin.png and b/angelssmelting/graphics/icons/processed-tin.png differ
diff --git a/angelssmelting/graphics/icons/processed-titanium.png b/angelssmelting/graphics/icons/processed-titanium.png
index 5a959afbe..385bd0e66 100644
Binary files a/angelssmelting/graphics/icons/processed-titanium.png and b/angelssmelting/graphics/icons/processed-titanium.png differ
diff --git a/angelssmelting/graphics/icons/processed-tungsten.png b/angelssmelting/graphics/icons/processed-tungsten.png
index 1c3fcb8fd..1ba0668d1 100644
Binary files a/angelssmelting/graphics/icons/processed-tungsten.png and b/angelssmelting/graphics/icons/processed-tungsten.png differ
diff --git a/angelssmelting/graphics/icons/processed-zinc.png b/angelssmelting/graphics/icons/processed-zinc.png
index bc407bee3..c1e1dd5ad 100644
Binary files a/angelssmelting/graphics/icons/processed-zinc.png and b/angelssmelting/graphics/icons/processed-zinc.png differ
diff --git a/angelssmelting/graphics/technology/casting-aluminium-tech.png b/angelssmelting/graphics/technology/casting-aluminium-tech.png
index ff18137bb..dd6a5f8c3 100644
Binary files a/angelssmelting/graphics/technology/casting-aluminium-tech.png and b/angelssmelting/graphics/technology/casting-aluminium-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-brass-tech.png b/angelssmelting/graphics/technology/casting-brass-tech.png
index 3f8a09ead..f81085d2b 100644
Binary files a/angelssmelting/graphics/technology/casting-brass-tech.png and b/angelssmelting/graphics/technology/casting-brass-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-bronze-tech.png b/angelssmelting/graphics/technology/casting-bronze-tech.png
index bd9cc2f63..2184bfd1b 100644
Binary files a/angelssmelting/graphics/technology/casting-bronze-tech.png and b/angelssmelting/graphics/technology/casting-bronze-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-chrome-tech.png b/angelssmelting/graphics/technology/casting-chrome-tech.png
index 1b038d86c..95bbda353 100644
Binary files a/angelssmelting/graphics/technology/casting-chrome-tech.png and b/angelssmelting/graphics/technology/casting-chrome-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-cobalt-steel-tech.png b/angelssmelting/graphics/technology/casting-cobalt-steel-tech.png
index cc690be87..4905ccef1 100644
Binary files a/angelssmelting/graphics/technology/casting-cobalt-steel-tech.png and b/angelssmelting/graphics/technology/casting-cobalt-steel-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-cobalt-tech.png b/angelssmelting/graphics/technology/casting-cobalt-tech.png
index 5de356cae..66de5b895 100644
Binary files a/angelssmelting/graphics/technology/casting-cobalt-tech.png and b/angelssmelting/graphics/technology/casting-cobalt-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-copper-tech.png b/angelssmelting/graphics/technology/casting-copper-tech.png
index 6560f3df7..a3b3d9ce2 100644
Binary files a/angelssmelting/graphics/technology/casting-copper-tech.png and b/angelssmelting/graphics/technology/casting-copper-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-gold-tech.png b/angelssmelting/graphics/technology/casting-gold-tech.png
index c06ba36cb..c792d2598 100644
Binary files a/angelssmelting/graphics/technology/casting-gold-tech.png and b/angelssmelting/graphics/technology/casting-gold-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-gunmetal-tech.png b/angelssmelting/graphics/technology/casting-gunmetal-tech.png
index 73126c6ae..d1fc77417 100644
Binary files a/angelssmelting/graphics/technology/casting-gunmetal-tech.png and b/angelssmelting/graphics/technology/casting-gunmetal-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-invar-tech.png b/angelssmelting/graphics/technology/casting-invar-tech.png
index d7155dcf4..763bb163f 100644
Binary files a/angelssmelting/graphics/technology/casting-invar-tech.png and b/angelssmelting/graphics/technology/casting-invar-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-iron-tech.png b/angelssmelting/graphics/technology/casting-iron-tech.png
index 830f5b39b..8de6e8fab 100644
Binary files a/angelssmelting/graphics/technology/casting-iron-tech.png and b/angelssmelting/graphics/technology/casting-iron-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-lead-tech.png b/angelssmelting/graphics/technology/casting-lead-tech.png
index 3af18f5a3..039c303dd 100644
Binary files a/angelssmelting/graphics/technology/casting-lead-tech.png and b/angelssmelting/graphics/technology/casting-lead-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-manganese-tech.png b/angelssmelting/graphics/technology/casting-manganese-tech.png
index 46308fb9f..6fa442b0e 100644
Binary files a/angelssmelting/graphics/technology/casting-manganese-tech.png and b/angelssmelting/graphics/technology/casting-manganese-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-nickel-tech.png b/angelssmelting/graphics/technology/casting-nickel-tech.png
index c3c75cd93..bf9295400 100644
Binary files a/angelssmelting/graphics/technology/casting-nickel-tech.png and b/angelssmelting/graphics/technology/casting-nickel-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-nitinol-tech.png b/angelssmelting/graphics/technology/casting-nitinol-tech.png
index a496f06c0..2a30b02d0 100644
Binary files a/angelssmelting/graphics/technology/casting-nitinol-tech.png and b/angelssmelting/graphics/technology/casting-nitinol-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-platinum-tech.png b/angelssmelting/graphics/technology/casting-platinum-tech.png
index 1044535c8..673bc433c 100644
Binary files a/angelssmelting/graphics/technology/casting-platinum-tech.png and b/angelssmelting/graphics/technology/casting-platinum-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-silicon-tech.png b/angelssmelting/graphics/technology/casting-silicon-tech.png
index e2414175d..db3df78a0 100644
Binary files a/angelssmelting/graphics/technology/casting-silicon-tech.png and b/angelssmelting/graphics/technology/casting-silicon-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-silver-tech.png b/angelssmelting/graphics/technology/casting-silver-tech.png
index d15cd5531..7443bb1c2 100644
Binary files a/angelssmelting/graphics/technology/casting-silver-tech.png and b/angelssmelting/graphics/technology/casting-silver-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-solder-tech.png b/angelssmelting/graphics/technology/casting-solder-tech.png
index 618cff0e2..24d906ef1 100644
Binary files a/angelssmelting/graphics/technology/casting-solder-tech.png and b/angelssmelting/graphics/technology/casting-solder-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-steel-tech.png b/angelssmelting/graphics/technology/casting-steel-tech.png
index 59f7c845e..f65b8b67a 100644
Binary files a/angelssmelting/graphics/technology/casting-steel-tech.png and b/angelssmelting/graphics/technology/casting-steel-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-tin-tech.png b/angelssmelting/graphics/technology/casting-tin-tech.png
index fd12a328e..54c81a953 100644
Binary files a/angelssmelting/graphics/technology/casting-tin-tech.png and b/angelssmelting/graphics/technology/casting-tin-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-titanium-tech.png b/angelssmelting/graphics/technology/casting-titanium-tech.png
index 171611ce0..f229d91d3 100644
Binary files a/angelssmelting/graphics/technology/casting-titanium-tech.png and b/angelssmelting/graphics/technology/casting-titanium-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-tungsten-tech.png b/angelssmelting/graphics/technology/casting-tungsten-tech.png
index 89b4f8dfe..5be66a6ad 100644
Binary files a/angelssmelting/graphics/technology/casting-tungsten-tech.png and b/angelssmelting/graphics/technology/casting-tungsten-tech.png differ
diff --git a/angelssmelting/graphics/technology/casting-zinc-tech.png b/angelssmelting/graphics/technology/casting-zinc-tech.png
index 258568c94..ba6ae44fc 100644
Binary files a/angelssmelting/graphics/technology/casting-zinc-tech.png and b/angelssmelting/graphics/technology/casting-zinc-tech.png differ
diff --git a/angelssmelting/locale/en/smelting.cfg b/angelssmelting/locale/en/smelting.cfg
index 4bfed1190..58a578a32 100644
--- a/angelssmelting/locale/en/smelting.cfg
+++ b/angelssmelting/locale/en/smelting.cfg
@@ -100,6 +100,54 @@ strand-casting-machine-4=Strand casting machine 4
 
 cooling-tower=Cooling tower
 
+[entity-description]
+blast-furnace=Turns pure ores into ingots. Can handle gaseous fluids.
+blast-furnace-2=Turns pure ores into ingots. Can handle gaseous fluids.
+blast-furnace-3=Turns pure ores into ingots. Can handle gaseous fluids.
+blast-furnace-4=Turns pure ores into ingots. Can handle gaseous fluids.
+
+angels-chemical-furnace=Turns pure ores into ingots. Can handle liquid fluids.
+angels-chemical-furnace-2=Turns pure ores into ingots. Can handle liquid fluids.
+angels-chemical-furnace-3=Turns pure ores into ingots. Can handle liquid fluids.
+angels-chemical-furnace-4=Turns pure ores into ingots. Can handle liquid fluids.
+
+powder-mixer=Prepares powdered granulates for subsequent smelting.
+powder-mixer-2=Prepares powdered granulates for subsequent smelting.
+powder-mixer-3=Prepares powdered granulates for subsequent smelting.
+powder-mixer-4=Prepares powdered granulates for subsequent smelting.
+
+induction-furnace=Melts metal ingots for subsequent casting.
+induction-furnace-2=Melts metal ingots for subsequent casting.
+induction-furnace-3=Melts metal ingots for subsequent casting.
+induction-furnace-4=Melts metal ingots for subsequent casting.
+
+casting-machine=Casts molten material into handy shape.
+casting-machine-2=Casts molten material into handy shape.
+casting-machine-3=Casts molten material into handy shape.
+casting-machine-4=Casts molten material into handy shape.
+
+ore-processing-machine=Pre-processes ores for subsequent smelting.
+ore-processing-machine-2=Pre-processes ores for subsequent smelting.
+ore-processing-machine-3=Pre-processes ores for subsequent smelting.
+ore-processing-machine-4=Pre-processes ores for subsequent smelting.
+
+pellet-press=Compresses pre-processed ores into pellets.
+pellet-press-2=Compresses pre-processed ores into pellets.
+pellet-press-3=Compresses pre-processed ores into pellets.
+pellet-press-4=Compresses pre-processed ores into pellets.
+
+sintering-oven=Uses heat and pressure to fuse powder into a solid shape.
+sintering-oven-2=Uses heat and pressure to fuse powder into a solid shape.
+sintering-oven-3=Uses heat and pressure to fuse powder into a solid shape.
+sintering-oven-4=Uses heat and pressure to fuse powder into a solid shape.
+
+strand-casting-machine=Rapidly cools large amounts of molten metal into machinable shape.
+strand-casting-machine-2=Rapidly cools large amounts of molten metal into machinable shape.
+strand-casting-machine-3=Rapidly cools large amounts of molten metal into machinable shape.
+strand-casting-machine-4=Rapidly cools large amounts of molten metal into machinable shape.
+
+cooling-tower=Heat exchanger capable of reducing the temperature of its primary input.
+
 [item-name]
 bauxite-ore=Aluminium ore
 processed-aluminium=Processed aluminium
@@ -388,7 +436,7 @@ angels-zinc-casting=Advanced zinc casting
 angels-steel-smelting=Advanced steel smelting and casting
 angels-steel-casting=Advanced steel casting
 
-angels-solder-smelting-basic=Basic solder smelting
+angels-solder-smelting-basic=Basic solder casting
 angels-solder-smelting=Advanced solder casting
 
 angels-bronze-smelting=Advanced bronze smelting
@@ -399,10 +447,95 @@ angels-invar-smelting=Advanced invar smelting
 angels-cobalt-steel-smelting=Advanced cobalt steel smelting
 angels-nitinol-smelting=Advanced nitinol smelting
 
-[entity-description]
-
 [technology-description]
 
+angels-metallurgy=Machines for advanced metallurgical smelting.
+powder-metallurgy=Machines for handling powdered ores and metals.
+strand-casting=Machines for rapid cooling of molten metal for higher throughput.
+ore-processing=Machines for pre-processing of ores.
+angels-cooling=Heat exchangers for cooling.
+angels-coolant=Specialized fluid that is optimized for accepting and transporting heat.
+
+angels-aluminium-metallurgy=Advanced processing steps for the production of aluminium.
+angels-aluminium-smelting=Additional processing steps to reduce material loss.
+angels-aluminium-casting=Additional processing steps to increase yield.
+
+angels-chrome-metallurgy=Advanced processing steps for the production of chrome.
+angels-chrome-smelting=Additional processing steps to reduce material loss.
+angels-chrome-casting=Additional processing steps to increase yield.
+
+angels-cobalt-metallurgy=Advanced processing steps for the production of cobalt.
+angels-cobalt-smelting=Additional processing steps to reduce material loss.
+angels-cobalt-casting=Additional processing steps to increase yield.
+
+angels-copper-metallurgy=Advanced processing steps for efficient production of copper.
+angels-copper-smelting=Additional processing steps to reduce material loss.
+angels-copper-casting=Additional processing steps to increase yield.
+
+angels-glass-smelting=Advanced processing steps for efficient production of glass.
+
+angels-gold-metallurgy=Advanced processing steps for the production of gold.
+angels-gold-smelting=Additional processing steps to reduce material loss.
+angels-gold-casting=Additional processing steps to increase yield.
+
+angels-iron-metallurgy=Advanced processing steps for efficient production of iron.
+angels-iron-smelting=Additional processing steps to reduce material loss.
+angels-iron-casting=Additional processing steps to increase yield.
+
+angels-lead-metallurgy=Advanced processing steps for efficient production of lead.
+angels-lead-smelting=Additional processing steps to reduce material loss.
+angels-lead-casting=Additional processing steps to increase yield.
+
+angels-manganese-metallurgy=Advanced processing steps for the production of manganese.
+angels-manganese-smelting=Additional processing steps to reduce material loss.
+angels-manganese-casting=Additional processing steps to increase yield.
+
+angels-nickel-metallurgy=Advanced processing steps for the production of nickel.
+angels-nickel-smelting=Additional processing steps to reduce material loss.
+angels-nickel-casting=Additional processing steps to increase yield.
+
+angels-platinum-metallurgy=Advanced processing steps for the production of platinum.
+angels-platinum-smelting=Additional processing steps to reduce material loss.
+angels-platinum-casting=Additional processing steps to increase yield.
+
+angels-silicon-metallurgy=Advanced processing steps for the production of silicon.
+angels-silicon-smelting=Additional processing steps to reduce material loss.
+angels-silicon-casting=Additional processing steps to increase yield.
+
+angels-silver-metallurgy=Advanced processing steps for efficient production of silver.
+angels-silver-smelting=Additional processing steps to reduce material loss.
+angels-silver-casting=Additional processing steps to increase yield.
+
+angels-stone-smelting=Bricks for advanced buildings.
+
+angels-tin-metallurgy=Advanced processing steps for efficient production of tin.
+angels-tin-smelting=Additional processing steps to reduce material loss.
+angels-tin-casting=Additional processing steps to increase yield.
+
+angels-titanium-metallurgy=Advanced processing steps for the production of titanium.
+angels-titanium-smelting=Additional processing steps to reduce material loss.
+angels-titanium-casting=Additional processing steps to increase yield.
+
+angels-tungsten-smelting=Advanced processing steps for the production of tungsten.
+
+angels-zinc-metallurgy=Advanced processing steps for the production of zinc.
+angels-zinc-smelting=Additional processing steps to reduce material loss.
+angels-zinc-casting=Additional processing steps to increase yield.
+
+angels-steel-smelting=Advanced processing steps for efficient production of steel.
+angels-steel-casting=Additional processing steps to increase yield.
+
+angels-solder-smelting-basic=Solder is a tin alloy with very low melting temperature.
+angels-solder-smelting=Advanced processing steps for efficient production of solder.
+
+angels-bronze-smelting=Advanced processing steps for the production of bronze.
+angels-brass-smelting=Advanced processing steps for the production of brass.
+angels-electrum-smelting=Advanced processing steps for the production of electrum.
+angels-gunmetal-smelting=Advanced processing steps for the production of gunmetal.
+angels-invar-smelting=Advanced processing steps for the production of invar.
+angels-cobalt-steel-smelting=Advanced processing steps for the production of cobalt steel.
+angels-nitinol-smelting=Advanced processing steps for the production of nitinol.
+
 [tile-name]
 clay-bricks=Clay path
 concrete-brick=Concrete slab (grid)
diff --git a/angelssmelting/prototypes/buildings/blast-furnace.lua b/angelssmelting/prototypes/buildings/blast-furnace.lua
index ffdbbd1a3..393548f29 100644
--- a/angelssmelting/prototypes/buildings/blast-furnace.lua
+++ b/angelssmelting/prototypes/buildings/blast-furnace.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "blast-furnace",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-blast-furnace",
       order = "a[blast-furnace]",
       place_result = "blast-furnace",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "blast-furnace",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "blast-furnace"},
       fast_replaceable_group = "blast-furnace",
@@ -220,20 +208,15 @@ data:extend(
     {
       type = "item",
       name = "blast-furnace-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-blast-furnace",
       order = "b[blast-furnace-2]",
       place_result = "blast-furnace-2",
@@ -242,20 +225,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "blast-furnace-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "blast-furnace-2"},
       fast_replaceable_group = "blast-furnace",
@@ -435,20 +413,15 @@ data:extend(
     {
       type = "item",
       name = "blast-furnace-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-blast-furnace",
       order = "c[blast-furnace-3]",
       place_result = "blast-furnace-3",
@@ -457,20 +430,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "blast-furnace-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "blast-furnace-3"},
       fast_replaceable_group = "blast-furnace",
@@ -650,20 +618,15 @@ data:extend(
     {
       type = "item",
       name = "blast-furnace-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-blast-furnace",
       order = "d[blast-furnace-4]",
       place_result = "blast-furnace-4",
@@ -672,20 +635,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "blast-furnace-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/blast-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "blast-furnace-4"},
       fast_replaceable_group = "blast-furnace",
diff --git a/angelssmelting/prototypes/buildings/casting-machine.lua b/angelssmelting/prototypes/buildings/casting-machine.lua
index 4513ecdae..db12ffba4 100644
--- a/angelssmelting/prototypes/buildings/casting-machine.lua
+++ b/angelssmelting/prototypes/buildings/casting-machine.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "casting-machine",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-casting-machine",
       order = "a[casting-machine]",
       place_result = "casting-machine",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "casting-machine",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "casting-machine"},
       fast_replaceable_group = "casting-machine",
@@ -175,21 +163,15 @@ data:extend(
     {
       type = "item",
       name = "casting-machine-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-casting-machine",
       order = "b[casting-machine-2]",
       place_result = "casting-machine-2",
@@ -198,21 +180,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "casting-machine-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "casting-machine-2"},
       fast_replaceable_group = "casting-machine",
@@ -347,21 +323,15 @@ data:extend(
     {
       type = "item",
       name = "casting-machine-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-casting-machine",
       order = "c[casting-machine-3]",
       place_result = "casting-machine-3",
@@ -370,21 +340,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "casting-machine-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "casting-machine-3"},
       fast_replaceable_group = "casting-machine",
@@ -519,21 +483,15 @@ data:extend(
     {
       type = "item",
       name = "casting-machine-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-casting-machine",
       order = "d[casting-machine-4]",
       place_result = "casting-machine-4",
@@ -542,21 +500,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "casting-machine-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "casting-machine-4"},
       fast_replaceable_group = "casting-machine",
diff --git a/angelssmelting/prototypes/buildings/chemical-furnace.lua b/angelssmelting/prototypes/buildings/chemical-furnace.lua
index 5ff4f1bdb..a486702ef 100644
--- a/angelssmelting/prototypes/buildings/chemical-furnace.lua
+++ b/angelssmelting/prototypes/buildings/chemical-furnace.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "angels-chemical-furnace",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-chemical-furnace",
       order = "a[angels-chemical-furnace]",
       place_result = "angels-chemical-furnace",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-chemical-furnace",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-chemical-furnace"},
       fast_replaceable_group = "angels-chemical-furnace",
@@ -210,21 +198,15 @@ data:extend(
     {
       type = "item",
       name = "angels-chemical-furnace-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-chemical-furnace",
       order = "b[angels-chemical-furnace-2]",
       place_result = "angels-chemical-furnace-2",
@@ -233,21 +215,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-chemical-furnace-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-chemical-furnace-2"},
       fast_replaceable_group = "angels-chemical-furnace",
@@ -417,21 +393,15 @@ data:extend(
     {
       type = "item",
       name = "angels-chemical-furnace-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-chemical-furnace",
       order = "c[angels-chemical-furnace-3]",
       place_result = "angels-chemical-furnace-3",
@@ -440,21 +410,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-chemical-furnace-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-chemical-furnace-3"},
       fast_replaceable_group = "angels-chemical-furnace",
@@ -624,21 +588,15 @@ data:extend(
     {
       type = "item",
       name = "angels-chemical-furnace-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-chemical-furnace",
       order = "d[angels-chemical-furnace-4]",
       place_result = "angels-chemical-furnace-4",
@@ -647,21 +605,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "angels-chemical-furnace-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/chemical-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "angels-chemical-furnace-4"},
       fast_replaceable_group = "angels-chemical-furnace",
diff --git a/angelssmelting/prototypes/buildings/concrete-bricks.lua b/angelssmelting/prototypes/buildings/concrete-bricks.lua
index 7e3561dbd..4e7b3d5f5 100644
--- a/angelssmelting/prototypes/buildings/concrete-bricks.lua
+++ b/angelssmelting/prototypes/buildings/concrete-bricks.lua
@@ -21,12 +21,14 @@ local concrete_brick_tile_data =
 data:extend(
   {
     copyGrid("concrete-brick", {
-      walking_speed_modifier = 1.55,
+      walking_speed_modifier = 1.50,
       decorative_removal_probability = 0.33, --0.25,
+      layer = 61
     }),
     copyGrid("reinforced-concrete-brick", {
       walking_speed_modifier = 1.55,
       decorative_removal_probability = 1.00, --0.25,
+      layer = 64
     })
   }
 )
diff --git a/angelssmelting/prototypes/buildings/induction-furnace.lua b/angelssmelting/prototypes/buildings/induction-furnace.lua
index fb84879c5..6ce9d8fb3 100644
--- a/angelssmelting/prototypes/buildings/induction-furnace.lua
+++ b/angelssmelting/prototypes/buildings/induction-furnace.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "induction-furnace",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
-          icon_size = 64,
-            icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-induction-furnace",
       order = "a[induction-furnace]",
       place_result = "induction-furnace",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "induction-furnace",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
-          icon_size = 64,
-            icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral","player-creation"},
       minable = {mining_time = 1, result = "induction-furnace"},
       fast_replaceable_group = "induction-furnace",
@@ -244,9 +232,9 @@ data:extend(
           pipe_covers = pipecoverspictures(),
           base_level = 1,
           pipe_connections = {{ position = {2, -3} }}
-        }
+        },
+        --off_when_no_fluid_recipe = true,
       },
-      off_when_no_fluid_recipe = true,
       vehicle_impact_sound =  { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
       working_sound =
       {
@@ -259,21 +247,15 @@ data:extend(
     {
       type = "item",
       name = "induction-furnace-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
-          icon_size = 64,
-            icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-induction-furnace",
       order = "b[induction-furnace-2]",
       place_result = "induction-furnace-2",
@@ -282,21 +264,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "induction-furnace-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
-          icon_size = 64,
-            icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral","player-creation"},
       minable = {mining_time = 1, result = "induction-furnace-2"},
       fast_replaceable_group = "induction-furnace",
@@ -492,9 +468,9 @@ data:extend(
           pipe_covers = pipecoverspictures(),
           base_level = 1,
           pipe_connections = {{ position = {2, -3} }}
-        }
+        },
+        --off_when_no_fluid_recipe = true,
       },
-      off_when_no_fluid_recipe = true,
       vehicle_impact_sound =  { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
       working_sound =
       {
@@ -507,21 +483,15 @@ data:extend(
     {
       type = "item",
       name = "induction-furnace-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
-          icon_size = 64,
-            icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-induction-furnace",
       order = "c[induction-furnace-3]",
       place_result = "induction-furnace-3",
@@ -530,21 +500,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "induction-furnace-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
-          icon_size = 64,
-            icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral","player-creation"},
       minable = {mining_time = 1, result = "induction-furnace-3"},
       fast_replaceable_group = "induction-furnace",
@@ -740,9 +704,9 @@ data:extend(
           pipe_covers = pipecoverspictures(),
           base_level = 1,
           pipe_connections = {{ position = {2, -3} }}
-        }
+        },
+        --off_when_no_fluid_recipe = true,
       },
-      off_when_no_fluid_recipe = true,
       vehicle_impact_sound =  { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
       working_sound =
       {
@@ -755,21 +719,15 @@ data:extend(
     {
       type = "item",
       name = "induction-furnace-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
-          icon_size = 64,
-            icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-induction-furnace",
       order = "d[induction-furnace-4]",
       place_result = "induction-furnace-4",
@@ -778,21 +736,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "induction-furnace-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
-          icon_size = 64,
-            icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/induction-furnace.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12},
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral","player-creation"},
       minable = {mining_time = 1, result = "induction-furnace-4"},
       fast_replaceable_group = "induction-furnace",
@@ -987,9 +939,9 @@ data:extend(
           pipe_covers = pipecoverspictures(),
           base_level = 1,
           pipe_connections = {{ position = {2, -3} }}
-        }
+        },
+        --off_when_no_fluid_recipe = true,
       },
-      off_when_no_fluid_recipe = true,
       vehicle_impact_sound =  { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
       working_sound =
       {
diff --git a/angelssmelting/prototypes/buildings/ore-processing-machine.lua b/angelssmelting/prototypes/buildings/ore-processing-machine.lua
index 91da96c23..41ead0c5f 100644
--- a/angelssmelting/prototypes/buildings/ore-processing-machine.lua
+++ b/angelssmelting/prototypes/buildings/ore-processing-machine.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "ore-processing-machine",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-processing-machine",
       order = "a[ore-processing-machine]",
       place_result = "ore-processing-machine",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-processing-machine",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-processing-machine"},
       fast_replaceable_group = "ore-processing-machine",
@@ -192,21 +180,15 @@ data:extend(
     {
       type = "item",
       name = "ore-processing-machine-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-processing-machine",
       order = "b[ore-processing-machine-2]",
       place_result = "ore-processing-machine-2",
@@ -215,21 +197,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-processing-machine-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-processing-machine-2"},
       fast_replaceable_group = "ore-processing-machine",
@@ -381,21 +357,15 @@ data:extend(
     {
       type = "item",
       name = "ore-processing-machine-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-processing-machine",
       order = "c[ore-processing-machine-3]",
       place_result = "ore-processing-machine-3",
@@ -404,21 +374,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-processing-machine-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-processing-machine-3"},
       fast_replaceable_group = "ore-processing-machine",
@@ -570,21 +534,15 @@ data:extend(
     {
       type = "item",
       name = "ore-processing-machine-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-processing-machine",
       order = "d[ore-processing-machine-4]",
       place_result = "ore-processing-machine-4",
@@ -593,21 +551,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "ore-processing-machine-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/ore-processing-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "ore-processing-machine-4"},
       fast_replaceable_group = "ore-processing-machine",
diff --git a/angelssmelting/prototypes/buildings/pellet-press.lua b/angelssmelting/prototypes/buildings/pellet-press.lua
index 283c26b2b..8d58232d6 100644
--- a/angelssmelting/prototypes/buildings/pellet-press.lua
+++ b/angelssmelting/prototypes/buildings/pellet-press.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "pellet-press",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/pellet-press.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/pellet-press.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-pellet-press",
       order = "a[pellet-press]",
       place_result = "pellet-press",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "pellet-press",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/pellet-press.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/pellet-press.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "pellet-press"},
       fast_replaceable_group = "pellet-press",
@@ -122,21 +110,15 @@ data:extend(
     {
       type = "item",
       name = "pellet-press-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/pellet-press.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/pellet-press.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-pellet-press",
       order = "b[pellet-press-2]",
       place_result = "pellet-press-2",
@@ -145,21 +127,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "pellet-press-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/pellet-press.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/pellet-press.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "pellet-press-2"},
       fast_replaceable_group = "pellet-press",
@@ -241,21 +217,15 @@ data:extend(
     {
       type = "item",
       name = "pellet-press-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/pellet-press.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/pellet-press.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-pellet-press",
       order = "c[pellet-press-3]",
       place_result = "pellet-press-3",
@@ -264,21 +234,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "pellet-press-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/pellet-press.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/pellet-press.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "pellet-press-3"},
       fast_replaceable_group = "pellet-press",
@@ -360,21 +324,15 @@ data:extend(
     {
       type = "item",
       name = "pellet-press-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/pellet-press.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/pellet-press.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-pellet-press",
       order = "d[pellet-press-4]",
       place_result = "pellet-press-4",
@@ -383,21 +341,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "pellet-press-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/pellet-press.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/pellet-press.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "pellet-press-4"},
       fast_replaceable_group = "pellet-press",
diff --git a/angelssmelting/prototypes/buildings/powder-mixer.lua b/angelssmelting/prototypes/buildings/powder-mixer.lua
index 369c8d6bf..7775ce4ab 100644
--- a/angelssmelting/prototypes/buildings/powder-mixer.lua
+++ b/angelssmelting/prototypes/buildings/powder-mixer.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "powder-mixer",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-powder-mixer",
       order = "a[powder-mixer]",
       place_result = "powder-mixer",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "powder-mixer",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "powder-mixer"},
       fast_replaceable_group = "powder-mixer",
@@ -121,21 +109,15 @@ data:extend(
     {
       type = "item",
       name = "powder-mixer-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-powder-mixer",
       order = "b[powder-mixer-2]",
       place_result = "powder-mixer-2",
@@ -144,21 +126,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "powder-mixer-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "powder-mixer-2"},
       fast_replaceable_group = "powder-mixer",
@@ -239,21 +215,15 @@ data:extend(
     {
       type = "item",
       name = "powder-mixer-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-powder-mixer",
       order = "c[powder-mixer-3]",
       place_result = "powder-mixer-3",
@@ -262,21 +232,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "powder-mixer-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "powder-mixer-3"},
       fast_replaceable_group = "powder-mixer",
@@ -357,21 +321,15 @@ data:extend(
     {
       type = "item",
       name = "powder-mixer-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-powder-mixer",
       order = "d[powder-mixer-4]",
       place_result = "powder-mixer-4",
@@ -380,21 +338,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "powder-mixer-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/powder-mixer-ico.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "powder-mixer-4"},
       fast_replaceable_group = "powder-mixer",
diff --git a/angelssmelting/prototypes/buildings/sintering-oven.lua b/angelssmelting/prototypes/buildings/sintering-oven.lua
index c74239165..632b54418 100644
--- a/angelssmelting/prototypes/buildings/sintering-oven.lua
+++ b/angelssmelting/prototypes/buildings/sintering-oven.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "sintering-oven",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-sintering-oven",
       order = "a[sintering-oven]",
       place_result = "sintering-oven",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "sintering-oven",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "sintering-oven"},
       fast_replaceable_group = "sintering-oven",
@@ -156,21 +144,15 @@ data:extend(
     {
       type = "item",
       name = "sintering-oven-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-sintering-oven",
       order = "b[sintering-oven-2]",
       place_result = "sintering-oven-2",
@@ -179,21 +161,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "sintering-oven-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "sintering-oven-2"},
       fast_replaceable_group = "sintering-oven",
@@ -309,21 +285,15 @@ data:extend(
     {
       type = "item",
       name = "sintering-oven-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-sintering-oven",
       order = "c[sintering-oven-3]",
       place_result = "sintering-oven-3",
@@ -332,21 +302,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "sintering-oven-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "sintering-oven-3"},
       fast_replaceable_group = "sintering-oven",
@@ -462,21 +426,15 @@ data:extend(
     {
       type = "item",
       name = "sintering-oven-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-sintering-oven",
       order = "d[sintering-oven-4]",
       place_result = "sintering-oven-4",
@@ -485,21 +443,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "sintering-oven-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/sintering-oven.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          icon_size = 32,
-          icon_mipmaps = 1,
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "sintering-oven-4"},
       fast_replaceable_group = "sintering-oven",
diff --git a/angelssmelting/prototypes/buildings/strand-casting-machine.lua b/angelssmelting/prototypes/buildings/strand-casting-machine.lua
index 279b9f173..0a09b8942 100644
--- a/angelssmelting/prototypes/buildings/strand-casting-machine.lua
+++ b/angelssmelting/prototypes/buildings/strand-casting-machine.lua
@@ -3,21 +3,15 @@ data:extend(
     {
       type = "item",
       name = "strand-casting-machine",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       subgroup = "angels-strand-casting-machine",
       order = "a[strand-casting-machine]",
       place_result = "strand-casting-machine",
@@ -26,21 +20,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "strand-casting-machine",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        1, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "strand-casting-machine"},
       fast_replaceable_group = "strand-casting-machine",
@@ -217,21 +205,15 @@ data:extend(
     {
       type = "item",
       name = "strand-casting-machine-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       subgroup = "angels-strand-casting-machine",
       order = "b[strand-casting-machine-2]",
       place_result = "strand-casting-machine-2",
@@ -240,21 +222,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "strand-casting-machine-2",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        2, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "strand-casting-machine-2"},
       fast_replaceable_group = "strand-casting-machine",
@@ -431,21 +407,15 @@ data:extend(
     {
       type = "item",
       name = "strand-casting-machine-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       subgroup = "angels-strand-casting-machine",
       order = "c[strand-casting-machine-3]",
       place_result = "strand-casting-machine-3",
@@ -454,21 +424,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "strand-casting-machine-3",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        3, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "strand-casting-machine-3"},
       fast_replaceable_group = "strand-casting-machine",
@@ -645,21 +609,15 @@ data:extend(
     {
       type = "item",
       name = "strand-casting-machine-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       subgroup = "angels-strand-casting-machine",
       order = "d[strand-casting-machine-4]",
       place_result = "strand-casting-machine-4",
@@ -668,21 +626,15 @@ data:extend(
     {
       type = "assembling-machine",
       name = "strand-casting-machine-4",
-      icons = {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
-          icon_size = 64,
-          icon_mipmaps = 4
+          {
+            icon = "__angelssmelting__/graphics/icons/strand-casting-machine.png",
+            icon_size = 64, icon_mipmaps = 4,
+            scale = 0.5
+          }
         },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_4.png",
-          tint = angelsmods.smelting.number_tint,
-          icon_size = 32,
-          icon_mipmaps = 1,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
+        4, angelsmods.smelting.number_tint),
       flags = {"placeable-neutral", "player-creation"},
       minable = {mining_time = 1, result = "strand-casting-machine-4"},
       fast_replaceable_group = "strand-casting-machine",
diff --git a/angelssmelting/prototypes/items/angels-alloy-steel.lua b/angelssmelting/prototypes/items/angels-alloy-steel.lua
index 434b9c7e3..1ed79a321 100644
--- a/angelssmelting/prototypes/items/angels-alloy-steel.lua
+++ b/angelssmelting/prototypes/items/angels-alloy-steel.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "powder-steel",
     icon = "__angelssmelting__/graphics/icons/powder-steel.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-iron",
     order = "h",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-aluminium.lua b/angelssmelting/prototypes/items/angels-aluminium.lua
index 24b20b694..17a6e4b74 100644
--- a/angelssmelting/prototypes/items/angels-aluminium.lua
+++ b/angelssmelting/prototypes/items/angels-aluminium.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "processed-aluminium",
     icon = "__angelssmelting__/graphics/icons/processed-aluminium.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-aluminium",
     order = "b",
     stack_size = 200
@@ -24,7 +24,7 @@ data:extend(
     type = "item",
     name = "pellet-aluminium",
     icon = "__angelssmelting__/graphics/icons/pellet-aluminium.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-aluminium",
     order = "c",
     stack_size = 200
@@ -70,7 +70,7 @@ data:extend(
     type = "item",
     name = "powder-aluminium",
     icon = "__angelssmelting__/graphics/icons/powder-aluminium.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-aluminium",
     order = "h",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-chrome.lua b/angelssmelting/prototypes/items/angels-chrome.lua
index 2a48dde6c..94f5f2524 100644
--- a/angelssmelting/prototypes/items/angels-chrome.lua
+++ b/angelssmelting/prototypes/items/angels-chrome.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "processed-chrome",
     icon = "__angelssmelting__/graphics/icons/processed-chrome.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-chrome",
     order = "b",
     stack_size = 200
@@ -24,7 +24,7 @@ data:extend(
     type = "item",
     name = "pellet-chrome",
     icon = "__angelssmelting__/graphics/icons/pellet-chrome.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-chrome",
     order = "c",
     stack_size = 200
@@ -70,7 +70,7 @@ data:extend(
     type = "item",
     name = "powder-chrome",
     icon = "__angelssmelting__/graphics/icons/powder-chrome.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-chrome",
     order = "h",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-cobalt.lua b/angelssmelting/prototypes/items/angels-cobalt.lua
index 3d2f5262b..e8a8f70fc 100644
--- a/angelssmelting/prototypes/items/angels-cobalt.lua
+++ b/angelssmelting/prototypes/items/angels-cobalt.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "processed-cobalt",
     icon = "__angelssmelting__/graphics/icons/processed-cobalt.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-cobalt",
     order = "b",
     stack_size = 200
@@ -24,7 +24,7 @@ data:extend(
     type = "item",
     name = "pellet-cobalt",
     icon = "__angelssmelting__/graphics/icons/pellet-cobalt.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-cobalt",
     order = "c",
     stack_size = 200
@@ -61,7 +61,7 @@ data:extend(
     type = "item",
     name = "powder-cobalt",
     icon = "__angelssmelting__/graphics/icons/powder-cobalt.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-cobalt",
     order = "g",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-copper.lua b/angelssmelting/prototypes/items/angels-copper.lua
index 7716a15ea..5fa89fb43 100644
--- a/angelssmelting/prototypes/items/angels-copper.lua
+++ b/angelssmelting/prototypes/items/angels-copper.lua
@@ -7,7 +7,7 @@ data:extend(
     type = "item",
     name = "processed-copper",
     icon = "__angelssmelting__/graphics/icons/processed-copper.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-copper",
     order = "b",
     stack_size = 200
@@ -16,7 +16,7 @@ data:extend(
     type = "item",
     name = "pellet-copper",
     icon = "__angelssmelting__/graphics/icons/pellet-copper.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-copper",
     order = "c",
     stack_size = 200
@@ -44,7 +44,7 @@ data:extend(
     type = "item",
     name = "powder-copper",
     icon = "__angelssmelting__/graphics/icons/powder-copper.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-copper",
     order = "f",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-gold.lua b/angelssmelting/prototypes/items/angels-gold.lua
index 6dab99d9b..16ec4424f 100644
--- a/angelssmelting/prototypes/items/angels-gold.lua
+++ b/angelssmelting/prototypes/items/angels-gold.lua
@@ -17,7 +17,7 @@ data:extend(
     type = "item",
     name = "processed-gold",
     icon = "__angelssmelting__/graphics/icons/processed-gold.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-gold",
     order = "b",
     stack_size = 200
@@ -26,7 +26,7 @@ data:extend(
     type = "item",
     name = "pellet-gold",
     icon = "__angelssmelting__/graphics/icons/pellet-gold.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-gold",
     order = "c",
     stack_size = 200
@@ -78,7 +78,7 @@ data:extend(
     type = "item",
     name = "powder-gold",
     icon = "__angelssmelting__/graphics/icons/powder-gold.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-gold",
     order = "h",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-iron.lua b/angelssmelting/prototypes/items/angels-iron.lua
index 365558d82..4368e4ce5 100644
--- a/angelssmelting/prototypes/items/angels-iron.lua
+++ b/angelssmelting/prototypes/items/angels-iron.lua
@@ -7,7 +7,7 @@ data:extend(
     type = "item",
     name = "processed-iron",
     icon = "__angelssmelting__/graphics/icons/processed-iron.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-iron",
     order = "b",
     stack_size = 200
@@ -16,7 +16,7 @@ data:extend(
     type = "item",
     name = "pellet-iron",
     icon = "__angelssmelting__/graphics/icons/pellet-iron.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-iron",
     order = "c",
     stack_size = 200
@@ -45,7 +45,7 @@ data:extend(
     type = "item",
     name = "powder-iron",
     icon = "__angelssmelting__/graphics/icons/powder-iron.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-iron",
     order = "g",
     stack_size = 200
@@ -96,7 +96,7 @@ data:extend(
     order = "l",
     stack_size = 200
   },
-  {
+  --[[{
     type = "item",
     name = "angels-rod-iron",
     icon = "__angelssmelting__/graphics/icons/rod-iron.png",
@@ -104,7 +104,17 @@ data:extend(
     subgroup = "angels-iron-casting",
     order = "m",
     stack_size = 200
-  },
+  },]]
   -- order n reserved for motor casting (see industries)
 }
-)
\ No newline at end of file
+)
+------------------------------------------------------------------
+--UPDATE IRON STICK TO MATCH THE "ROD"
+------------------------------------------------------------------
+local stick = data.raw.item["iron-stick"]
+stick.icon = "__angelssmelting__/graphics/icons/rod-iron.png"
+stick.localised_name = {"item-name.angels-rod-iron"}
+stick.icon_size = 32
+stick.subgroup = "angels-iron-casting"
+stick.order = "m"
+stick.stack_size = 200
\ No newline at end of file
diff --git a/angelssmelting/prototypes/items/angels-lead.lua b/angelssmelting/prototypes/items/angels-lead.lua
index 4b7c2082a..c6a43572d 100644
--- a/angelssmelting/prototypes/items/angels-lead.lua
+++ b/angelssmelting/prototypes/items/angels-lead.lua
@@ -17,7 +17,7 @@ data:extend(
     type = "item",
     name = "processed-lead",
     icon = "__angelssmelting__/graphics/icons/processed-lead.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-lead",
     order = "b",
     stack_size = 200
@@ -26,7 +26,7 @@ data:extend(
     type = "item",
     name = "pellet-lead",
     icon = "__angelssmelting__/graphics/icons/pellet-lead.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-lead",
     order = "c",
     stack_size = 200
@@ -78,7 +78,7 @@ data:extend(
     type = "item",
     name = "powder-lead",
     icon = "__angelssmelting__/graphics/icons/powder-lead.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-lead",
     order = "h",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-manganese.lua b/angelssmelting/prototypes/items/angels-manganese.lua
index 7434fb937..be1675336 100644
--- a/angelssmelting/prototypes/items/angels-manganese.lua
+++ b/angelssmelting/prototypes/items/angels-manganese.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "processed-manganese",
     icon = "__angelssmelting__/graphics/icons/processed-manganese.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-manganese",
     order = "b",
     stack_size = 200
@@ -24,7 +24,7 @@ data:extend(
     type = "item",
     name = "pellet-manganese",
     icon = "__angelssmelting__/graphics/icons/pellet-manganese.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-manganese",
     order = "c",
     stack_size = 200
@@ -61,7 +61,7 @@ data:extend(
     type = "item",
     name = "powder-manganese",
     icon = "__angelssmelting__/graphics/icons/powder-manganese.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-manganese",
     order = "g",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-nickel.lua b/angelssmelting/prototypes/items/angels-nickel.lua
index 20be70449..4f5469422 100644
--- a/angelssmelting/prototypes/items/angels-nickel.lua
+++ b/angelssmelting/prototypes/items/angels-nickel.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "processed-nickel",
     icon = "__angelssmelting__/graphics/icons/processed-nickel.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-nickel",
     order = "b",
     stack_size = 200
@@ -24,7 +24,7 @@ data:extend(
     type = "item",
     name = "pellet-nickel",
     icon = "__angelssmelting__/graphics/icons/pellet-nickel.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-nickel",
     order = "c",
     stack_size = 200
@@ -61,7 +61,7 @@ data:extend(
     type = "item",
     name = "powder-nickel",
     icon = "__angelssmelting__/graphics/icons/powder-nickel.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-nickel",
     order = "g",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-platinum.lua b/angelssmelting/prototypes/items/angels-platinum.lua
index eac81105e..4ef5ae977 100644
--- a/angelssmelting/prototypes/items/angels-platinum.lua
+++ b/angelssmelting/prototypes/items/angels-platinum.lua
@@ -17,7 +17,7 @@ data:extend(
     type = "item",
     name = "processed-platinum",
     icon = "__angelssmelting__/graphics/icons/processed-platinum.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-platinum",
     order = "b",
     stack_size = 200
@@ -26,7 +26,7 @@ data:extend(
     type = "item",
     name = "pellet-platinum",
     icon = "__angelssmelting__/graphics/icons/pellet-platinum.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-platinum",
     order = "c",
     stack_size = 200
@@ -69,7 +69,7 @@ data:extend(
     type = "item",
     name = "powder-platinum",
     icon = "__angelssmelting__/graphics/icons/powder-platinum.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-platinum",
     order = "g",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-silicon.lua b/angelssmelting/prototypes/items/angels-silicon.lua
index dc7d0c28d..d2b85eb05 100644
--- a/angelssmelting/prototypes/items/angels-silicon.lua
+++ b/angelssmelting/prototypes/items/angels-silicon.lua
@@ -17,7 +17,7 @@ data:extend(
     type = "item",
     name = "processed-silica",
     icon = "__angelssmelting__/graphics/icons/processed-silica.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-silicon",
     order = "b",
     stack_size = 200
@@ -26,7 +26,7 @@ data:extend(
     type = "item",
     name = "pellet-silica",
     icon = "__angelssmelting__/graphics/icons/pellet-silica.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-silicon",
     order = "c",
     stack_size = 200
@@ -75,7 +75,7 @@ data:extend(
     type = "item",
     name = "powder-silicon",
     icon = "__angelssmelting__/graphics/icons/powder-silica.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-silicon",
     order = "g",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-silver.lua b/angelssmelting/prototypes/items/angels-silver.lua
index 96fa8d3bf..902b9c1bd 100644
--- a/angelssmelting/prototypes/items/angels-silver.lua
+++ b/angelssmelting/prototypes/items/angels-silver.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "processed-silver",
     icon = "__angelssmelting__/graphics/icons/processed-silver.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-silver",
     order = "b",
     stack_size = 200
@@ -24,7 +24,7 @@ data:extend(
     type = "item",
     name = "pellet-silver",
     icon = "__angelssmelting__/graphics/icons/pellet-silver.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-silver",
     order = "c",
     stack_size = 200
@@ -71,7 +71,7 @@ data:extend(
     type = "item",
     name = "powder-silver",
     icon = "__angelssmelting__/graphics/icons/powder-silver.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-silver",
     order = "i",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-tin.lua b/angelssmelting/prototypes/items/angels-tin.lua
index ebab19ff2..6b501862d 100644
--- a/angelssmelting/prototypes/items/angels-tin.lua
+++ b/angelssmelting/prototypes/items/angels-tin.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "processed-tin",
     icon = "__angelssmelting__/graphics/icons/processed-tin.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-tin",
     order = "b",
     stack_size = 200
@@ -24,7 +24,7 @@ data:extend(
     type = "item",
     name = "pellet-tin",
     icon = "__angelssmelting__/graphics/icons/pellet-tin.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-tin",
     order = "c",
     stack_size = 200
@@ -43,7 +43,7 @@ data:extend(
     type = "item",
     name = "powder-tin",
     icon = "__angelssmelting__/graphics/icons/powder-tin.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-tin",
     order = "e",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-titanium.lua b/angelssmelting/prototypes/items/angels-titanium.lua
index 8a7e41d33..200873184 100644
--- a/angelssmelting/prototypes/items/angels-titanium.lua
+++ b/angelssmelting/prototypes/items/angels-titanium.lua
@@ -17,7 +17,7 @@ data:extend(
     type = "item",
     name = "processed-titanium",
     icon = "__angelssmelting__/graphics/icons/processed-titanium.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-titanium",
     order = "b",
     stack_size = 200
@@ -26,7 +26,7 @@ data:extend(
     type = "item",
     name = "pellet-titanium",
     icon = "__angelssmelting__/graphics/icons/pellet-titanium.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-titanium",
     order = "c",
     stack_size = 200
@@ -69,7 +69,7 @@ data:extend(
     type = "item",
     name = "powder-titanium",
     icon = "__angelssmelting__/graphics/icons/powder-titanium.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-titanium",
     order = "g",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-tungsten.lua b/angelssmelting/prototypes/items/angels-tungsten.lua
index 3d383fc32..f6cffc7d5 100644
--- a/angelssmelting/prototypes/items/angels-tungsten.lua
+++ b/angelssmelting/prototypes/items/angels-tungsten.lua
@@ -17,7 +17,7 @@ data:extend(
     type = "item",
     name = "processed-tungsten",
     icon = "__angelssmelting__/graphics/icons/processed-tungsten.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-tungsten",
     order = "b",
     stack_size = 200
@@ -26,7 +26,7 @@ data:extend(
     type = "item",
     name = "pellet-tungsten",
     icon = "__angelssmelting__/graphics/icons/pellet-tungsten.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-tungsten",
     order = "c",
     stack_size = 200
@@ -84,7 +84,7 @@ data:extend(
     type = "item",
     name = "powder-tungsten",
     icon = "__angelssmelting__/graphics/icons/powder-tungsten.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-tungsten",
     order = "h",
     stack_size = 200
@@ -94,7 +94,7 @@ data:extend(
     type = "item",
     name = "casting-powder-tungsten",
     icon = "__angelssmelting__/graphics/icons/powder-tungsten-mixture.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-tungsten-casting",
     order = "i",
     stack_size = 200
diff --git a/angelssmelting/prototypes/items/angels-zinc.lua b/angelssmelting/prototypes/items/angels-zinc.lua
index bdaf16068..ba704990d 100644
--- a/angelssmelting/prototypes/items/angels-zinc.lua
+++ b/angelssmelting/prototypes/items/angels-zinc.lua
@@ -15,7 +15,7 @@ data:extend(
     type = "item",
     name = "processed-zinc",
     icon = "__angelssmelting__/graphics/icons/processed-zinc.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-zinc",
     order = "b",
     stack_size = 200
@@ -24,7 +24,7 @@ data:extend(
     type = "item",
     name = "pellet-zinc",
     icon = "__angelssmelting__/graphics/icons/pellet-zinc.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-zinc",
     order = "c",
     stack_size = 200
@@ -61,7 +61,7 @@ data:extend(
     type = "item",
     name = "powder-zinc",
     icon = "__angelssmelting__/graphics/icons/powder-zinc.png",
-    icon_size = 32,
+    icon_size = 64, icon_mipmaps = 4,
     subgroup = "angels-zinc",
     order = "g",
     stack_size = 200
diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua b/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua
index 6e8f69c52..2c1ee7a15 100644
--- a/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua
+++ b/angelssmelting/prototypes/override/smelting-override-alloy-brass.lua
@@ -149,6 +149,7 @@ if angelsmods.trigger.smelting_products["brass"].plate then
           icon_size = 256, icon_mipmaps = 4,
           upgrade = true,
           prerequisites = {
+            "angels-metallurgy-3",
             "angels-brass-smelting-1",
             "angels-tin-smelting-1"
           },
@@ -176,6 +177,7 @@ if angelsmods.trigger.smelting_products["brass"].plate then
           icon_size = 256, icon_mipmaps = 4,
           upgrade = true,
           prerequisites = {
+            "angels-metallurgy-4",
             "angels-brass-smelting-2",
             "angels-lead-smelting-1"
           },
diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua
index b1efd95c0..ce7d25b3d 100644
--- a/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua
+++ b/angelssmelting/prototypes/override/smelting-override-alloy-bronze.lua
@@ -148,6 +148,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then
           icon_size = 256, icon_mipmaps = 4,
           upgrade = true,
           prerequisites = {
+            "angels-metallurgy-2",
             "angels-bronze-smelting-1",
             "angels-nickel-smelting-1"
           },
@@ -174,6 +175,7 @@ if angelsmods.trigger.smelting_products["bronze"].plate then
           icon_size = 256, icon_mipmaps = 4,
           upgrade = true,
           prerequisites = {
+            "angels-metallurgy-3",
             "angels-bronze-smelting-2",
             "angels-zinc-smelting-1"
           },
@@ -199,5 +201,9 @@ if angelsmods.trigger.smelting_products["bronze"].plate then
     OV.add_prereq("alloy-processing-1", "angels-bronze-smelting-1")
     OV.disable_recipe({"bronze-alloy"})
     angelsmods.functions.allow_productivity("angels-plate-bronze")
+    -- alloys shenanigans -------------------------------------------------------
+    if mods["bobplates"] then
+      OV.add_prereq("alloy-processing","angels-bronze-smelting-1")
+    end
   end
 end
diff --git a/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua b/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua
index c4d9658c3..a6a4e2080 100644
--- a/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua
+++ b/angelssmelting/prototypes/override/smelting-override-alloy-invar.lua
@@ -10,6 +10,7 @@ end
 -------------------------------------------------------------------------------
 if angelsmods.trigger.smelting_products["invar"].plate then
   if mods["bobplates"] then
+    OV.hide_recipe("invar-alloy")
     data:extend(
       {
         --INVAR
diff --git a/angelssmelting/prototypes/override/smelting-override-aluminium.lua b/angelssmelting/prototypes/override/smelting-override-aluminium.lua
index 03c108712..a94967c45 100644
--- a/angelssmelting/prototypes/override/smelting-override-aluminium.lua
+++ b/angelssmelting/prototypes/override/smelting-override-aluminium.lua
@@ -61,10 +61,10 @@ else
   angelsmods.functions.add_flag("solid-aluminium-oxide", "hidden")
   angelsmods.functions.add_flag("ingot-aluminium", "hidden")
   angelsmods.functions.add_flag("liquid-molten-aluminium", "hidden")
-  OV.disable_recipe({ "aluminium-processed-processing", "pellet-aluminium-smelting", "bauxite-ore-smelting" })
-  OV.disable_recipe({ "processed-aluminium-smelting", "solid-aluminium-hydroxide-smelting", "solid-sodium-aluminate-smelting" })
-  OV.disable_recipe({ "solid-aluminium-oxide-smelting" })
-  OV.disable_recipe({ "molten-aluminium-smelting-1", "molten-aluminium-smelting-2", "molten-aluminium-smelting-3" })
+  OV.disable_recipe({"bauxite-ore-processing", "aluminium-processed-processing", "pellet-aluminium-smelting", "bauxite-ore-smelting" })
+  OV.disable_recipe({"processed-aluminium-smelting", "solid-aluminium-hydroxide-smelting", "solid-sodium-aluminate-smelting" })
+  OV.disable_recipe({"solid-aluminium-oxide-smelting" })
+  OV.disable_recipe({"molten-aluminium-smelting-1", "molten-aluminium-smelting-2", "molten-aluminium-smelting-3" })
   OV.disable_technology({"angels-aluminium-smelting-1", "angels-aluminium-smelting-2", "angels-aluminium-smelting-3"})
   OV.disable_technology({"angels-aluminium-casting-2", "angels-aluminium-casting-3"})
 end
@@ -77,6 +77,7 @@ if angelsmods.trigger.smelting_products["aluminium"].plate then
   if mods['bobplates'] then
     OV.global_replace_item("angels-plate-aluminium", "aluminium-plate")
     angelsmods.functions.add_flag("angels-plate-aluminium", "hidden")
+    OV.hide_recipe({"bob-aluminium-plate","alumina"})
   end
 else
   angelsmods.functions.add_flag("angels-plate-aluminium", "hidden")
diff --git a/angelssmelting/prototypes/override/smelting-override-copper.lua b/angelssmelting/prototypes/override/smelting-override-copper.lua
index f8c2bcd3f..d205218f6 100644
--- a/angelssmelting/prototypes/override/smelting-override-copper.lua
+++ b/angelssmelting/prototypes/override/smelting-override-copper.lua
@@ -53,6 +53,7 @@ if angelsmods.trigger.smelting_products["copper"].plate then
         energy_required = 10.5,
         normal = {
           enabled = false,
+          hidden = true, --this essentially enforces the smelting of ore/advanced methods
           ingredients = {
             {name = "copper-ore", type = "item", amount = "+3"}
           },
@@ -62,6 +63,7 @@ if angelsmods.trigger.smelting_products["copper"].plate then
         },
         expensive = {
           enabled = false,
+          hidden = true, --this essentially enforces the smelting of ore/advanced methods
           ingredients = {
             {"!!"},
             {name = "copper-ore", type = "item", amount = 5 * intermediatemulti}
diff --git a/angelssmelting/prototypes/override/smelting-override-glass.lua b/angelssmelting/prototypes/override/smelting-override-glass.lua
index 3da473790..eb6ab6b46 100644
--- a/angelssmelting/prototypes/override/smelting-override-glass.lua
+++ b/angelssmelting/prototypes/override/smelting-override-glass.lua
@@ -104,7 +104,9 @@ if angelsmods.trigger.smelting_products["glass"].board then
             },
             {
               icon = "__angelssmelting__/graphics/icons/wire-coil-glass.png",
-              scale = 0.4375,
+              icon_size = 64,
+              icon_mipmaps = 4,
+              scale = 0.4375*0.5,
               shift = {-10, -10}
             }
           },
diff --git a/angelssmelting/prototypes/override/smelting-override-gold.lua b/angelssmelting/prototypes/override/smelting-override-gold.lua
index 54268593e..e817aabef 100644
--- a/angelssmelting/prototypes/override/smelting-override-gold.lua
+++ b/angelssmelting/prototypes/override/smelting-override-gold.lua
@@ -54,6 +54,7 @@ end
 if angelsmods.trigger.smelting_products["gold"].plate then
   -- REPLACE ITEMS (use bob version)
   if mods['bobplates'] then
+    OV.hide_recipe("bob-gold-plate")
     OV.global_replace_item("angels-plate-gold", "gold-plate")
     angelsmods.functions.add_flag("angels-plate-gold", "hidden")
 
diff --git a/angelssmelting/prototypes/override/smelting-override-iron.lua b/angelssmelting/prototypes/override/smelting-override-iron.lua
index 35de2cad2..b7a22b611 100644
--- a/angelssmelting/prototypes/override/smelting-override-iron.lua
+++ b/angelssmelting/prototypes/override/smelting-override-iron.lua
@@ -74,6 +74,7 @@ if angelsmods.trigger.smelting_products["iron"].plate then
         energy_required = 10.5,
         normal = {
           enabled = false,
+          hidden = true, --this essentially enforces the smelting of ore/advanced methods
           ingredients = {
             {name = "iron-ore", type = "item", amount = "+3"}
           },
@@ -83,6 +84,7 @@ if angelsmods.trigger.smelting_products["iron"].plate then
         },
         expensive = {
           enabled = false,
+          hidden = true, --this essentially enforces the smelting of ore/advanced methods
           ingredients = {
             {"!!"},
             {name = "iron-ore", type = "item", amount = 5 * intermediatemulti}
@@ -149,9 +151,9 @@ end
 -- ROD ------------------------------------------------------------------------
 -------------------------------------------------------------------------------
 if angelsmods.trigger.smelting_products["iron"].rod then
-  OV.global_replace_item("iron-stick", "angels-rod-iron")
-  angelsmods.functions.add_flag("iron-stick", "hidden")
-  OV.disable_recipe({"iron-stick"})
+  OV.global_replace_item("angels-rod-iron","iron-stick")
+  --angelsmods.functions.add_flag("iron-stick", "hidden")
+  OV.disable_recipe({"iron-stick"}) --disable vanilla's recipe?
 else
   OV.disable_recipe({"rod-stack-iron-casting", "rod-stack-iron-casting-fast"})
   OV.disable_recipe({"angels-rod-iron-plate", "angels-rod-stack-iron-converting"})
diff --git a/angelssmelting/prototypes/override/smelting-override-lead.lua b/angelssmelting/prototypes/override/smelting-override-lead.lua
index 4d9c55716..f8d20f681 100644
--- a/angelssmelting/prototypes/override/smelting-override-lead.lua
+++ b/angelssmelting/prototypes/override/smelting-override-lead.lua
@@ -25,7 +25,7 @@ if angelsmods.trigger.smelting_products["lead"].ingot then
   if mods["bobplates"] then
     OV.global_replace_item("solid-lead-oxide", "lead-oxide")
     angelsmods.functions.add_flag("solid-lead-oxide", "hidden")
-
+    OV.hide_recipe({"bob-lead-plate","lead-oxide","lead-oxide-2"})
     OV.global_replace_technology("lead-processing", "angels-lead-smelting-1")
   end
 
@@ -87,6 +87,7 @@ if angelsmods.trigger.smelting_products["lead"].plate then
           energy_required = 10.5,
           normal = {
             enabled = false,
+            hidden = true,
             ingredients = {
               {name = "lead-ore", type = "item", amount = "+3"}
             },
@@ -96,6 +97,7 @@ if angelsmods.trigger.smelting_products["lead"].plate then
           },
           expensive = {
             enabled = false,
+            hidden = true,
             ingredients = {
               {"!!"},
               {name = "lead-ore", type = "item", amount = 5 * intermediatemulti}
diff --git a/angelssmelting/prototypes/override/smelting-override-manganese.lua b/angelssmelting/prototypes/override/smelting-override-manganese.lua
index 9415c49d0..47ca7db5d 100644
--- a/angelssmelting/prototypes/override/smelting-override-manganese.lua
+++ b/angelssmelting/prototypes/override/smelting-override-manganese.lua
@@ -45,7 +45,7 @@ else
   OV.disable_recipe({"manganese-ore-processing", "manganese-processed-processing"})
   OV.disable_recipe({"pellet-manganese-smelting", "processed-manganese-smelting", "manganese-processed-processing-alt", "solid-manganese-oxide-smelting"})
   OV.disable_recipe({"manganese-ore-smelting", "cathode-manganese-smelting"})
-  OV.disable_recipe({"molten-manganese-smelting"})
+  OV.disable_recipe({"molten-manganese-smelting", "solid-iron-hydroxide-smelting"})
   OV.disable_technology({"angels-manganese-smelting-1", "angels-manganese-smelting-2", "angels-manganese-smelting-3"})
   OV.disable_technology({"angels-manganese-casting-2", "angels-manganese-casting-3"})
 end
diff --git a/angelssmelting/prototypes/override/smelting-override-nickel.lua b/angelssmelting/prototypes/override/smelting-override-nickel.lua
index 23dada7b7..d70088f44 100644
--- a/angelssmelting/prototypes/override/smelting-override-nickel.lua
+++ b/angelssmelting/prototypes/override/smelting-override-nickel.lua
@@ -21,6 +21,7 @@ end
 if angelsmods.trigger.smelting_products["nickel"].ingot then
   if mods['bobplates'] then
     OV.global_replace_technology("nickel-processing", "angels-nickel-smelting-1")
+    OV.hide_recipe("bob-nickel-plate")
   end
 
   if angelsmods.trigger.smelting_products["nickel"].plate then
diff --git a/angelssmelting/prototypes/override/smelting-override-silicon.lua b/angelssmelting/prototypes/override/smelting-override-silicon.lua
index acc844412..1ff5eba46 100644
--- a/angelssmelting/prototypes/override/smelting-override-silicon.lua
+++ b/angelssmelting/prototypes/override/smelting-override-silicon.lua
@@ -105,7 +105,7 @@ if angelsmods.trigger.smelting_products["silicon"].powder then
 
     angelsmods.functions.move_item("silicon-powder", "angels-silicon", "g")
     data.raw.item["silicon-powder"].icon = "__angelssmelting__/graphics/icons/powder-silica.png"
-    data.raw.item["silicon-powder"].icon_size = 32
+    data.raw.item["silicon-powder"].icon_size = 64
     data.raw.item["silicon-powder"].localised_name = {"item-name.powder-silicon"}
     OV.patch_recipes(
       {
diff --git a/angelssmelting/prototypes/override/smelting-override-silver.lua b/angelssmelting/prototypes/override/smelting-override-silver.lua
index e8bb30a72..b5137ecc1 100644
--- a/angelssmelting/prototypes/override/smelting-override-silver.lua
+++ b/angelssmelting/prototypes/override/smelting-override-silver.lua
@@ -24,7 +24,7 @@ if angelsmods.trigger.smelting_products["silver"].ingot then
   if mods['bobplates'] then
     OV.global_replace_item("solid-silver-nitrate", "silver-nitrate")
     angelsmods.functions.add_flag("solid-silver-nitrate", "hidden")
-    OV.disable_recipe({"silver-nitrate"})
+    OV.disable_recipe({"silver-nitrate","silver-from-lead"})
   end
 
   if mods['bobplates'] then
diff --git a/angelssmelting/prototypes/override/smelting-override-stone.lua b/angelssmelting/prototypes/override/smelting-override-stone.lua
index 08fa31ba5..4afb412d9 100644
--- a/angelssmelting/prototypes/override/smelting-override-stone.lua
+++ b/angelssmelting/prototypes/override/smelting-override-stone.lua
@@ -24,19 +24,15 @@ OV.patch_recipes({
   { name = "stone-brick", subgroup = "angels-stone", order = "f[stone-brick]" },
   {
     name = "concrete",
-    icons = {
+    icons = angelsmods.functions.add_number_icon_layer(
       {
-        icon = "__base__/graphics/icons/concrete.png",
-        icon_size = 64
+        {
+          icon = "__base__/graphics/icons/concrete.png",
+          icon_size = 64, icon_mipmaps = 4,
+          scale = 0.5
+        }
       },
-      {
-        icon = "__angelsrefining__/graphics/icons/num_1.png",
-        tint = angelsmods.smelting.number_tint,
-        scale = 0.32,
-        shift = {-12, -12},
-      }
-    },
-    icon_size = 32,
+      1, angelsmods.smelting.number_tint),
     subgroup = "angels-stone-casting",
     order = "h[concrete]-a" },
   { name = "hazard-concrete", subgroup = "angels-stone-casting", order = "h[concrete]-c" },
diff --git a/angelssmelting/prototypes/override/smelting-override-tin.lua b/angelssmelting/prototypes/override/smelting-override-tin.lua
index aa8958cc6..54872c750 100644
--- a/angelssmelting/prototypes/override/smelting-override-tin.lua
+++ b/angelssmelting/prototypes/override/smelting-override-tin.lua
@@ -31,6 +31,9 @@ if angelsmods.trigger.smelting_products["tin"].ingot then
       data.raw.technology["angels-tin-smelting-1"][property] = util.table.deepcopy(data.raw.technology["angels-tin-smelting-2"][property])
     end
   end
+  if mods["bobelectronics"] and mods["bobplates"] then --this is the minimum combo to make insulated wire to use tinned wire
+    OV.add_prereq("electronics","angels-tin-smelting-1")
+  end
 else
   angelsmods.functions.add_flag("processed-tin", "hidden")
   angelsmods.functions.add_flag("pellet-tin", "hidden")
@@ -71,6 +74,7 @@ if angelsmods.trigger.smelting_products["tin"].plate then
           energy_required = 10.5,
           normal = {
             enabled = false,
+            hidden = true,
             ingredients = {
               {name = "tin-ore", type = "item", amount = "+3"}
             },
@@ -80,6 +84,7 @@ if angelsmods.trigger.smelting_products["tin"].plate then
           },
           expensive = {
             enabled = false,
+            hidden = true,
             ingredients = {
               {"!!"},
               {name = "tin-ore", type = "item", amount = 5 * intermediatemulti}
@@ -135,6 +140,10 @@ if angelsmods.trigger.smelting_products["tin"].wire then
         }
       )
     end
+    if mods["bobelectronics"] then
+      OV.add_unlock("electronics","basic-tinned-copper-wire")
+      OV.remove_prereq("electronics","angels-tin-smelting-1")
+    end
   end
 else
   angelsmods.functions.add_flag("angels-wire-tin", "hidden")
diff --git a/angelssmelting/prototypes/override/smelting-override-tungsten.lua b/angelssmelting/prototypes/override/smelting-override-tungsten.lua
index b983bb0b7..c2a0b4c40 100644
--- a/angelssmelting/prototypes/override/smelting-override-tungsten.lua
+++ b/angelssmelting/prototypes/override/smelting-override-tungsten.lua
@@ -68,37 +68,29 @@ if angelsmods.trigger.smelting_products["tungsten"].plate then
         name = "tungsten-carbide",
         subgroup = "angels-tungsten-casting",
         order = "k[tungsten-carbide]-a",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png",
-            icon_size = 64,
+            {
+              icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png",
+              icon_size = 64, icon_mipmaps = 1,
+              scale = 0.5
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_1.png",
-            tint = angelsmods.smelting.number_tint,
-            scale = 0.32,
-            shift = {-12, -12},
-            icon_size = 32
-          }
-        }
+          1, angelsmods.smelting.number_tint),
       },
       {
         name = "tungsten-carbide-2",
         subgroup = "angels-tungsten-casting",
         order = "k[tungsten-carbide]-b",
-        icons = {
+        icons = angelsmods.functions.add_number_icon_layer(
           {
-            icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png",
-            icon_size = 64,
+            {
+              icon = "__bobplates__/graphics/icons/plate/tungsten-carbide-plate.png",
+              icon_size = 64, icon_mipmaps = 1,
+              scale = 0.5
+            }
           },
-          {
-            icon = "__angelsrefining__/graphics/icons/num_2.png",
-            tint = angelsmods.smelting.number_tint,
-            scale = 0.32,
-            shift = {-12, -12},
-            icon_size = 32
-          }
-        }
+          2, angelsmods.smelting.number_tint),
       },
     })
   end
@@ -112,3 +104,19 @@ else
   OV.disable_recipe({"casting-powder-tungsten-1", "casting-powder-tungsten-2"})
   OV.disable_recipe({"angels-plate-tungsten"})
 end
+--hide all if not used
+if (not angelsmods.trigger.smelting_products["tungsten"].plate) and (not angelsmods.trigger.smelting_products["tungsten"].powder) then
+  OV.hide_recipe(
+    {
+      "tungsten-ore-processing",
+      "tungsten-processed-processing",
+      "tungsten-ore-smelting",
+      "liquid-tungstic-acid-smelting",
+      "pellet-tungsten-smelting",
+      "solid-tungsten-oxide-smelting",
+      "processed-tungsten-smelting",
+      "gas-tungsten-hexafluoride-smelting",
+      "solid-ammonium-paratungstate-smelting"
+    }
+  )
+end
\ No newline at end of file
diff --git a/angelssmelting/prototypes/recipes/smelting-iron.lua b/angelssmelting/prototypes/recipes/smelting-iron.lua
index fcdabf0db..3f7edf93b 100644
--- a/angelssmelting/prototypes/recipes/smelting-iron.lua
+++ b/angelssmelting/prototypes/recipes/smelting-iron.lua
@@ -438,11 +438,11 @@ data:extend(
         {type = "item", name = "angels-plate-iron", amount = 2}
       },
       results = {
-        {type = "item", name = "angels-rod-iron", amount = 1}
+        {type = "item", name = "iron-stick", amount = 1}
       },
       allow_decomposition = false,
       icons = angelsmods.functions.add_icon_layer(
-        angelsmods.functions.get_object_icons("angels-rod-iron"),
+        angelsmods.functions.get_object_icons("iron-stick"),
         angelsmods.functions.get_object_icons("angels-plate-iron"),
         {-10, -10}, 0.4375),
       order = "m[angels-rod-iron]-a"
@@ -459,10 +459,10 @@ data:extend(
         {type = "item", name = "angels-rod-stack-iron", amount = 1}
       },
       results = {
-        {type = "item", name = "angels-rod-iron", amount = 4}
+        {type = "item", name = "iron-stick", amount = 4}
       },
       icons = angelsmods.functions.add_icon_layer(
-        angelsmods.functions.get_object_icons("angels-rod-iron"),
+        angelsmods.functions.get_object_icons("iron-stick"),
         angelsmods.functions.get_object_icons("angels-rod-stack-iron"),
         {-10, -10}, 0.4375),
       order = "m[angels-rod-iron]-b"
diff --git a/angelssmelting/prototypes/recipes/smelting-manganese.lua b/angelssmelting/prototypes/recipes/smelting-manganese.lua
index 78ccbcc2c..8fb3d841b 100644
--- a/angelssmelting/prototypes/recipes/smelting-manganese.lua
+++ b/angelssmelting/prototypes/recipes/smelting-manganese.lua
@@ -38,7 +38,7 @@ data:extend(
     {
       type = "recipe",
       name = "manganese-processed-processing-alt",
-      category = "ore-processing",
+      category = "chemical-smelting",
       subgroup = "angels-manganese",
       energy_required = 2,
       enabled = false,
diff --git a/angelssmelting/prototypes/recipes/smelting-support.lua b/angelssmelting/prototypes/recipes/smelting-support.lua
index c8c73e944..a202f94a8 100644
--- a/angelssmelting/prototypes/recipes/smelting-support.lua
+++ b/angelssmelting/prototypes/recipes/smelting-support.lua
@@ -114,19 +114,9 @@ data:extend(
         {type = "fluid", name = "steam", amount = 50, temperature = 175}
       },
       --main_product= "liquid-coolant-clean",
-      icons =
-      {
-        {
-          icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_3.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("liquid-coolant-used"),
+        3, angelsmods.refining.number_tint),
       order = "h"
     },
     {
@@ -153,19 +143,9 @@ data:extend(
         {type = "fluid", name = "steam", amount = 50, temperature = 150}
       },
       --main_product= "liquid-coolant-clean",
-      icons =
-      {
-        {
-          icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("liquid-coolant-used"),
+        2, angelsmods.refining.number_tint),
       order = "g"
     },
     {
@@ -192,19 +172,9 @@ data:extend(
         {type = "fluid", name = "steam", amount = 50, temperature = 125}
       },
       --main_product= "liquid-coolant-clean",
-      icons =
-      {
-        {
-          icon = "__angelssmelting__/graphics/icons/liquid-coolant-used.png"
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.refining.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+      icons = angelsmods.functions.add_number_icon_layer(
+        angelsmods.functions.get_object_icons("liquid-coolant-used"),
+        1, angelsmods.refining.number_tint),
       order = "f"
     },
     --MOLDS
@@ -288,24 +258,20 @@ data:extend(
         {type = "item", name = "slag", amount = 1}
       },
       main_product = "mold-non-expendable",
-      icons =
-      {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png"
+          {
+            icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png",
+            icon_size = 32, icon_mipmaps = 1
+          },
+          {
+            icon = "__angelssmelting__/graphics/icons/motor-casing-0.png",
+            icon_size = 32, icon_mipmaps = 1,
+            scale = 0.4375,
+            shift = {10, -10}
+          }
         },
-        {
-          icon = "__angelssmelting__/graphics/icons/motor-casing-0.png",
-          scale = 0.4375,
-          shift = {10, -10}
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_1.png",
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        1, angelsmods.smelting.number_tint),
       order = "c[mold-non-expendable]-a[creation]",
       stack_size = 200
     },
@@ -326,25 +292,20 @@ data:extend(
         {type = "item", name = "mold-non-expendable", amount = 1, probability = 0.90, catalyst_amount = 1},
         {type = "fluid", name = "water-red-waste", amount = 20}
       },
-      icons =
-      {
+      icons = angelsmods.functions.add_number_icon_layer(
         {
-          icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png"
+          {
+            icon = "__angelssmelting__/graphics/icons/non-expendable-mold.png",
+            icon_size = 32, icon_mipmaps = 1
+          },
+          {
+            icon = "__angelspetrochem__/graphics/icons/molecules/nitric-acid.png",
+            icon_size = 72,
+            scale = 32/72 * 0.4375,
+            shift = {10, -10}
+          }
         },
-        {
-          icon = "__angelspetrochem__/graphics/icons/molecules/nitric-acid.png",
-          icon_size = 72,
-          scale = 32/72 * 0.4375,
-          shift = {10, -10}
-        },
-        {
-          icon = "__angelsrefining__/graphics/icons/num_2.png",
-          tint = angelsmods.smelting.number_tint,
-          scale = 0.32,
-          shift = {-12, -12}
-        }
-      },
-      icon_size = 32,
+        2, angelsmods.smelting.number_tint),
       order = "c[mold-non-expendable]-b[cleaning]"
     }
   }
diff --git a/angelssmelting/prototypes/recipes/smelting-titanium.lua b/angelssmelting/prototypes/recipes/smelting-titanium.lua
index 10657bce8..bf7a0628a 100644
--- a/angelssmelting/prototypes/recipes/smelting-titanium.lua
+++ b/angelssmelting/prototypes/recipes/smelting-titanium.lua
@@ -82,7 +82,7 @@ data:extend(
           {
             {"__angelssmelting__/graphics/icons/molecule-titanium-tetrachloride.png", 72}
           }, "ill"
-        ), 1, angelsmods.smelting.number_tint),
+        ), 2, angelsmods.smelting.number_tint),
       order = "d[liquid-titanium-tetrachloride]-b"
     },
     {
diff --git a/angelssmelting/prototypes/smelting-override-global.lua b/angelssmelting/prototypes/smelting-override-global.lua
index 2a6995084..19a3f5d4d 100644
--- a/angelssmelting/prototypes/smelting-override-global.lua
+++ b/angelssmelting/prototypes/smelting-override-global.lua
@@ -21,19 +21,19 @@ data.raw["item"]["copper-cable"].icon_size = 32
 data.raw["item"]["copper-cable"].icon_mipmaps = 1
 data.raw["item"]["copper-cable"].subgroup = "angels-copper-casting"
 data.raw["item"]["copper-cable"].order = "k"
-angelsmods.functions.OV.global_replace_icon(
+OV.global_replace_icon(
   "__base__/graphics/icons/plate/iron-plate.png",
   "__angelssmelting__/graphics/icons/plate-iron.png"
 )
-angelsmods.functions.OV.global_replace_icon(
+OV.global_replace_icon(
   "__base__/graphics/icons/plate/steel-plate.png",
   "__angelssmelting__/graphics/icons/plate-steel.png"
 )
-angelsmods.functions.OV.global_replace_icon(
+OV.global_replace_icon(
   "__base__/graphics/icons/plate/copper-plate.png",
   "__angelssmelting__/graphics/icons/plate-copper.png"
 )
-angelsmods.functions.OV.global_replace_icon(
+OV.global_replace_icon(
   "__base__/graphics/icons/plate/copper-cable.png",
   "__angelssmelting__/graphics/icons/wire-copper.png"
 )
@@ -100,8 +100,8 @@ if bobmods and bobmods.plates then
   data.raw["item"]["powdered-tungsten"].icon = "__angelssmelting__/graphics/icons/powder-tungsten.png"
   data.raw["item"]["powdered-tungsten"].subgroup = "angels-tungsten"
   data.raw["item"]["powdered-tungsten"].order = "h"
-  data.raw["item"]["powdered-tungsten"].icon_size = 32
-  data.raw["item"]["powdered-tungsten"].icon_mipmaps = 1
+  data.raw["item"]["powdered-tungsten"].icon_size = 64
+  data.raw["item"]["powdered-tungsten"].icon_mipmaps = 4
   data.raw["item"]["cobalt-oxide"].icon = "__angelssmelting__/graphics/icons/solid-cobalt-oxide.png"
   data.raw["item"]["cobalt-oxide"].subgroup = "angels-cobalt"
   data.raw["item"]["cobalt-oxide"].order = "e"
@@ -175,17 +175,39 @@ if bobmods and bobmods.plates then
     data.raw["item"]["solder"].icon_size = 32
     data.raw["item"]["solder"].icon_mipmaps = 1
 
-    angelsmods.functions.OV.global_replace_icon(
+    OV.global_replace_icon(
       "__bobelectronics__/graphics/icons/tinned-copper-cable.png",
       "__angelssmelting__/graphics/icons/wire-tin.png"
     )
-    angelsmods.functions.OV.global_replace_icon(
+    OV.global_replace_icon(
       "__bobelectronics__/graphics/icons/gilded-copper-cable.png",
       "__angelssmelting__/graphics/icons/wire-gold.png"
     )
-    angelsmods.functions.OV.global_replace_icon(
+    OV.global_replace_icon(
       "__bobelectronics__/graphics/icons/solder.png",
       "__angelssmelting__/graphics/icons/solder.png"
     )
   end
 end
+if mods["bobelectronics"] then
+  --add steel pre-reqs to things that formerly used electronics to req steel
+  --[[for _,tech in pairs(
+    {
+      "radars",
+      "bob-drills-1",
+      "bob-area-drills-1",
+      "bob-repair-pack-2",
+      "automation-2",
+      "solar-energy",
+      "pumpjack",
+      "water-washing-1",
+      "fluid-generator-1"
+    }
+  ) do
+    OV.add_prereq(tech,"steel-processing")
+  end]]
+  if mods["bobpower"] then
+    OV.add_prereq("fluid-generator-1","angels-bronze-smelting-1")
+  end
+end
+OV.add_prereq("electric-energy-distribution-1","steel-processing")
diff --git a/angelssmelting/prototypes/technology/smelting-alloy-steel.lua b/angelssmelting/prototypes/technology/smelting-alloy-steel.lua
index 11f9d53ff..290a48122 100644
--- a/angelssmelting/prototypes/technology/smelting-alloy-steel.lua
+++ b/angelssmelting/prototypes/technology/smelting-alloy-steel.lua
@@ -141,4 +141,4 @@ data:extend(
       order = "c-a"
     }
   }
-)
+)
\ No newline at end of file
diff --git a/angelssmelting/prototypes/technology/smelting-tin.lua b/angelssmelting/prototypes/technology/smelting-tin.lua
index 9c1cafe0a..b8e5fd786 100644
--- a/angelssmelting/prototypes/technology/smelting-tin.lua
+++ b/angelssmelting/prototypes/technology/smelting-tin.lua
@@ -25,10 +25,10 @@ data:extend(
           type = "unlock-recipe",
           recipe = "angels-plate-tin"
         },
-        {
+        --[[{ --moved to electronics
           type = "unlock-recipe",
           recipe = "basic-tinned-copper-wire"
-        }
+        }]]
       },
       unit = {
         count = 100,
diff --git a/build.py b/build_angelmods.py
similarity index 100%
rename from build.py
rename to build_angelmods.py
diff --git a/build.sh b/build_angelmods.sh
old mode 100755
new mode 100644
similarity index 100%
rename from build.sh
rename to build_angelmods.sh
diff --git a/build_bobmods.py b/build_bobmods.py
new file mode 100644
index 000000000..34487808f
--- /dev/null
+++ b/build_bobmods.py
@@ -0,0 +1,166 @@
+import os, shutil, sys, getopt
+import urllib.request
+import json
+
+class ModDownloader:
+    def __init__(self, modName):
+        self.factorioFolderDir = None
+
+        opts, args = getopt.getopt(sys.argv[1:], ":m:", ['dir='])
+        for opt, arg in opts:
+            if opt in ('-m', '--factoriodir'):
+                self.factorioFolderDir = os.path.realpath(arg.strip())
+
+        if self.factorioFolderDir == None:
+            self.factorioFolderDir = "{0}/Factorio/".format(os.getenv('APPDATA'))
+        self.modFolderDir = "{0}mods/".format(self.factorioFolderDir)
+
+        self.modData = self.__getModAPI(modName)
+        self.userData = self.__getUserData()
+
+    def __str__(self):
+        return json.dumps(self.modData, indent=4, sort_keys=True)
+
+    def getReleases(self):
+        return self.modData["releases"]
+
+    def getLatestModVersion(self, factorioVersion = None):
+        fixedFactorioVersion = False if factorioVersion is None else True
+        
+        modReleases = self.getReleases()
+
+        latestReleaseFactorioVersion = factorioVersion
+        latestReleaseModVersion = None
+
+        for release in modReleases:
+            # compare factorio release version
+            releaseFactorioVersion = release["info_json"]["factorio_version"]
+            if not self.__compareVersion(latestReleaseFactorioVersion, releaseFactorioVersion):
+                continue # release is for an older version of factorio
+            if fixedFactorioVersion:
+                if not self.__compareVersion(releaseFactorioVersion, factorioVersion):
+                    continue # release is for a newer version of factorio
+            else:
+                if not self.__compareVersion(releaseFactorioVersion, latestReleaseFactorioVersion):
+                    # newer factorioVersion detected
+                    latestReleaseFactorioVersion = releaseFactorioVersion
+                    latestReleaseModVersion = release["version"]
+                    continue # no need to compare further
+
+            # compare mod release version
+            releaseModVersion = release["version"]
+            if not self.__compareVersion(latestReleaseModVersion, releaseModVersion):
+                continue # release is for an older version of the mod
+            if self.__compareVersion(releaseModVersion, latestReleaseModVersion):
+                continue # release is for the same version of the mod
+            latestReleaseModVersion = releaseModVersion
+
+        if latestReleaseModVersion is None:
+            latestReleaseFactorioVersion = None
+        return [latestReleaseFactorioVersion, latestReleaseModVersion]
+
+    def downloadModVersion(self, factorioVersion = None, modVersion = None):
+        print("Updating '{0}'".format(self.modData["name"]))
+
+        # delete any local versions
+        self.__deleteAllVersions(self.modData["name"])
+
+        # download the most suitable release
+        if factorioVersion is None:
+            modVersion = None
+        if modVersion is None:
+            factorioVersion, modVersion = self.getLatestModVersion(factorioVersion)
+        modRelease = self.__getReleaseInfo(factorioVersion, modVersion)
+        print("    Creating '{0}'".format(modRelease["file_name"]))
+        modDownloadUrl = 'http://mods.factorio.com{0}?username={1}&token={2}'.format(modRelease["download_url"], self.userData[0], self.userData[1])
+        modDownloadRequest = urllib.request.Request(modDownloadUrl)
+        with urllib.request.urlopen(modDownloadRequest) as downloadFile:
+            with open('{0}{1}'.format(self.modFolderDir, modRelease["file_name"]), 'wb+') as zipFile:
+                zipFile.write(downloadFile.read())
+
+    def download(self):
+        return self.downloadModVersion()
+
+    def __getUserData(self):
+        with open('{}/player-data.json'.format(self.factorioFolderDir)) as playerDataFile:
+            playerData = json.load(playerDataFile)
+        return [playerData["service-username"], playerData["service-token"]]
+
+    def __getModAPI(self, modName):
+        apiQuerry = urllib.request.Request('http://mods.factorio.com/api/mods/{0}'.format(modName))
+        try:
+            apiRequest = urllib.request.urlopen(apiQuerry).read()
+            apiContent = json.loads(apiRequest.decode('utf-8'))
+            apiMessage = apiContent["message"]
+        except urllib.request.HTTPError:
+            raise NameError("Could not find a mod named '{0}'.".format(modName))
+        except KeyError:
+            apiMessage = None
+        if apiMessage == "Mod not found":
+            raise NameError("Could not find a mod named '{0}'.".format(modName))
+        return apiContent
+
+    def __compareVersion(self, version1, version2):
+        """ Returns true if version 2 >= version 1 """
+        # test version validity
+        if version1 is None:
+            return True
+        if version2 is None:
+            return False
+
+        # prematurely test equality
+        if version1 == version2:
+            return True
+
+        # compare versions graduately
+        version1 = version1.split('.')
+        version2 = version2.split('.')
+        for version in range(0, len(version1)):
+            if version2[version] < version1[version]:
+                return False
+            if version2[version] > version1[version]:
+                return True
+
+    def __getReleaseInfo(self, factorioVersion, modVersion):
+        modReleases = self.getReleases()
+        for release in modReleases:
+            if factorioVersion == release["info_json"]["factorio_version"] and\
+               modVersion      == release["version"]:
+               return release
+
+    def __deleteAllVersions(self, modName, deleteZip=True):
+        # deleting folders
+        folders = [folderName for folderName in next(os.walk(self.modFolderDir))[1] if folderName.find(modName) >= 0]
+        for folder in folders:
+            print("    Removing '{0}/'".format(folder))
+            shutil.rmtree(self.modFolderDir + folder)
+
+        # deleting zip folders
+        folders = [folderName for folderName in os.listdir(self.modFolderDir) if deleteZip and folderName.find(modName) >= 0 ]
+        for folder in folders:
+            print("    Removing '{0}'".format(folder))
+            os.remove(self.modFolderDir + folder)
+
+if __name__ == "__main__":
+    bobmods = {
+        "bobassembly"        : True,
+        "bobclasses"         : True,
+        "bobelectronics"     : True,
+        "bobenemies"         : True,
+        "bobequipment"       : True,
+        "bobgreenhouse"      : True,
+        "bobinserters"       : True,
+        "boblibrary"         : True,
+        "boblogistics"       : True,
+        "bobmining"          : True,
+        "bobmodules"         : True,
+        "bobores"            : True,
+        "bobplates"          : True,
+        "bobpower"           : True,
+        "bobrevamp"          : True,
+        "bobtech"            : True,
+        "bobvehicleequipment": True,
+        "bobwarfare"         : True
+    }
+    for bobmod in bobmods:
+            ModDownloader(bobmod).download()
\ No newline at end of file