diff --git a/README.md b/README.md
index 04a32df..3c2ada3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-**This is an unofficial update to Factorio 2.0 and it stays until Brevven takes over again.**
-
-**Compatibility with Space Age is explicitly excluded until someone integrates it nicely.**
-
 # Noble Metals
 
 Adds gold, silver, platinum and palladium to the game. Reworks processing units and much more.
@@ -30,4 +26,4 @@ Note, when silver from this mod is used with [Lead](https://mods.factorio.com/mo
 - [JonathanF](https://mods.factorio.com/user/JonathanF)
 - [Berkelear](https://mods.factorio.com/user/Berkelear)
 - [Elanu](https://mods.factorio.com/user/elanu)
-- [aeosynth](https://github.com/aeosynth/factorio-mods)
\ No newline at end of file
+- [aeosynth](https://github.com/aeosynth/factorio-mods)
diff --git a/bzgold2/changelog.txt b/bzgold2/changelog.txt
index 4d308d3..db6a1b0 100644
--- a/bzgold2/changelog.txt
+++ b/bzgold2/changelog.txt
@@ -1,9 +1,4 @@
 ---------------------------------------------------------------------------------------------------
-Version: 2.0.1
-Date: 21.10.2025
-  Changes:
-    - Switch to bz mods forks
----------------------------------------------------------------------------------------------------
 Version: 2.0.0
 Date: 19.10.2025
   Changes:
diff --git a/bzgold2/info.json b/bzgold2/info.json
index 9cbe7ad..99afae3 100644
--- a/bzgold2/info.json
+++ b/bzgold2/info.json
@@ -1,6 +1,6 @@
 {
   "name": "bzgold2",
-  "version": "2.0.1",
+  "version": "2.0.0",
   "factorio_version": "2.0",
   "title": "Noble Metals",
   "description": "Adds silver, gold, platinum, palladium and more to the base game. Reworks processing units.",
@@ -9,12 +9,12 @@
   "dependencies": [
     "base >= 2.0.0",
     "? bzfoundry2 >= 2.0.0",
-    "? bztitanium2 >= 2.0.27",
-    "? bzlead2 >= 2.0.29",
-    "? bzzirconium2 >= 2.1.14",
-    "? bztungsten2 >= 2.0.0",
-    "? bzcarbon2 >= 2.0.22",
-    "? bztin2 >= 2.1.16",
+    "? bztitanium >= 2.0.26",
+    "? bzlead >= 2.0.28",
+    "? bzzirconium >= 2.1.13",
+    "? bztungsten >= 0.6.0",
+    "? bzcarbon >= 2.0.21",
+    "? bztin >= 2.1.15",
     "? bzgas2",
     "? bzchlorine2",
     "? 248k-Redux >= 0.1.22",
diff --git a/bzgold2/migrations/bzgold.0.0.15.json b/bzgold2/migrations/bzgold.0.0.15.json
new file mode 100644
index 0000000..882479a
--- /dev/null
+++ b/bzgold2/migrations/bzgold.0.0.15.json
@@ -0,0 +1,6 @@
+{
+  "item":
+  [
+    ["processing-electronics", "cpu"]
+  ]
+}
diff --git a/bzgold2/migrations/bzgold.0.0.6.json b/bzgold2/migrations/bzgold.0.0.6.json
new file mode 100644
index 0000000..cd28c21
--- /dev/null
+++ b/bzgold2/migrations/bzgold.0.0.6.json
@@ -0,0 +1,7 @@
+{
+  "item":
+  [
+    ["fu_materials_gold_ingot", "gold-ingot"]
+  ]
+}
+
diff --git a/bzgold2/prototypes/alchemy.lua b/bzgold2/prototypes/alchemy.lua
index 56f22cb..facd441 100644
--- a/bzgold2/prototypes/alchemy.lua
+++ b/bzgold2/prototypes/alchemy.lua
@@ -19,7 +19,7 @@ if util.me.alchemy() then
           icon_size = 128,
         },
         {
-          icon = "__bzlead2__/graphics/icons/lead-plate.png",
+          icon = "__bzlead__/graphics/icons/lead-plate.png",
           icon_size = 64, icon_mipmaps = 4, shift = {-8,-8}, scale=0.25,
         },
       },
@@ -33,7 +33,7 @@ if util.me.alchemy() then
           icon_size = 256,
         },
         {
-          icon = "__bzlead2__/graphics/icons/lead-plate.png",
+          icon = "__bzlead__/graphics/icons/lead-plate.png",
           icon_size = 64, icon_mipmaps = 4, shift = {-48,-48}, scale=2,
         },
       },
diff --git a/bzgold2/prototypes/catalyst.lua b/bzgold2/prototypes/catalyst.lua
index 2ae5446..14e5cb8 100644
--- a/bzgold2/prototypes/catalyst.lua
+++ b/bzgold2/prototypes/catalyst.lua
@@ -50,7 +50,7 @@ if util.me.catalysis() then
 
   local base = "stone"
   if mods.bzaluminum2 then base = "alumina"
-  elseif mods["bzsilicon2"] then base = "silica"
+  elseif mods.bzsilicon then base = "silica"
   end
 
   local fluid = "sulfuric-acid"
diff --git a/bzgold2/prototypes/cpu.lua b/bzgold2/prototypes/cpu.lua
index 8cb4611..933764c 100644
--- a/bzgold2/prototypes/cpu.lua
+++ b/bzgold2/prototypes/cpu.lua
@@ -1,7 +1,7 @@
 local util = require("data-util");
 
 local silicon = {type="item", name="stone", amount=30}
-if mods["bzsilicon2"] then
+if mods.bzsilicon then
   silicon = data.raw.item["silicon-wafer"] and {type="item", name="silicon-wafer", amount=30} or {type="item", name=mods.Krastorio2 and "kr-silicon" or "silicon", amount=15}
 elseif mods.Krastorio2 then
   silicon = data.raw.item["silicon-wafer"] and {type="item", name="silicon-wafer", amount=30} or {type="item", name="kr-silicon", amount=15}
diff --git a/bzgold2/prototypes/mlcc.lua b/bzgold2/prototypes/mlcc.lua
index 22cc42e..2d5b111 100644
--- a/bzgold2/prototypes/mlcc.lua
+++ b/bzgold2/prototypes/mlcc.lua
@@ -3,13 +3,13 @@ local util = require("data-util");
 if util.me.palladium() then
 
 local ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="stone", amount=2}}
-if mods["bzzirconium2"] and mods.bzaluminum2 then
+if mods.bzzirconium and mods.bzaluminum2 then
   ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="zirconia", amount=1}, {type="item", name="alumina", amount=1}}
-elseif mods["bzzirconium2"] then
+elseif mods.bzzirconium then
   ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="zirconia", amount=2}}
 elseif mods.bzaluminum2 then
   ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="alumina", amount=2}}
-elseif mods["bzsilicon2"] then
+elseif mods.bzsilicon then
   ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="silica", amount=3}}
 elseif mods.Krastorio2 then
   ingredients = {{type="item", name="palladium-ingot", amount=1}, {type="item", name="kr-sand", amount=2}}
diff --git a/bzgold2/prototypes/palladium.lua b/bzgold2/prototypes/palladium.lua
index 25ba2f0..9f6d77e 100644
--- a/bzgold2/prototypes/palladium.lua
+++ b/bzgold2/prototypes/palladium.lua
@@ -67,7 +67,7 @@ data:extend({
     order = "b-b",
   },
 })
-if mods["bztitanium2"] then
+if mods.bztitanium then
 data:extend({
   {
     type = "item",
diff --git a/bzgold2/prototypes/recipe-updates.lua b/bzgold2/prototypes/recipe-updates.lua
index 690c811..89a647f 100644
--- a/bzgold2/prototypes/recipe-updates.lua
+++ b/bzgold2/prototypes/recipe-updates.lua
@@ -7,7 +7,7 @@ if mods.Krastorio2 then
   util.add_product("enriched-copper", {type="item", name="silver-ore", amount=1})
 end
 
-if mods["bztitanium2"] then
+if mods.bztitanium then
   util.replace_ingredient("heat-exchanger", util.titanium_plate, "titanium-palladium-flange")
   util.replace_some_ingredient("steam-turbine", util.titanium_plate, 10, "titanium-palladium-flange", 10)
   util.replace_some_ingredient("kr-advanced-steam-turbine", util.titanium_plate, 10, "titanium-palladium-flange", 10)
diff --git a/bzgold2/prototypes/silver.lua b/bzgold2/prototypes/silver.lua
index 588c7aa..2096102 100644
--- a/bzgold2/prototypes/silver.lua
+++ b/bzgold2/prototypes/silver.lua
@@ -136,7 +136,7 @@ if util.me.silver() then
 
   -- replace lead byproducts, set copper byproducts
   util.set_main_product("copper-plate", "copper-plate")
-  if mods["bzlead2"] and util.me.lead_byproduct() then
+  if mods.bzlead and util.me.lead_byproduct() then
     util.replace_product("lead-plate", "copper-ore", "silver-ore")
     util.replace_product("enriched-lead", "copper-ore", "silver-ore")
 
diff --git a/bzgold2/prototypes/temperature-sensor.lua b/bzgold2/prototypes/temperature-sensor.lua
index a5e3267..5ae6e9e 100644
--- a/bzgold2/prototypes/temperature-sensor.lua
+++ b/bzgold2/prototypes/temperature-sensor.lua
@@ -3,11 +3,11 @@ local util = require("data-util");
 if util.me.platinum() then
 
 local base = "stone"
-if mods["bzzirconium2"] then
+if mods.bzzirconium then
   base = "zirconia"
 elseif mods.bzaluminum2 then
   base = "alumina"
-elseif mods["bzsilicon2"] then
+elseif mods.bzsilicon then
   base = "silica"
 elseif mods.Krastorio2 then
   base = "kr-glass"
diff --git a/bzgold2/settings.lua b/bzgold2/settings.lua
index 421a618..f970126 100644
--- a/bzgold2/settings.lua
+++ b/bzgold2/settings.lua
@@ -50,7 +50,7 @@ data:extend({
     order = "d",
   },
 })
-if mods["bzlead2"] then
+if mods.bzlead then
   data:extend({
     {
       type = "bool-setting",