diff --git a/Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua b/Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua
index 75d0a83..dfc8ecf 100644
--- a/Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua
+++ b/Clowns-AngelBob-Nuclear/prototypes/items/water-treatment.lua
@@ -2,7 +2,7 @@ data:extend(
 {
 	--[[{
 		type = "fluid",
-		name = "water-phosphoric-waste",
+		name = "angels-water-phosphoric-waste",
 		icon = "__Clowns-Processing__/graphics/icons/water-radioactive-waste.png",
 		icon_size = 32,
 		default_temperature = 25,
@@ -15,7 +15,7 @@ data:extend(
 	},
 	{
 		type = "fluid",
-		name = "water-uranyl-waste",
+		name = "angels-water-uranyl-waste",
 		icon = "__Clowns-Processing__/graphics/icons/water-radioactive-waste.png",
 		icon_size = 32,
 		default_temperature = 25,
@@ -28,7 +28,7 @@ data:extend(
 	},
 	{
 		type = "fluid",
-		name = "water-thoric-waste",
+		name = "angels-water-thoric-waste",
 		icon = "__Clowns-Processing__/graphics/icons/water-radioactive-waste.png",
 		icon_size = 32,
 		default_temperature = 25,
@@ -41,7 +41,7 @@ data:extend(
 	},]]
 	{
 		type = "fluid",
-		name = "water-radioactive-waste",
+		name = "angels-water-radioactive-waste",
 		icon = "__Clowns-AngelBob-Nuclear__/graphics/icons/water-radioactive-waste.png",
 		icon_size = 32,
 		default_temperature = 25,
diff --git a/Clowns-AngelBob-Nuclear/prototypes/overrides.lua b/Clowns-AngelBob-Nuclear/prototypes/overrides.lua
index 2d07b8d..ab3b53e 100644
--- a/Clowns-AngelBob-Nuclear/prototypes/overrides.lua
+++ b/Clowns-AngelBob-Nuclear/prototypes/overrides.lua
@@ -14,7 +14,7 @@ else
 	angelsmods.functions.OV.add_unlock("nuclear-fuel-reprocessing-2","advanced-nuclear-fuel-reprocessing-2")
   angelsmods.functions.OV.add_unlock("nuclear-fuel-reprocessing-2","advanced-nuclear-fuel-reprocessing-b")
 end
-angelsmods.functions.make_void("water-radioactive-waste", "water")
+angelsmods.functions.make_void("angels-water-radioactive-waste", "water")
 if mods["angelsindustries"] then
   --update nuclear cells
   clowns.functions.replace_ing("angels-advanced-mixed-oxide-reprocessing","uranium-235","35pc-uranium","res")
diff --git a/Clowns-AngelBob-Nuclear/prototypes/recipes/clowns-centrifuging.lua b/Clowns-AngelBob-Nuclear/prototypes/recipes/clowns-centrifuging.lua
index 96c1d1e..da277bd 100644
--- a/Clowns-AngelBob-Nuclear/prototypes/recipes/clowns-centrifuging.lua
+++ b/Clowns-AngelBob-Nuclear/prototypes/recipes/clowns-centrifuging.lua
@@ -8,7 +8,7 @@ data:extend(
 		energy_required = energy,
 		enabled = false,
 		category = "centrifuging",
-		ingredients = {{"solid-uranium-hexafluoride", 48}},--decent saving yo
+		ingredients = {{"angels-solid-uranium-hexafluoride", 48}},--decent saving yo
 		icons =
 		{
 			{
diff --git a/Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua b/Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua
index a2c341c..dfa489e 100644
--- a/Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua
+++ b/Clowns-AngelBob-Nuclear/prototypes/recipes/nuclear-reprocessing.lua
@@ -8,7 +8,7 @@ data:extend(
 		category = "chemistry",
 		ingredients =
 		{
-			{type="item", name="depleted-uranium-fuel-cell", amount=5},
+			{type="item", name="used-up-uranium-fuel-cell", amount=5},
 			{type="fluid", name="angels-liquid-nitric-acid", amount=300}--20
 		},
 		icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png", icon_size = 32,}},
@@ -21,7 +21,7 @@ data:extend(
 			{type="item", name="plutonium-239", amount=2},
 			{type="item", name="strontium-90", amount=1},--1
 			{type="item", name="caesium-137", amount=3},--1
-			{type="fluid", name="water-radioactive-waste", amount=300}--100 (matching the waste liq)
+			{type="fluid", name="angels-water-radioactive-waste", amount=300}--100 (matching the waste liq)
 		},
 	},
 	{
@@ -32,7 +32,7 @@ data:extend(
 		category = "chemistry",
 		ingredients =
 		{
-			{type="item", name="depleted-uranium-fuel-cell", amount=5},
+			{type="item", name="used-up-uranium-fuel-cell", amount=5},
 			{type="fluid", name="angels-liquid-nitric-acid", amount=350}--20
 		},
 		icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png", icon_size = 32,}},
@@ -45,7 +45,7 @@ data:extend(
 			{type="item", name="plutonium-239", amount=2},
 			{type="item", name="strontium-90", amount=1},--1
 			{type="item", name="caesium-137", amount=5},--1
-			{type="fluid", name="water-radioactive-waste", amount=350}--100 (matching the waste liq)
+			{type="fluid", name="angels-water-radioactive-waste", amount=350}--100 (matching the waste liq)
 		},
 	},
 	{
@@ -56,7 +56,7 @@ data:extend(
 		category = "chemistry",
 		ingredients =
 		{
-			{type="item", name="depleted-uranium-fuel-cell", amount=5},
+			{type="item", name="used-up-uranium-fuel-cell", amount=5},
 			{type="fluid", name="angels-liquid-nitric-acid", amount=300}--20
 		},
 		icons = {{icon = "__Clowns-Nuclear__/graphics/icons/nuclear-fuel-reprocessing.png",icon_size=32}},
@@ -68,7 +68,7 @@ data:extend(
 			{type="item", name="uranium-238", amount=1}, --slight nerf because of lack of thorium
 			{type="item", name="plutonium-239", amount=1}, --slight nerf because of lack of thorium
 			{type="item", name="protactinium-231", amount=4},--1--3 --slight nerf because of lack of thorium
-			{type="fluid", name="water-radioactive-waste", amount=300}--100 (matching the waste liq)
+			{type="fluid", name="angels-water-radioactive-waste", amount=300}--100 (matching the waste liq)
 		},
 	},
 })
@@ -122,7 +122,7 @@ data:extend(
 			{type="item", name="thorium-232", amount=3},--3 (needs to be less than 19/10)
 			{type="item", name="plutonium-239", amount=3},--1
 			{type="item", name="protactinium-231", amount=15},--1--3
-			{type="fluid", name="water-radioactive-waste", amount=300}--20--60
+			{type="fluid", name="angels-water-radioactive-waste", amount=300}--20--60
 		},
 	},
 	{
@@ -145,7 +145,7 @@ data:extend(
 			{type="item", name="thorium-232", amount=1},
 			{type="item", name="plutonium-239", amount=6},--8
 			{type="item", name="strontium-90", amount=9},
-			{type="fluid", name="water-radioactive-waste", amount=150}
+			{type="fluid", name="angels-water-radioactive-waste", amount=150}
 		},
 	},
 }
diff --git a/Clowns-AngelBob-Nuclear/prototypes/recipes/thorium.lua b/Clowns-AngelBob-Nuclear/prototypes/recipes/thorium.lua
index e9e8e93..a89ddab 100644
--- a/Clowns-AngelBob-Nuclear/prototypes/recipes/thorium.lua
+++ b/Clowns-AngelBob-Nuclear/prototypes/recipes/thorium.lua
@@ -65,17 +65,17 @@ if data.raw.item["thorium-fuel-cell"] then
     {
       type = "recipe",
       name = "thorium-ore-processing",
-      category = "ore-refining-t3-5",
+      category = "angels-ore-refining-t3-5",
       energy_required = 30,
       enabled = false,
       ingredients = {
         {"thorium-ore",10},
-        {type="fluid",name="liquid-hydrofluoric-acid",amount=100}
+        {type="fluid",name="angels-liquid-hydrofluoric-acid",amount=100}
       },
       results = {
         {type="fluid",name="thorium-solution",amount=13},
         {type="fluid",name="steam", amount=90, temperature=650},
-        {"slag",2}
+        {"angels-slag",2}
       },
       main_product = "thorium-solution",
     },
@@ -87,11 +87,11 @@ if data.raw.item["thorium-fuel-cell"] then
       enabled = false,
       ingredients = {
         {type="fluid",name="thorium-solution",amount=26},
-        {type="fluid",name="water-purified",amount=180}
+        {type="fluid",name="angels-water-purified",amount=180}
       },
       results = {
         {"thorium-salt",20},
-        {type="fluid",name="water-greenyellow-waste", amount=200},
+        {type="fluid",name="angels-water-greenyellow-waste", amount=200},
       },
       main_product="thorium-salt",
     },
@@ -103,12 +103,12 @@ if data.raw.item["thorium-fuel-cell"] then
       enabled = false,
       ingredients = {
         {"thorium-salt",13},
-        {type="fluid",name="liquid-naphtha",amount=200}
+        {type="fluid",name="angels-liquid-naphtha",amount=200}
       },
       results = {
         {"thorium-232",9},
-        {type="fluid",name="liquid-naphtha",amount=200},
-        {"slag",4}
+        {type="fluid",name="angels-liquid-naphtha",amount=200},
+        {"angels-slag",4}
       },
       main_product = "thorium-232",
     }
diff --git a/Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua b/Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua
index a6591a0..62e500f 100644
--- a/Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua
+++ b/Clowns-AngelBob-Nuclear/prototypes/recipes/water-treatment.lua
@@ -9,7 +9,7 @@ data:extend(
 		enabled = false,
 		ingredients =
 		{
-			{type="fluid", name="water-radioactive-waste", amount=100}
+			{type="fluid", name="angels-water-radioactive-waste", amount=100}
 		},
 		results=
 		{
diff --git a/Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua b/Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua
index 8260a20..def05d4 100644
--- a/Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua
+++ b/Clowns-AngelBob-Nuclear/prototypes/technology-overrides.lua
@@ -3,10 +3,10 @@ local OV = angelsmods.functions.OV
 --REPLACE URANIUM HEXAFLUORIDE CENTRIFUGING RECIPE
 data.raw.technology["advanced-uranium-processing-1"].effects =
 {
-	{type = "unlock-recipe", recipe = "solid-uranium-hexafluoride"},
-	{type = "unlock-recipe", recipe = "solid-uranium-tetrafluoride"},
-	{type = "unlock-recipe", recipe = "solid-uranium-oxide-1"},
-	{type = "unlock-recipe", recipe = "clowns-centrifuging-20pc-hexafluoride"},
+	{type = "unlock-recipe", recipe = "angels-solid-uranium-hexafluoride"},
+	{type = "unlock-recipe", recipe = "angels-solid-uranium-tetrafluoride"},
+	{type = "unlock-recipe", recipe = "angels-solid-uranium-oxide-1"},
+	{type = "unlock-recipe", recipe = "clowns-centrifuging-20%-hexafluoride"},
 }
 --clobber vanilla and angels nuclear fuel recipes
 if data.raw.technology["angels-nuclear-fuel"] then
diff --git a/Clowns-Extended-Minerals/data-updates.lua b/Clowns-Extended-Minerals/data-updates.lua
index 2be61b9..71d0f11 100644
--- a/Clowns-Extended-Minerals/data-updates.lua
+++ b/Clowns-Extended-Minerals/data-updates.lua
@@ -14,8 +14,7 @@ for i=1,15 do --allow for many options, particularly for the second step (minimu
     end
   end
 end
-angelsmods.trigger.ores["platinum"] = true
-angelsmods.functions.remove_flag("platinum-ore","hidden")
+angelsmods.functions.remove_flag("angels-platinum-ore","hidden")
 --ADD RESOURCE PROCESSING RECIPES TO THE APPROPRIATE TECHNOLOGIES
 
 table.insert(data.raw["technology"]["angels-oil-gas-extraction"].effects, {type = "unlock-recipe", recipe = "clowns-resource2-liquification"})
diff --git a/Clowns-Extended-Minerals/data.lua b/Clowns-Extended-Minerals/data.lua
index c7fc0d1..e3f2340 100644
--- a/Clowns-Extended-Minerals/data.lua
+++ b/Clowns-Extended-Minerals/data.lua
@@ -39,27 +39,27 @@ require("prototypes.omnicrystals.omnicrystal_functions")
 local ore1fluid,ore2fluid,ore3fluid,ore4fluid,ore5fluid,ore6fluid,ore7fluid,ore8fluid,ore9fluid
 
 if mods["angelspetrochem"] and settings.startup["angels-enable-acids"].value then
-	ore1fluid = "liquid-hydrofluoric-acid"
-	ore2fluid = "liquid-sulfuric-acid"
-	ore3fluid = "liquid-nitric-acid"
-	ore4fluid = "liquid-hydrochloric-acid"
-	ore5fluid = "liquid-nitric-acid"
-	ore6fluid = "liquid-sulfuric-acid"
-  ore7fluid = "liquid-hydrofluoric-acid"
-  ore8fluid = "liquid-hydrochloric-acid"
-  ore9fluid = "liquid-phosphoric-acid"
+	ore1fluid = "angels-liquid-hydrofluoric-acid"
+	ore2fluid = "angels-liquid-sulfuric-acid"
+	ore3fluid = "angels-liquid-nitric-acid"
+	ore4fluid = "angels-liquid-hydrochloric-acid"
+	ore5fluid = "angels-liquid-nitric-acid"
+	ore6fluid = "angels-liquid-sulfuric-acid"
+  ore7fluid = "angels-liquid-hydrofluoric-acid"
+  ore8fluid = "angels-liquid-hydrochloric-acid"
+  ore9fluid = "angels-liquid-phosphoric-acid"
 else
-	ore1fluid = "liquid-sulfuric-acid"
-	ore2fluid = "liquid-sulfuric-acid"
-	ore3fluid = "liquid-sulfuric-acid"
-	ore4fluid = "liquid-sulfuric-acid"
-	ore5fluid = "liquid-sulfuric-acid"
-	ore6fluid = "liquid-sulfuric-acid"
-  ore7fluid = "liquid-sulfuric-acid"
-  ore8fluid = "liquid-sulfuric-acid"
-  ore9fluid = "liquid-sulfuric-acid"
+	ore1fluid = "angels-liquid-sulfuric-acid"
+	ore2fluid = "angels-liquid-sulfuric-acid"
+	ore3fluid = "angels-liquid-sulfuric-acid"
+	ore4fluid = "angels-liquid-sulfuric-acid"
+	ore5fluid = "angels-liquid-sulfuric-acid"
+	ore6fluid = "angels-liquid-sulfuric-acid"
+  ore7fluid = "angels-liquid-sulfuric-acid"
+  ore8fluid = "angels-liquid-sulfuric-acid"
+  ore9fluid = "angels-liquid-sulfuric-acid"
 end
-res1fluid = "liquid-phosphoric-acid"
+res1fluid = "angels-liquid-phosphoric-acid"
 res2fluid = "steam"
 
 if mods["omnimatter"] then
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/chunk.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/chunk.png
index b8127e2..074cc21 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/chunk.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/chunk.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/crushed.png
index 97153a9..7f30d38 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/crystal.png
index 7a6b6ae..70db192 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/ore.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/ore.png
index 090e627..8e99526 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/ore.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/pure.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/pure.png
index c64577b..4aed9e4 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/pure.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore1/pure.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/crushed.png
index 636c579..eaca4db 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/crystal.png
index d3a62bf..f24c08a 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/dust.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/dust.png
index 84f9995..2aa4162 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/dust.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/dust.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/powder.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/powder.png
index e98bf55..81ba424 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/powder.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore11/powder.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/crushed.png
index 03348f0..7a14113 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/crystal.png
index fea955a..a20c91d 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/dust.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/dust.png
index 56d5a5f..93b5768 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/dust.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/dust.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/powder.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/powder.png
index f242fdc..b1e49dd 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/powder.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore12/powder.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/crushed.png
index 9c29b8e..31ce8b6 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/crystal.png
index 8a15cca..86ce224 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/dust.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/dust.png
index 011983c..6c98cb0 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/dust.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/dust.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/powder.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/powder.png
index 2f8df83..3e84199 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/powder.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore13/powder.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/crushed.png
index a948270..054f914 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/crystal.png
index 8421e65..2919d54 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/dust.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/dust.png
index 0ce27df..a5aee49 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/dust.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/dust.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/powder.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/powder.png
index 6582f1f..94fc0d1 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/powder.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore14/powder.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/crushed.png
index c99db01..f5740c8 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/crystal.png
index 88c697d..4d23f8c 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/dust.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/dust.png
index df447f7..7bd0fea 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/dust.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/dust.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/powder.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/powder.png
index 54b260c..b985350 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/powder.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/powder.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/sludge.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/sludge.png
index 9300c94..0734701 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/sludge.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore15/sludge.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/chunk.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/chunk.png
index 18e74e9..d70e47a 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/chunk.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/chunk.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/crushed.png
index d163ffa..35373ef 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/crystal.png
index 926cd37..4270552 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/ore.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/ore.png
index c91d0e7..88309d2 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/ore.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/pure.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/pure.png
index 356d177..ed05808 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/pure.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore2/pure.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/chunk.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/chunk.png
index f737c24..08a6397 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/chunk.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/chunk.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/crushed.png
index d6e65b7..1153e5e 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/crystal.png
index ec6b0f6..b3daef0 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/ore.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/ore.png
index a53a4bc..1924b5a 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/ore.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/pure.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/pure.png
index 8773470..817afb8 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/pure.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore3/pure.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/chunk.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/chunk.png
index 9e5163e..ff779a1 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/chunk.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/chunk.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/crushed.png
index b171fa9..b098e6d 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/crystal.png
index 6f99026..c0d73d4 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/ore.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/ore.png
index 2a9e0df..75ca8e0 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/ore.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/pure.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/pure.png
index 4565e3c..3a85981 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/pure.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore4/pure.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/chunk.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/chunk.png
index fbc598e..3dea09e 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/chunk.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/chunk.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/crushed.png
index f273dee..5c5a601 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/crystal.png
index 9b83c78..3f4fdc2 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/ore.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/ore.png
index 239e3ab..6dfde1f 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/ore.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/pure.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/pure.png
index b459de0..16da235 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/pure.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore5/pure.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/chunk.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/chunk.png
index 768fbec..1341818 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/chunk.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/chunk.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/crushed.png
index f716e56..90eb3e9 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/crystal.png
index d4b59d0..e4f3615 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/ore-draft.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/ore-draft.png
index d4dc4c2..b6419f3 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/ore-draft.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/ore-draft.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/ore.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/ore.png
index f490488..cb13ff5 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/ore.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/pure.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/pure.png
index 3125d13..f1eba22 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/pure.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore6/pure.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/chunk.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/chunk.png
index bee6ce5..94dbe14 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/chunk.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/chunk.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/crushed.png
index fe464d6..abdc292 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/crystal.png
index c441b63..e0045f7 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/ore.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/ore.png
index 70493b7..e63e510 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/ore.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/pure.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/pure.png
index 1ab38a7..c9228f5 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/pure.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore7/pure.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/chunk.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/chunk.png
index 4e80634..9a5235f 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/chunk.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/chunk.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/crushed.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/crushed.png
index 02b910c..b8f831b 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/crushed.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/crushed.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/crystal.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/crystal.png
index fd423d9..ce0e60f 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/crystal.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/ore.png b/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/ore.png
index 9935672..c0b5ec7 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/ore.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-ore8/ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-resource1.png b/Clowns-Extended-Minerals/graphics/icons/clowns-resource1.png
index e9a24f3..f415fe7 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-resource1.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-resource1.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/clowns-resource2.png b/Clowns-Extended-Minerals/graphics/icons/clowns-resource2.png
index 4e7858d..d01f584 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/clowns-resource2.png and b/Clowns-Extended-Minerals/graphics/icons/clowns-resource2.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore1-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore1-crystal.png
index 7a6b6ae..70db192 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore1-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore1-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore2-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore2-crystal.png
index 926cd37..3b1a164 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore2-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore2-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore3-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore3-crystal.png
index ec6b0f6..b3daef0 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore3-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore3-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore4-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore4-crystal.png
index 6f99026..c0d73d4 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore4-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore4-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore5-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore5-crystal.png
index 9b83c78..3f4fdc2 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore5-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore5-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore6-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore6-crystal.png
index d4b59d0..e4f3615 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore6-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore6-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore7-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore7-crystal.png
index c441b63..e0045f7 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore7-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/clowns-ore7-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/lithium-chloride.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/lithium-chloride.png
index 1e029e8..c326618 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/lithium-chloride.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/lithium-chloride.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/magnesium-ore-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/magnesium-ore-crystal.png
index 1ede3f4..8ec7c14 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/magnesium-ore-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/magnesium-ore-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/manganese-ore-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/manganese-ore-crystal.png
index 93c3abe..e45b0e7 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/manganese-ore-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/manganese-ore-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/molybdenum-ore-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/molybdenum-ore-crystal.png
index a8bd12a..da59407 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/molybdenum-ore-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/molybdenum-ore-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/omnine-base.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/omnine-base.png
index e234c2d..75325af 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/omnine-base.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/omnine-base.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/omnine.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/omnine.png
index e260a5e..71502e7 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/omnine.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/omnine.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/osmium-ore-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/osmium-ore-crystal.png
index c70fabe..0acc70e 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/osmium-ore-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/osmium-ore-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/osmium-ore.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/osmium-ore.png
index a9e22e3..8b439ec 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/osmium-ore.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/osmium-ore.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/phosphorus-ore-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/phosphorus-ore-crystal.png
index 9b83c78..3f4fdc2 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/phosphorus-ore-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/phosphorus-ore-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/platinum-ore-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/platinum-ore-crystal.png
index 4adf562..3a9160d 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/platinum-ore-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/platinum-ore-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/rare-earth-dust-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/rare-earth-dust-crystal.png
index 30699c6..98b7b92 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/rare-earth-dust-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/rare-earth-dust-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/sodium-carbonate-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/sodium-carbonate-crystal.png
index 27bf9c2..c243440 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/sodium-carbonate-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/sodium-carbonate-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/sodium-carbonate.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/sodium-carbonate.png
index f42151e..b75b10c 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/sodium-carbonate.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/sodium-carbonate.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-calcium-sulfate-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-calcium-sulfate-crystal.png
index 493ff26..3650094 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-calcium-sulfate-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-calcium-sulfate-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-calcium-sulfate.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-calcium-sulfate.png
index 56a79d2..d5e3500 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-calcium-sulfate.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-calcium-sulfate.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-limestone-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-limestone-crystal.png
index 24af306..c9998d5 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-limestone-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-limestone-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-limestone.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-limestone.png
index afccda3..cccc54d 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-limestone.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-limestone.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-lithium-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-lithium-crystal.png
index 45ef35b..1d22fad 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-lithium-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-lithium-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-sodium-carbonate-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-sodium-carbonate-crystal.png
index 27bf9c2..c243440 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-sodium-carbonate-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-sodium-carbonate-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-sodium-carbonate.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-sodium-carbonate.png
index f42151e..b75b10c 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-sodium-carbonate.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/solid-sodium-carbonate.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/thorium-ore-crystal.png b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/thorium-ore-crystal.png
index 2d44f2f..0a1d887 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/omnicrystals/thorium-ore-crystal.png and b/Clowns-Extended-Minerals/graphics/icons/omnicrystals/thorium-ore-crystal.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/shaft-mine.png b/Clowns-Extended-Minerals/graphics/icons/shaft-mine.png
index 66c0f7e..bd21e60 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/shaft-mine.png and b/Clowns-Extended-Minerals/graphics/icons/shaft-mine.png differ
diff --git a/Clowns-Extended-Minerals/graphics/icons/sorting-icon.png b/Clowns-Extended-Minerals/graphics/icons/sorting-icon.png
index 1a33c96..f98c3b6 100644
Binary files a/Clowns-Extended-Minerals/graphics/icons/sorting-icon.png and b/Clowns-Extended-Minerals/graphics/icons/sorting-icon.png differ
diff --git a/Clowns-Extended-Minerals/migrations/Clowns-Extended-Minerals_1.1.18.json b/Clowns-Extended-Minerals/migrations/Clowns-Extended-Minerals_1.1.18.json
index 2a9523f..9a38135 100644
--- a/Clowns-Extended-Minerals/migrations/Clowns-Extended-Minerals_1.1.18.json
+++ b/Clowns-Extended-Minerals/migrations/Clowns-Extended-Minerals_1.1.18.json
@@ -13,18 +13,18 @@
     ["phosphorus-ore-crystalization", "phosphorus-ore-crystal"],
     ["phosphorus-ore-omnitraction", "phosphorus-ore-crystal-omnitraction"],
     ["phosphorus-ore-solvation", "phosphorus-ore-omnide-solution"],
-    ["platinum-ore-crystalization", "platinum-ore-crystal"],
-    ["platinum-ore-omnitraction", "platinum-ore-crystal-omnitraction"],
-    ["platinum-ore-solvation", "platinum-ore-omnide-solution"],
-    ["solid-calcium-sulfate-crystalization", "solid-calcium-sulfate-crystal"],
-    ["solid-calcium-sulfate-omnitraction", "solid-calcium-sulfate-crystal-omnitraction"],
-    ["solid-calcium-sulfate-solvation", "solid-calcium-sulfate-omnide-solution"],
-    ["solid-limestone-crystalization", "solid-limestone-crystal"],
-    ["solid-limestone-omnitraction", "solid-limestone-crystal-omnitraction"],
-    ["solid-limestone-solvation", "solid-limestone-omnide-solution"],
-    ["solid-sodium-carbonate-crystalization", "solid-sodium-carbonate-crystal"],
-    ["solid-sodium-carbonate-omnitraction", "solid-sodium-carbonate-crystal-omnitraction"],
-    ["solid-sodium-carbonate-solvation", "solid-sodium-carbonate-omnide-solution"],
+    ["angels-platinum-ore-crystalization", "angels-platinum-ore-crystal"],
+    ["angels-platinum-ore-omnitraction", "angels-platinum-ore-crystal-omnitraction"],
+    ["angels-platinum-ore-solvation", "angels-platinum-ore-omnide-solution"],
+    ["angels-solid-calcium-sulfate-crystalization", "angels-solid-calcium-sulfate-crystal"],
+    ["angels-solid-calcium-sulfate-omnitraction", "angels-solid-calcium-sulfate-crystal-omnitraction"],
+    ["angels-solid-calcium-sulfate-solvation", "angels-solid-calcium-sulfate-omnide-solution"],
+    ["angels-solid-limestone-crystalization", "angels-solid-limestone-crystal"],
+    ["angels-solid-limestone-omnitraction", "angels-solid-limestone-crystal-omnitraction"],
+    ["angels-solid-limestone-solvation", "angels-solid-limestone-omnide-solution"],
+    ["angels-solid-sodium-carbonate-crystalization", "angels-solid-sodium-carbonate-crystal"],
+    ["angels-solid-sodium-carbonate-omnitraction", "angels-solid-sodium-carbonate-crystal-omnitraction"],
+    ["angels-solid-sodium-carbonate-solvation", "angels-solid-sodium-carbonate-omnide-solution"],
     ["thorium-ore-crystalization", "thorium-ore-crystal"],
     ["thorium-ore-omnitraction", "thorium-ore-crystal-omnitraction"],
     ["thorium-ore-solvation", "thorium-ore-omnide-solution"],
diff --git a/Clowns-Extended-Minerals/prototypes/buildings/shaft-mine.lua b/Clowns-Extended-Minerals/prototypes/buildings/shaft-mine.lua
index cd5ee7e..57fbfec 100644
--- a/Clowns-Extended-Minerals/prototypes/buildings/shaft-mine.lua
+++ b/Clowns-Extended-Minerals/prototypes/buildings/shaft-mine.lua
@@ -57,7 +57,7 @@ data:extend(
 			animation_speed = 0.8,
 			shift = {1,-0.5}
 		},
-		crafting_categories = {"shaft-mining", "ore-sorting"},
+		crafting_categories = {"shaft-mining", "angels-ore-sorting"},
 		crafting_speed = 1, --* settings.startup["shaft-mine-crafting-speed"].value,
 		module_specification =
 		{
diff --git a/Clowns-Extended-Minerals/prototypes/categories.lua b/Clowns-Extended-Minerals/prototypes/categories.lua
index 7640a1e..1b50eea 100644
--- a/Clowns-Extended-Minerals/prototypes/categories.lua
+++ b/Clowns-Extended-Minerals/prototypes/categories.lua
@@ -61,7 +61,7 @@ data:extend(
   },
   {
 		type = "item-subgroup",
-		name = "ore-sorting-advanced-2",
+		name = "angels-ore-sorting-advanced-2",
 		group = "angels-resource-refining",
 		order = "j-e",
 	},
diff --git a/Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua b/Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua
index edd8ada..4cc26a7 100644
--- a/Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua
+++ b/Clowns-Extended-Minerals/prototypes/generation/angels-trigger-sets.lua
@@ -1,5 +1,5 @@
 local temp_triggers = {}
-local trigger_tab = {"phosphorus","osmium","magnesium","limestone","sand","calcium-sulfate","sodium-carbonate","uranium","fluorite","platinum"} 
+local trigger_tab = {"phosphorus","osmium","magnesium","limestone","sand","calcium-sulfate","angels-sodium-carbonate","uranium","fluorite","platinum"} 
 if not special_vanilla then 
   table.insert(trigger_tab,"angels-solid-lithium")
 end
diff --git a/Clowns-Extended-Minerals/prototypes/generation/clowns-ore-set.lua b/Clowns-Extended-Minerals/prototypes/generation/clowns-ore-set.lua
index 9c1cfe4..c32cde3 100644
--- a/Clowns-Extended-Minerals/prototypes/generation/clowns-ore-set.lua
+++ b/Clowns-Extended-Minerals/prototypes/generation/clowns-ore-set.lua
@@ -103,7 +103,7 @@ if mods["angelsinfiniteores"] then
         minimum = angelsmods.ores.yield,
         normal = 1500,
         maximum = 6000,
-        acid_to_mine = "liquid-sulfuric-acid",
+        acid_to_mine = "angels-liquid-sulfuric-acid",
         output_name = base_ore,
         output_min = 1,
         output_max = 1,
diff --git a/Clowns-Extended-Minerals/prototypes/generation/clowns-resource-set.lua b/Clowns-Extended-Minerals/prototypes/generation/clowns-resource-set.lua
index 10bc992..a7c1036 100644
--- a/Clowns-Extended-Minerals/prototypes/generation/clowns-resource-set.lua
+++ b/Clowns-Extended-Minerals/prototypes/generation/clowns-resource-set.lua
@@ -12,7 +12,7 @@ local ap_dat={
 	["infinite-clowns-resource1"] = { starting_area = false, base_density = 10, regular_rq_factor_multiplier = 0.9, starting_rq_factor_multiplier = 1.1},
 }
 local resource_dat = {
-  ["clowns-resource1"] = {--[[stage="clowns-resource1",]]ore_sheet = "__Clowns-Extended-Minerals__/graphics/entity/alluvium",	order = "c-k",	mining_time = 1*0.2,	tint = {r = 0.9, g = 0.7, b = 0.7}, frame_c = 4, var_c= 8, acid = "liquid-phosphoric-acid"},
+  ["clowns-resource1"] = {--[[stage="clowns-resource1",]]ore_sheet = "__Clowns-Extended-Minerals__/graphics/entity/alluvium",	order = "c-k",	mining_time = 1*0.2,	tint = {r = 0.9, g = 0.7, b = 0.7}, frame_c = 4, var_c= 8, acid = "angels-liquid-phosphoric-acid"},
   ["clowns-resource2"] = {--[[stage="clowns-resource2",]]ore_sheet = "__Clowns-Extended-Minerals__/graphics/entity/oil-sands",	order = "c-l",	mining_time = 1*0.5,	tint = {r = 0.2, g = 0.25, b = 0.25}, frame_c = 4, var_c = 8, acid = "steam"},
 }
 ---------------------------------------------
diff --git a/Clowns-Extended-Minerals/prototypes/items/resource-processing.lua b/Clowns-Extended-Minerals/prototypes/items/resource-processing.lua
index e5b4cf0..24579d6 100644
--- a/Clowns-Extended-Minerals/prototypes/items/resource-processing.lua
+++ b/Clowns-Extended-Minerals/prototypes/items/resource-processing.lua
@@ -20,7 +20,7 @@ data:extend(
 	},
 	--[[{--zombrine??
 		type = "fluid",
-		name = "liquid-clowns-resource4",
+		name = "angels-liquid-clowns-resource4",
 		icon = "__Clowns-Processing__/graphics/icons/liquid-clowns-resource4.png",
 		icon_size = 32,
 		default_temperature = 25,
diff --git a/Clowns-Extended-Minerals/prototypes/lookup-tables.lua b/Clowns-Extended-Minerals/prototypes/lookup-tables.lua
index c267bc7..352da44 100644
--- a/Clowns-Extended-Minerals/prototypes/lookup-tables.lua
+++ b/Clowns-Extended-Minerals/prototypes/lookup-tables.lua
@@ -14,27 +14,33 @@ clowns.tables.get_trigger_name = {
   --[[V]]["angels-copper-nugget"] = special_vanilla and "copper" or "unused", -- special vanilla only
   --[[V]]["angels-copper-pebbles"] = special_vanilla and "copper" or "unused", -- special vanilla only
   --[[V]]["angels-copper-slag"] = special_vanilla and "copper" or "unused", -- special vanilla only
-  --[[A/B]]["bob-tin-ore"] = "tin",
-  --[[A/B]]["bob-lead-ore"] = "lead",
-  --[[A/B]]["bob-quartz"] = "silicon",
-  --[[A/B]]["bob-nickel-ore"] = "nickel",
-  --[[A/B]]["angels-manganese-ore"] = "manganese",
-  --[[A/B]]["bob-zinc-ore"] = "zinc",
-  --[[A/B]]["bob-bauxite-ore"] = "aluminium",
-  --[[A/B]]["bob-cobalt-ore"] = "cobalt",
-  --[[A/B]]["bob-silver-ore"] = "silver",
-  --[[A/B]]["bob-gold-ore"] = "gold",
-  --[[A/B]]["bob-rutile-ore"] = "titanium",
+
+  --[[A/B]]["lead-ore"] = "angels-lead",
+  --[[A/B]]["quartz"] = "angels-silicon",
+  --[[A/B]]["nickel-ore"] = "angels-nickel",
+  --[[A/B]]["manganese-ore"] = "angels-manganese",
+  --[[A/B]]["zinc-ore"] = "angels-zinc",
+  --[[A/B]]["bauxite-ore"] = "angels-aluminium",
+  --[[A/B]]["cobalt-ore"] = "angels-cobalt",
+  --[[A/B]]["silver-ore"] = "angels-silver",
+  --[[A/B]]["angels-gold-ore"] = "angels-gold",
+  --[[A/B]]["rutile-ore"] = "angels-titanium",
   --[[A/B]]["uranium-ore"] = "uranium",
-  --[[A/B]]["bob-tungsten-ore"] = "tungsten",
-  --[[A/B]]["bob-thorium-ore"] = "thorium",
-  --[[A/B]]["angels-chrome-ore"] = "chrome",
-  --[[A/B]]["angels-platinum-ore"] = "platinum",
+  --[[A/B]]["tungsten-ore"] = "angels-tungsten",
+  --[[A/B]]["thorium-ore"] = "angels-thorium",
+  --[[A/B]]["chrome-ore"] = "angels-chrome",
+  --[[A/B]]["angels-platinum-ore"] = "angels-platinum",
 
   --[[C]]["phosphorus-ore"] = "phosphorus",
   --[[C]]["magnesium-ore"] = "magnesium",
   --[[C]]["osmium-ore"] = "osmium",
 
+  --[[A]]["angels-solid-limestone"] = "angels-solid-limestone",
+  --[[A]]["angels-solid-calcium-sulfate"] = "angels-solid-calcium-sulfate",
+  --[[A]]["angels-solid-lithium"] = "angels-solid-lithium",
+  --[[A]]["angels-solid-sand"] = "angels-solid-sand",
+  --[[A]]["angels-solid-sodium-carbonate"] = "angels-solid-sodium-carbonate",
+  --[[A]]["fluorite-ore"] = "angels-fluorite", -- byproduct
   --[[A]]["angels-solid-limestone"] = "limestone",
   --[[A]]["angels-solid-calcium-sulfate"] = "calcium-sulfate",
   --[[A]]["angels-solid-lithium"] = "angels-solid-lithium",
@@ -70,7 +76,7 @@ clowns.tables.icon_lookup_table = {
 
   ["fluorite-ore"] = {icon = "__angelsrefininggraphics__/graphics/icons/ore-fluorite.png"},
 
-  ["gold-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-gold.png"} or
+  ["angels-gold-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-gold.png"} or
     mods["bobores"] and {icon = "__bobores__/graphics/icons/gold-ore.png"} or
     mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/gold-ore.png"} or
     icon_lookup_table_fallback,
@@ -81,7 +87,7 @@ clowns.tables.icon_lookup_table = {
 
   ["iron-slag"] = {icon = "__angelsrefininggraphics__/graphics/icons/iron-slag.png"},
 
-  ["solid-lithium"] = {icon = "__angelsrefininggraphics__/graphics/icons/solid-lithium.png"},
+  ["angels-solid-lithium"] = {icon = "__angelsrefininggraphics__/graphics/icons/solid-lithium.png"},
   
   ["lead-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-lead.png"} or
     mods["bobores"] and {icon = "__bobores__/graphics/icons/lead-ore.png"} or
@@ -93,7 +99,7 @@ clowns.tables.icon_lookup_table = {
     mods["bobplates"] and {icon = "__bobplates__/graphics/icons/ore/nickel-ore.png"} or
     icon_lookup_table_fallback,
 
-  ["platinum-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-platinum.png"} or
+  ["angels-platinum-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-platinum.png"} or
     icon_lookup_table_fallback,
 
   ["rutile-ore"] = mods["angelssmelting"] and {icon = "__angelssmeltinggraphics__/graphics/icons/ore-rutile.png"} or
@@ -230,20 +236,20 @@ clowns.tables.adamantite =       {
 }
 clowns.tables.antitate = {
   ["!!"] = (not special_vanilla) and {false, false, false, true},
-  ["bob-tin-ore"] = (not special_vanilla) and {2, 2, 3, 3},
+  ["tin-ore"] = (not special_vanilla) and {2, 2, 3, 3},
   ["angels-solid-lithium"] = (not special_vanilla) and {1, 1, 1, 2},
-  ["bob-nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["bob-bauxite-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["angels-chrome-ore"] = (not special_vanilla) and {0, 0, 1, 1},
+  ["nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["bauxite-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["chrome-ore"] = (not special_vanilla) and {0, 0, 1, 1},
   ["angels-platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1}
 }
 clowns.tables.progalena = {
   ["!!"] = (not special_vanilla) and {false, false, false, true},
-  ["bob-lead-ore"] = (not special_vanilla) and {2, 2, 3, 3},
+  ["lead-ore"] = (not special_vanilla) and {2, 2, 3, 3},
   ["angels-solid-calcium-sulfate"] = (not special_vanilla) and {1, 1, 1, 2},
-  ["bob-silver-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["bob-zinc-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["bob-thorium-ore"] = (not special_vanilla) and {0, 0, 1, 1},
+  ["silver-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["zinc-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["thorium-ore"] = (not special_vanilla) and {0, 0, 1, 1},
   ["uranium-ore"] = (not special_vanilla) and {0, 0, 0, 1}
 }
 clowns.tables.orichalcite = {
@@ -252,11 +258,11 @@ clowns.tables.orichalcite = {
   ["angels-copper-nugget"] = special_vanilla and {1, 2, 4, 3},
   ["angels-copper-pebbles"] = special_vanilla and {2, 3, 1, 2},
   ["angels-copper-slag"] = special_vanilla and {0, 0, 2, 4},
-  ["angels-manganese-ore"] = (not special_vanilla) and {1, 1, 1, 2},
-  ["bob-nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["bob-zinc-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["bob-gold-ore"] = (not special_vanilla) and {0, 0, 1, 1},
-  ["bob-tungsten-ore"] = (not special_vanilla) and {0, 0, 0, 1},
+  ["manganese-ore"] = (not special_vanilla) and {1, 1, 1, 2},
+  ["nickel-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["zinc-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["angels-gold-ore"] = (not special_vanilla) and {0, 0, 1, 1},
+  ["tungsten-ore"] = (not special_vanilla) and {0, 0, 0, 1},
 }
 clowns.tables.phosphorite = {
   ["!!"] = {special_vanilla, special_vanilla, special_vanilla, true},
@@ -272,10 +278,10 @@ clowns.tables.phosphorite = {
 }
 clowns.tables.sanguinate = {
   ["!!"] = (not special_vanilla) and {false, false, false, true},
-  ["angels-manganese-ore"] = (not special_vanilla) and {2, 2, 3, 3},
-  ["bob-quartz"] = (not special_vanilla) and {1, 1, 1, 2}, 
+  ["manganese-ore"] = (not special_vanilla) and {2, 2, 3, 3},
+  ["quartz"] = (not special_vanilla) and {1, 1, 1, 2}, 
   ["angels-solid-calcium-sulfate"] = (not special_vanilla) and {0, 1, 1, 1}, --always active with processing/petrochem
-  ["angels-fluorite-ore"] = (not special_vanilla) and {0, 1, 1, 1}, --always active with processing/petrochem
+  ["fluorite-ore"] = (not special_vanilla) and {0, 1, 1, 1}, --always active with processing/petrochem
   ["phosphorus-ore"] = (not special_vanilla) and {0, 0, 1, 1},
   ["bob-rutile-ore"] = (not special_vanilla) and {0, 0, 0, 1}
 }
@@ -285,10 +291,10 @@ clowns.tables.elionagate = {
   ["angels-copper-nugget"] = special_vanilla and {0, 0, 2, 3},
   ["angels-copper-pebbles"] = special_vanilla and {0, 5, 5, 6},
   ["angels-copper-slag"] = special_vanilla and {1, 2, 3, 4},
-  ["bob-lead-ore"] = (not special_vanilla) and {1, 1, 1, 2}, 
-  ["bob-cobalt-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["angels-chrome-ore"] = (not special_vanilla) and {0, 1, 1, 1}, 
-  ["bob-thorium-ore"] = (not special_vanilla) and {0, 0, 1, 1},
+  ["lead-ore"] = (not special_vanilla) and {1, 1, 1, 2}, 
+  ["cobalt-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["chrome-ore"] = (not special_vanilla) and {0, 1, 1, 1}, 
+  ["thorium-ore"] = (not special_vanilla) and {0, 0, 1, 1},
   ["angels-platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1},
 }
 clowns.tables.metagarnierite = {
@@ -303,35 +309,35 @@ clowns.tables.metagarnierite = {
 clowns.tables.novaleucoxene = {
   ["!!"] = (not special_vanilla) and {false, false, false, true},
   ["iron-ore"] = (not special_vanilla) and {2, 1, 2, 2},
-  ["bob-quartz"] = (not special_vanilla) and {1, 1, 1, 2},
+  ["quartz"] = (not special_vanilla) and {1, 1, 1, 2},
   ["angels-solid-calcium-sulfate"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["bob-rutile-ore"] = (not special_vanilla) and {0, 2, 2, 2},
+  ["rutile-ore"] = (not special_vanilla) and {0, 2, 2, 2},
   ["angels-solid-sodium-carbonate"] = (not special_vanilla) and {0, 0, 1, 1},
-  ["bob-bauxite-ore"] = (not special_vanilla) and {0, 0, 0, 1}
+  ["bauxite-ore"] = (not special_vanilla) and {0, 0, 0, 1}
 }
 clowns.tables.stannic = {
   ["!!"] = (not special_vanilla) and {true, true, true, true},
-  ["bob-tin-ore"] = (not special_vanilla) and {2, 3, 4, 4},
-  ["bob-quartz"] = (not special_vanilla) and {2, 2, 2, 2},
-  ["bob-silver-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["bob-zinc-ore"] = (not special_vanilla) and {0, 0, 1, 1},
+  ["tin-ore"] = (not special_vanilla) and {2, 3, 4, 4},
+  ["quartz"] = (not special_vanilla) and {2, 2, 2, 2},
+  ["silver-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["zinc-ore"] = (not special_vanilla) and {0, 0, 1, 1},
   ["angels-platinum-ore"] = (not special_vanilla) and {0, 0, 0, 1}
 }
 clowns.tables.plumbic = {
   ["!!"] = (not special_vanilla) and {true, true, true, true},
-  ["bob-lead-ore"] = (not special_vanilla) and {2, 3, 4, 4},
+  ["lead-ore"] = (not special_vanilla) and {2, 3, 4, 4},
   ["angels-solid-calcium-sulfate"] = (not special_vanilla) and {2, 2, 2, 2},
-  ["bob-silver-ore"] = (not special_vanilla) and {0, 1, 1, 1},
-  ["bob-gold-ore"] = (not special_vanilla) and {0, 0, 1, 1},
-  ["bob-thorium-ore"] = (not special_vanilla) and {0, 0, 0, 1}
+  ["silver-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["angels-gold-ore"] = (not special_vanilla) and {0, 0, 1, 1},
+  ["thorium-ore"] = (not special_vanilla) and {0, 0, 0, 1}
 }
 clowns.tables.manganic = {
   ["!!"] = (not special_vanilla) and {true, true, true, true},
   ["angels-manganese-ore"] = (not special_vanilla) and {2, 3, 4, 4},
   ["magnesium-ore"] = (not special_vanilla) and {2, 2, 2, 2},
-  ["bob-bauxite-ore"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["bauxite-ore"] = (not special_vanilla) and {0, 1, 1, 1},
   ["angels-solid-sodium-carbonate"] = (not special_vanilla) and {0, 0, 1, 1},
-  ["angels-chrome-ore"] = (not special_vanilla) and {0, 0, 0, 1}
+  ["chrome-ore"] = (not special_vanilla) and {0, 0, 0, 1}
 }
 clowns.tables.titanic = {
   ["!!"] = (not special_vanilla) and {true, true, true, true},
@@ -345,7 +351,7 @@ clowns.tables.phosphic = {
   ["!!"] = (not special_vanilla) and {true, true, true, true},
   ["phosphorus-ore"] = (not special_vanilla) and {2, 3, 4, 4},
   ["copper-ore"] = (not special_vanilla) and {2, 2, 2, 2},
-  ["bob-quartz"] = (not special_vanilla) and {0, 1, 1, 1},
+  ["quartz"] = (not special_vanilla) and {0, 1, 1, 1},
   ["angels-solid-limestone"] = (not special_vanilla) and {0, 0, 1, 1},
   ["uranium-ore"] = (not special_vanilla) and {0, 0, 0, 1}
 }
@@ -386,9 +392,9 @@ clowns.tables.chunk_mix_processing = {
   {type = "item", name = "rare-earth-dust", amount = 8}
 }
 clowns.tables.crystal_mix_processing = {
-  (not special_vanilla) and {type = "item", name = "bob-cobalt-ore", amount = 7},
-  (not special_vanilla) and {type = "item", name = "bob-gold-ore", amount = 7},
-  (not special_vanilla) and {type = "item", name = "bob-rutile-ore", amount = 7},
+  (not special_vanilla) and {type = "item", name = "cobalt-ore", amount = 7},
+  (not special_vanilla) and {type = "item", name = "angels-gold-ore", amount = 7},
+  (not special_vanilla) and {type = "item", name = "rutile-ore", amount = 7},
   (not special_vanilla) and {type = "item", name = "uranium-ore", amount = 7},
   {type = "item", name = "magnesium-ore", amount = special_vanlla and 4 or 7},
   {type = "item", name = "molybdenum-ore", amount = 8}, --these are temp placeholders, the base ores are not declared until data-updates
@@ -396,9 +402,9 @@ clowns.tables.crystal_mix_processing = {
 
 }
 clowns.tables.pure_mix_processing = {
-  (not special_vanilla) and {type = "item", name = "bob-tungsten-ore", amount = 5},
-  (not special_vanilla) and {type = "item", name = "bob-thorium-ore", amount = 5},
-  (not special_vanilla) and {type = "item", name = "angels-chrome-ore", amount = 5},
+  (not special_vanilla) and {type = "item", name = "tungsten-ore", amount = 5},
+  (not special_vanilla) and {type = "item", name = "thorium-ore", amount = 5},
+  (not special_vanilla) and {type = "item", name = "chrome-ore", amount = 5},
   (not special_vanilla) and {type = "item", name = "angels-platinum-ore", amount = 5},
   {type = "item", name = "osmium-ore", amount = special_vanlla and 6 or 5},
   {type = "item", name = "kimberlite-rock", amount = 8} --these are temp placeholders, the base ores are not declared until data-updates
diff --git a/Clowns-Extended-Minerals/prototypes/omnicrystals/omnicrystal_functions.lua b/Clowns-Extended-Minerals/prototypes/omnicrystals/omnicrystal_functions.lua
index 7adf4fd..f56020b 100644
--- a/Clowns-Extended-Minerals/prototypes/omnicrystals/omnicrystal_functions.lua
+++ b/Clowns-Extended-Minerals/prototypes/omnicrystals/omnicrystal_functions.lua
@@ -17,7 +17,7 @@ ingrediences_solvation=function(recipe)
 	local ing = {}
 	ing[#ing+1]={type = "fluid", name = "hydromnic-acid", amount = 120}
 	for _, i in pairs(recipe.normal.ingredients) do
-		if i.name ~= "catalysator-brown" and i.name ~= "angels-void" and i.name ~= "catalysator-green" and i.name ~= "catalysator-orange" and i.name ~= "slag" then
+		if i.name ~= "catalysator-brown" and i.name ~= "angels-void" and i.name ~= "catalysator-green" and i.name ~= "catalysator-orange" and i.name ~= "angels-slag" then
 			ing[#ing+1]=i
 		end
 	end
@@ -28,7 +28,7 @@ results_solvation=function(recipe)
   local ing = {}
 	--ing[#ing+1]={type = "fluid", name = "hydromnic-acid", amount = 120}
 	for _, i in pairs(recipe.normal.results) do
-		if i.name ~= "slag" and not string.find(i.name,"void") then
+		if i.name ~= "angels-slag" and not string.find(i.name,"void") then
 			ing[#ing+1]={type = "item", name=i.name.."-omnide-salt", amount = i.amount}
 		end
   end
diff --git a/Clowns-Extended-Minerals/prototypes/omnicrystals/omnicrystal_updates.lua b/Clowns-Extended-Minerals/prototypes/omnicrystals/omnicrystal_updates.lua
index 1c62819..430a39c 100644
--- a/Clowns-Extended-Minerals/prototypes/omnicrystals/omnicrystal_updates.lua
+++ b/Clowns-Extended-Minerals/prototypes/omnicrystals/omnicrystal_updates.lua
@@ -1,10 +1,10 @@
 if mods["omnimatter_crystal"] then
-  add_crystal("solid-lithium", "Lithium Chloride")
-  add_crystal("solid-calcium-sulfate", "Calcium Sulfate")
+  add_crystal("angels-solid-lithium", "Lithium Chloride")
+  add_crystal("angels-solid-calcium-sulfate", "Calcium Sulfate")
   add_crystal("thorium-ore", "Thorium")
   add_crystal("phosphorus-ore", "Phosphorus")
-  add_crystal("solid-limestone", "Limestone")
-  add_crystal("solid-sodium-carbonate", "Sodium Carbonate")
+  add_crystal("angels-solid-limestone", "Limestone")
+  add_crystal("angels-solid-sodium-carbonate", "Sodium Carbonate")
   add_crystal("osmium-ore", "Osmium")
   add_crystal("magnesium-ore","Magnesium")
   if mods["pycoalprocessing"] then
@@ -14,7 +14,7 @@ if mods["omnimatter_crystal"] then
     add_crystal("rare-earth-dust", "Rare Earth Dust")
     add_crystal("molybdenum-ore", "Molybdenum")
     if mods["PyCoalTBaA"] then
-      add_crystal("sodium-carbonate", "Sodium Carbonate")
+      add_crystal("angels-sodium-carbonate", "Sodium Carbonate")
     end
   end
 
@@ -190,7 +190,7 @@ if mods["omnimatter_crystal"] then
           for i, rec in pairs(data.raw.recipe) do
             if rec.category == "omniplant" and string.find(rec.name,"salting") then
               omni.lib.replace_recipe_ingredient(rec.name, "hydromnic-acid",{type = "item", name = "omni-catalyst", amount=1})
-              rec.category = "ore-sorting"
+              rec.category = "angels-ore-sorting"
             end
           end
         end
diff --git a/Clowns-Extended-Minerals/prototypes/recipes/mining.lua b/Clowns-Extended-Minerals/prototypes/recipes/mining.lua
index cdc0b83..4cd94ef 100644
--- a/Clowns-Extended-Minerals/prototypes/recipes/mining.lua
+++ b/Clowns-Extended-Minerals/prototypes/recipes/mining.lua
@@ -13,8 +13,8 @@ data:extend(
 	ingredients = {},
 	results =
 	{
-	{type="item", name="solid-limestone", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-solid-limestone", amount=1},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 1.5 * time_parameter, --CONFIRM 1.5?
 	subgroup = "raw-resource",
@@ -22,7 +22,7 @@ data:extend(
 	},
 	{
 	type = "recipe",
-	name = "stone-mining",
+	name = "angels-stone-mining",
 	category = "shaft-mining",
 	hidden = false,
 	icon = "__base__/graphics/icons/stone.png",
@@ -47,7 +47,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="coal", amount=1},
-	{type="item", name="slag", amount=1},
+	{type="item", name="angels-slag", amount=1},
 	},
 	energy_required = 4 * time_parameter, --CONFIRM?
 	subgroup = "raw-resource",
@@ -65,7 +65,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="angels-ore1", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 1.5 * time_parameter,
 	subgroup = "raw-resource",
@@ -83,7 +83,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="angels-ore2", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 2 * time_parameter,
 	subgroup = "raw-resource",
@@ -101,7 +101,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="angels-ore3", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 2 * time_parameter,
 	subgroup = "raw-resource",
@@ -119,7 +119,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="angels-ore4", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 2 * time_parameter,
 	subgroup = "raw-resource",
@@ -137,7 +137,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="angels-ore5", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 2.5 * time_parameter,
 	subgroup = "raw-resource",
@@ -155,7 +155,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="angels-ore6", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 2.5 * time_parameter,
 	subgroup = "raw-resource",
@@ -173,7 +173,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="clowns-ore1", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 1 * time_parameter,
 	subgroup = "raw-resource",
@@ -190,7 +190,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="clowns-ore6", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 1 * time_parameter,
 	subgroup = "raw-resource",
@@ -207,7 +207,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="clowns-ore3", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 1 * time_parameter,
 	subgroup = "raw-resource",
@@ -224,7 +224,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="clowns-ore4", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 1 * time_parameter,
 	subgroup = "raw-resource",
@@ -241,7 +241,7 @@ data:extend(
 	results =
 	{
 	{type="item", name="clowns-ore5", amount=1},
-	{type="item", name="slag", amount=2},
+	{type="item", name="angels-slag", amount=2},
 	},
 	energy_required = 1 * time_parameter,
 	subgroup = "raw-resource",
diff --git a/Clowns-Extended-Minerals/prototypes/recipes/ore-refining.lua b/Clowns-Extended-Minerals/prototypes/recipes/ore-refining.lua
index cd84df6..e880105 100644
--- a/Clowns-Extended-Minerals/prototypes/recipes/ore-refining.lua
+++ b/Clowns-Extended-Minerals/prototypes/recipes/ore-refining.lua
@@ -16,8 +16,8 @@ local acid_wastewater = {
   ["angels-liquid-hydrofluoric-acid"] = "angels-water-greenyellow-waste",
   ["angels-liquid-nitric-acid"] = "angels-water-red-waste",
   ["angels-liquid-hydrochloric-acid"] = "angels-water-green-waste",
-  ["liquid-boric-acid"] = "", --currently no wastewater
-  ["liquid-phosphoric-acid"] = "angels-water-yellow-waste", --currently no wastewater
+  ["angels-liquid-boric-acid"] = "", --currently no wastewater
+  ["angels-liquid-phosphoric-acid"] = "angels-water-yellow-waste", --currently no wastewater
 }
 --check if angels setting is active and modify acids
 if mods["angelspetrochem"] and settings.startup["angels-enable-acids"].value then
@@ -27,7 +27,7 @@ if mods["angelspetrochem"] and settings.startup["angels-enable-acids"].value the
   ore_material["clowns-ore5"].acid = "angels-liquid-nitric-acid"
   ore_material["clowns-ore7"].acid = "angels-liquid-hydrofluoric-acid"
   ore_material["clowns-ore8"].acid = "angels-liquid-hydrochloric-acid"
-  ore_material["clowns-ore9"].acid = "liquid-phosphoric-acid"
+  ore_material["clowns-ore9"].acid = "angels-liquid-phosphoric-acid"
 end
 for _, ore in pairs(ore_table) do
   data:extend(
diff --git a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix-static.lua b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix-static.lua
index 072ec91..4813663 100644
--- a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix-static.lua
+++ b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix-static.lua
@@ -141,7 +141,7 @@ if not clowns.special_vanilla then
 		},
 		{
 			type = "recipe",
-			name = "platinum-pure-processing",
+			name = "angels-platinum-pure-processing",
 			category = "angels-ore-sorting-4",
 			subgroup = "angels-ore-sorting-advanced",
 			allow_decomposition = false,
diff --git a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix.lua b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix.lua
index 498592b..88feca5 100644
--- a/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix.lua
+++ b/Clowns-Extended-Minerals/prototypes/recipes/ore-sorting-mix.lua
@@ -91,7 +91,7 @@ local create_mixed_sorting = function(num,tier)
         type = "recipe",
         name = "clowns-" .. style .. "-mix".. num .."-processing",
         category = cat,
-        subgroup = "ore-sorting-advanced-2",
+        subgroup = "angels-ore-sorting-advanced-2",
         energy_required = 1,
         enabled = false,
         allow_decomposition = false,
diff --git a/Clowns-Extended-Minerals/prototypes/technology/ore-refining.lua b/Clowns-Extended-Minerals/prototypes/technology/ore-refining.lua
index 6fd8c22..46bc5fc 100644
--- a/Clowns-Extended-Minerals/prototypes/technology/ore-refining.lua
+++ b/Clowns-Extended-Minerals/prototypes/technology/ore-refining.lua
@@ -133,5 +133,5 @@ if not clowns.special_vanilla then
     table.insert(data.raw.technology["angels-ore-electro-whinning-cell"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crystal-processing"})
   end
 else --special vanilla case
-  --table.insert(data.raw.technology["ore-advanced-crushing"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crushed"})
+  --table.insert(data.raw.technology["angels-ore-advanced-crushing"].effects,{type = "unlock-recipe",recipe = "clownsore"..i.."-crushed"})
 end
\ No newline at end of file
diff --git a/Clowns-Extended-Minerals/prototypes/technology/water-treatment.lua b/Clowns-Extended-Minerals/prototypes/technology/water-treatment.lua
index b050ece..3a5d9fa 100644
--- a/Clowns-Extended-Minerals/prototypes/technology/water-treatment.lua
+++ b/Clowns-Extended-Minerals/prototypes/technology/water-treatment.lua
@@ -3,7 +3,7 @@ if not clowns.special_vanilla then
   {
     {
       type = "technology",
-      name = "water-washing-3",
+      name = "angels-water-washing-3",
       icon_size = 128,
       icon = "__angelsrefininggraphics__/graphics/technology/washing-plant-tech.png",
       effects =
diff --git a/Clowns-Processing/prototypes/buildings/sluicer.lua b/Clowns-Processing/prototypes/buildings/sluicer.lua
index 85baa8b..c64ffdf 100644
--- a/Clowns-Processing/prototypes/buildings/sluicer.lua
+++ b/Clowns-Processing/prototypes/buildings/sluicer.lua
@@ -1,3 +1,4 @@
+-- Everything related to the buildings: Items, Recipes, Entities(Assember)
 data:extend(
 {
 	{
diff --git a/Clowns-Processing/prototypes/categories.lua b/Clowns-Processing/prototypes/categories.lua
index 570fc36..2272a0d 100644
--- a/Clowns-Processing/prototypes/categories.lua
+++ b/Clowns-Processing/prototypes/categories.lua
@@ -192,7 +192,7 @@ data:extend(
 	{
 		type = "item-subgroup",
 		name = "bio-processing-violet",
-		group = mods["angelsbioprocessing"] and "angels-bio-processing-nauvis" or "angels-resource-refining",
+		group = mods["angelsbioprocessing"] and "bio-processing-nauvis" or "angels-resource-refining",
 		order = "d-a", --should be after blue algae
 	},
 	{
diff --git a/Clowns-Processing/prototypes/items/vanilla-items.lua b/Clowns-Processing/prototypes/items/vanilla-items.lua
index b53077e..73d5d91 100644
--- a/Clowns-Processing/prototypes/items/vanilla-items.lua
+++ b/Clowns-Processing/prototypes/items/vanilla-items.lua
@@ -3,7 +3,7 @@ data:extend(
     --violet catalyst
     {
       type = "item",
-      name = "catalyst-metal-violet",
+      name = "angels-catalyst-metal-violet",
       icon = "__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",
       icon_size = 32,
       subgroup = "angels-petrochem-catalysts",
@@ -26,7 +26,7 @@ data:extend(
     --pellet
     {
       type = "item",
-      name = "pellet-depleted-uranium",
+      name = "angels-pellet-depleted-uranium",
       icon = "__Clowns-Processing__/graphics/icons/pellet-depleted-uranium.png",
       icon_size = 32,
       subgroup = "clowns-depleted-uranium",
@@ -36,7 +36,7 @@ data:extend(
     --powder
     {
       type = "item",
-      name = "powder-depleted-uranium",
+      name = "angels-powder-depleted-uranium",
       icon = "__Clowns-Processing__/graphics/icons/powder-depleted-uranium.png",
       icon_size = 32,
       subgroup = "clowns-depleted-uranium",
@@ -79,7 +79,7 @@ data:extend(
     --white phosphorus
     {
       type = "item",
-      name = "solid-white-phosphorus",
+      name = "angels-solid-white-phosphorus",
       icon = "__Clowns-Processing__/graphics/icons/solid-white-phosphorus.png",
       icon_size = 32,
       subgroup = "clowns-phosphorus",
@@ -89,7 +89,7 @@ data:extend(
     --phosphoric-acid
     {
       type = "fluid",
-      name = "liquid-phosphoric-acid",
+      name = "angels-liquid-phosphoric-acid",
       icons = angelsmods.functions.create_liquid_fluid_icon({ "__Clowns-Processing__/graphics/icons/phosphoric-acid.png", 512 }, {{ r = 244, g = 125, b = 001 },{ 242, 242, 242 },{ 214, 012, 012 }}),--"__Clowns-Processing__/graphics/icons/liquid-phosphoric-acid.png",
       --icon_size = 32,
       default_temperature = 25,
@@ -104,7 +104,7 @@ data:extend(
     --liquid mercury
     {
       type = "fluid",
-      name = "liquid-mercury",
+      name = "angels-liquid-mercury",
       icons = angelsmods.functions.create_viscous_liquid_fluid_icon({icon="__Clowns-Processing__/graphics/icons/Numbers/Hg.png", icon_size=32, icon_mipmaps=2},
       { { 184, 184, 208 },{ 184, 184, 208 },{ 184, 184, 208 } }),--"__Clowns-Processing__/graphics/icons/liquid-mercury.png",
       default_temperature = 25,
@@ -121,7 +121,7 @@ if mods["angelsbioprocessing"] then
     --liquid-dmm
     {
       type = "fluid",
-      name = "liquid-dimethylmercury",
+      name = "angels-liquid-dimethylmercury",
       icons = angelsmods.functions.create_viscous_liquid_fluid_icon(nil,{ { 118, 141, 138 },{ 94, 113, 110 },{ 94, 113, 110 } }),--"__Clowns-Processing__/graphics/icons/liquid-mercury.png",
       --icon = "__Clowns-Processing__/graphics/icons/liquid-dimethylmercury.png",
       --icon_size = 32,
@@ -180,7 +180,7 @@ data:extend(
 --    --Boric acid
 --    {
 --      type = "fluid",
---      name = "liquid-boric-acid",
+--      name = "angels-liquid-boric-acid",
 --      icons = angelsmods.functions.create_liquid_fluid_icon({ "__Clowns-Processing__/graphics/icons/boric-acid.png", 512 }, {{r=203/255,g=146/255,b=146/255},{ 214, 012, 012 },{ 242, 242, 242 }}),--"__Clowns-Processing__/graphics/icons/liquid-boric-acid.png",
 --      --icon_size = 32,
 --      default_temperature = 25,
@@ -215,7 +215,7 @@ data:extend(
     --pellet
     {
       type = "item",
-      name = "pellet-magnesium",
+      name = "angels-pellet-magnesium",
       icon = "__Clowns-Processing__/graphics/icons/pellet-magnesium.png",
       icon_size = 32,
       subgroup = "clowns-magnesium",
@@ -225,7 +225,7 @@ data:extend(
     --ingot
     {
       type = "item",
-      name = "ingot-magnesium",
+      name = "angels-ingot-magnesium",
       icon = "__Clowns-Processing__/graphics/icons/ingot-magnesium.png",
       icon_size = 32,
       subgroup = "clowns-magnesium",
@@ -235,7 +235,7 @@ data:extend(
     --molten
     {
       type = "fluid",
-      name = "liquid-molten-magnesium",
+      name = "angels-liquid-molten-magnesium",
       icon = "__Clowns-Processing__/graphics/icons/molten-magnesium.png",
       icon_size = 32,
       default_temperature = 100,
@@ -281,7 +281,7 @@ data:extend(
     --pellet
     {
       type = "item",
-      name = "pellet-osmium",
+      name = "angels-pellet-osmium",
       icon = "__Clowns-Processing__/graphics/icons/pellet-osmium.png",
       icon_size = 32,
       subgroup = "clowns-osmium",
@@ -291,7 +291,7 @@ data:extend(
     --powder
     {
       type = "item",
-      name = "powder-osmium",
+      name = "angels-powder-osmium",
       icon = "__Clowns-Processing__/graphics/icons/powder-osmium.png",
       icon_size = 32,
       subgroup = "clowns-osmium",
@@ -324,7 +324,7 @@ data:extend(
     --UF6
     {
       type = "item",
-      name = "solid-uranium-hexafluoride",
+      name = "angels-solid-uranium-hexafluoride",
       icon = "__Clowns-Processing__/graphics/icons/solid-uranium-hexafluoride.png",
       icon_size = 32,
       subgroup = "clowns-uranium",
@@ -334,7 +334,7 @@ data:extend(
     --UF4
     {
       type = "item",
-      name = "solid-uranium-tetrafluoride",
+      name = "angels-solid-uranium-tetrafluoride",
       icon = "__Clowns-Processing__/graphics/icons/solid-uranium-tetrafluoride.png",
       icon_size = 32,
       subgroup = "clowns-uranium",
@@ -344,7 +344,7 @@ data:extend(
     --UO2
     {
       type = "item",
-      name = "solid-uranium-oxide",
+      name = "angels-solid-uranium-oxide",
       icon = "__Clowns-Processing__/graphics/icons/solid-uranium-oxide.png",
       icon_size = 32,
       subgroup = "clowns-uranium",
@@ -354,7 +354,7 @@ data:extend(
     --(NH4)2U2O7
     {
       type = "item",
-      name = "solid-ammonium-diuranate",
+      name = "angels-solid-ammonium-diuranate",
       icon = "__Clowns-Processing__/graphics/icons/solid-ammonium-diuranate.png",
       icon_size = 32,
       subgroup = "clowns-uranium",
@@ -364,7 +364,7 @@ data:extend(
     --UO2(NO3)2
     {
       type = "item",
-      name = "solid-uranyl-nitrate",
+      name = "angels-solid-uranyl-nitrate",
       icon = "__Clowns-Processing__/graphics/icons/solid-uranyl-nitrate.png",
       icon_size = 32,
       subgroup = "clowns-uranium",
@@ -374,7 +374,7 @@ data:extend(
     --F2
     {
       type = "fluid",
-      name = "gas-fluorine",
+      name = "angels-gas-fluorine",
       icons =  angelsmods.functions.create_gas_fluid_icon({ "__Clowns-Processing__/graphics/icons/fluorine.png", 216 }, "FFF"),-- "__Clowns-Processing__/graphics/icons/gas-fluorine.png",
       --icon_size = 32,
       default_temperature = 25,
diff --git a/Clowns-Processing/prototypes/overrides.lua b/Clowns-Processing/prototypes/overrides.lua
index dfb41de..076ed20 100644
--- a/Clowns-Processing/prototypes/overrides.lua
+++ b/Clowns-Processing/prototypes/overrides.lua
@@ -212,15 +212,15 @@ end
 if angelsmods.trigger.smelting_products["aluminium"].plate then
 	data.raw.recipe["angels-liquid-molten-aluminium-3"].order = "i[liquid-molten-aluminium]-d"
 	data.raw.recipe["angels-liquid-molten-aluminium-3"].icons = angelsmods.functions.add_number_icon_layer(
-		angelsmods.functions.get_object_icons("liquid-molten-aluminium"),
+		angelsmods.functions.get_object_icons("angels-liquid-molten-aluminium"),
 		4, angelsmods.smelting.number_tint)
 end
 --update titanium sponge
 if angelsmods.trigger.smelting_products["titanium"].plate then
-	data.raw.recipe["angels-liquid-titanium-tetrachloride"].icons = angelsmods.functions.add_number_icon_layer(
+	data.raw.recipe["angels-sponge-titanium"].icons = angelsmods.functions.add_number_icon_layer(
 		{{icon = "__angelssmeltinggraphics__/graphics/icons/sponge-titanium.png",	icon_size = 32}},
 		1, angelsmods.smelting.number_tint)
-	data.raw.recipe["sponge-magnesium-titanium-smelting"].icons = angelsmods.functions.add_number_icon_layer(
+	data.raw.recipe["angels-sponge-magnesium-titanium-smelting"].icons = angelsmods.functions.add_number_icon_layer(
 		{{icon = "__angelssmeltinggraphics__/graphics/icons/sponge-titanium.png",	icon_size = 32}},
 		2, angelsmods.smelting.number_tint)
 end
\ No newline at end of file
diff --git a/Clowns-Processing/prototypes/recipes/angels-bioprocessing.lua b/Clowns-Processing/prototypes/recipes/angels-bioprocessing.lua
index c632ee5..8945a93 100644
--- a/Clowns-Processing/prototypes/recipes/angels-bioprocessing.lua
+++ b/Clowns-Processing/prototypes/recipes/angels-bioprocessing.lua
@@ -14,8 +14,8 @@ if mods["angelsbioprocessing"] then
 		energy_required = 20,
 		ingredients =
 		{
-		  {type="fluid", name="water-mineralized", amount=100},
-		  {type="fluid", name="gas-carbon-dioxide", amount=100}
+		  {type="fluid", name="angels-water-mineralized", amount=100},
+		  {type="fluid", name="angels-gas-carbon-dioxide", amount=100}
 		},
 		results=
 		{
@@ -57,7 +57,7 @@ if mods["angelsbioprocessing"] then
 		},
 		results=
 		{
-		  {type="fluid", name="liquid-dimethylmercury", amount=2},
+		  {type="fluid", name="angels-liquid-dimethylmercury", amount=2},
 		},
 		icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
 		nil,
@@ -224,7 +224,7 @@ if mods["angelsbioprocessing"] then
 		allow_decomposition = false,
 		ingredients =
 		{
-			{type="fluid", name="liquid-phosphoric-acid", amount=10},
+			{type="fluid", name="angels-liquid-phosphoric-acid", amount=10},
 			{type="fluid", name="angels-gas-ammonia", amount=10},
 		},
 		results =
diff --git a/Clowns-Processing/prototypes/recipes/angels-smelting.lua b/Clowns-Processing/prototypes/recipes/angels-smelting.lua
index 60be071..293dce8 100644
--- a/Clowns-Processing/prototypes/recipes/angels-smelting.lua
+++ b/Clowns-Processing/prototypes/recipes/angels-smelting.lua
@@ -16,7 +16,7 @@ if mods["bobplates"] or (mods["angelsindustries"] and angelsmods.industries.over
     ingredients =
     {
       {type="item", name="angels-ingot-iron", amount=12},
-      {type="item", name="ingot-magnesium", amount=12},
+      {type="item", name="angels-ingot-magnesium", amount=12},
       {type="item", name="angels-ingot-manganese", amount=12},
     },
     results=
@@ -41,8 +41,8 @@ else --include a magnesium sink for vanilla cases
     ingredients =
     {
       {type="item", name="angels-ingot-steel", amount=12},
-      {type="item", name="ingot-magnesium", amount=12},
-      {type="item", name="solid-white-phosphorus", amount=12},
+      {type="item", name="angels-ingot-magnesium", amount=12},
+      {type="item", name="angels-solid-white-phosphorus", amount=12},
     },
     results=
     {
@@ -69,7 +69,7 @@ if angelsmods.trigger.smelting_products["aluminium"].plate then
     ingredients =
     {
       {type="item", name="angels-ingot-aluminium", amount=12},
-      {type="item", name="ingot-magnesium", amount=12}
+      {type="item", name="angels-ingot-magnesium", amount=12}
     },
     results=
     {
@@ -93,7 +93,7 @@ if angelsmods.trigger.smelting_products["aluminium"].plate then
       ingredients =
       {
         {type="item", name="angels-ingot-aluminium", amount=12},
-        {type="item", name="ingot-magnesium", amount=12},
+        {type="item", name="angels-ingot-magnesium", amount=12},
         {type="item", name="angels-ingot-zinc", amount=12},
       },
       results=
@@ -122,7 +122,7 @@ if angelsmods.trigger.smelting_products["brass"].plate then
       {
         {type="item", name="angels-ingot-copper", amount=18},
         {type="item", name="angels-ingot-zinc", amount=12},
-        {type="item", name="solid-white-phosphorus", amount=6},
+        {type="item", name="angels-solid-white-phosphorus", amount=6},
       },
       results=
       {
@@ -140,7 +140,7 @@ if angelsmods.trigger.smelting_products["titanium"].plate then
   recipe[#recipe+1]=
   {
 		type = "recipe",
-		name = "sponge-magnesium-titanium-smelting",
+		name = "angels-sponge-magnesium-titanium-smelting",
 		category = "angels-chemical-smelting",
 		subgroup = "angels-titanium",
 		energy_required = 6,
@@ -162,7 +162,7 @@ if angelsmods.trigger.smelting_products["titanium"].plate then
   recipe[#recipe+1]=
   {
 		type = "recipe",
-		name = "pellet-magnesium-titanium-smelting",
+		name = "angels-pellet-magnesium-titanium-smelting",
 		category = "angels-chemical-smelting",
 		subgroup = "angels-titanium",
 		energy_required = 6,
@@ -170,7 +170,7 @@ if angelsmods.trigger.smelting_products["titanium"].plate then
 		ingredients =
 		{
 			{type="item", name="angels-pellet-titanium", amount=8},
-			{type="item", name="ingot-magnesium", amount=6},
+			{type="item", name="angels-ingot-magnesium", amount=6},
 		},
 		results=
 		{
diff --git a/Clowns-Processing/prototypes/recipes/bobs.lua b/Clowns-Processing/prototypes/recipes/bobs.lua
index 9909957..2423778 100644
--- a/Clowns-Processing/prototypes/recipes/bobs.lua
+++ b/Clowns-Processing/prototypes/recipes/bobs.lua
@@ -22,7 +22,7 @@ if data.raw.item["bronze-alloy"] and data.raw.item["angels-plate-nickel"] then
   )
 end
 --may want to look at adding a non-bobs/angels variant
---data.raw.item["platinum-ore"] and data.raw.item["gold-ore"] then
+--data.raw.item["angels-platinum-ore"] and data.raw.item["angels-gold-ore"] then
   data:extend(
   {
     {
@@ -43,7 +43,7 @@ end
         {type = "item", name = "iron-ore", amount = 1, probability = 0.2},
         {type = "item", name = "copper-ore", amount = 1, probability = 0.1},
         {type = "item", name = "angels-crystal-dust", amount = 1, probability = 0.1},
-        angelsmods.trigger.ores["gold"] and {type = "item", name = "bob-gold-ore", amount = 1, probability = 0.05} or {type = "item", name = "uranium-ore", amount = 1, probability = 0.001},
+        angelsmods.trigger.ores["gold"] and {type = "item", name = "angels-gold-ore", amount = 1, probability = 0.05} or {type = "item", name = "uranium-ore", amount = 1, probability = 0.001},
         {type = "item", name = "osmium-ore", amount = 1, probability = 0.01},
         angelsmods.trigger.ores["platinum"] and {type = "item", name = "angels-platinum-ore", amount = 1, probability = 0.01} or nil,
       },
diff --git a/Clowns-Processing/prototypes/recipes/petrochem.lua b/Clowns-Processing/prototypes/recipes/petrochem.lua
index 99001bc..910725d 100644
--- a/Clowns-Processing/prototypes/recipes/petrochem.lua
+++ b/Clowns-Processing/prototypes/recipes/petrochem.lua
@@ -11,7 +11,7 @@ data:extend(
 		ingredients =
 		{
 			{type = "fluid", name = "angels-water-purified", amount = 1000},
-			{type = "item", name = "catalyst-metal-violet", amount = 1}
+			{type = "item", name = "angels-catalyst-metal-violet", amount = 1}
 		},
 		results=
 		{
@@ -37,7 +37,7 @@ data:extend(
 		ingredients =
 		{
 			{type = "fluid", name = "angels-water-purified", amount = 1000},
-			{type = "item", name = "catalyst-metal-violet", amount = 1}
+			{type = "item", name = "angels-catalyst-metal-violet", amount = 1}
 		},
 		results =
 		{
@@ -64,7 +64,7 @@ data:extend(
 		ingredients =
 		{
 			{type = "fluid", name = "angels-gas-compressed-air", amount = 1000},
-			{type = "item", name = "catalyst-metal-violet", amount = 1}
+			{type = "item", name = "angels-catalyst-metal-violet", amount = 1}
 		},
 		results =
 		{
@@ -84,7 +84,7 @@ data:extend(
 		ingredients =
 		{
 			{type = "fluid", name = "angels-gas-compressed-air", amount = 1000},
-			{type = "item", name = "catalyst-metal-violet", amount = 1}
+			{type = "item", name = "angels-catalyst-metal-violet", amount = 1}
 		},
 		results =
 		{
@@ -126,14 +126,14 @@ data:extend(
 		},
 		results =
 		{
-			{type = "fluid", name = "gas-fluorine", amount = 40},
+			{type = "fluid", name = "angels-gas-fluorine", amount = 40},
 			{type = "fluid", name = "angels-gas-hydrogen", amount = 60}
 		},
-		icons = angelsmods.functions.create_gas_recipe_icon({"gas-fluorine","angels-gas-hydrogen"}, "FHH",{"angels-liquid-hydrofluoric-acid"}),
+		icons = angelsmods.functions.create_gas_recipe_icon({"angels-gas-fluorine","angels-gas-hydrogen"}, "FHH",{"angels-liquid-hydrofluoric-acid"}),
 	},
 	{
 		type = "recipe",
-		name = "catalyst-metal-violet",
+		name = "angels-catalyst-metal-violet",
 		category = "crafting-with-fluid",
 		subgroup = "angels-petrochem-catalysts",
 		energy_required = 2,
@@ -142,11 +142,11 @@ data:extend(
 		{
 			{type = "item", name = "angels-catalyst-metal-carrier", amount = 10},
 			{type = "item", name = clowns.special_vanilla and "angels-solid-sodium" or "angels-platinum-ore", amount = 1},
-			{type = "fluid", name = "liquid-mercury", amount = 10},
+			{type = "fluid", name = "angels-liquid-mercury", amount = 10},
 		},
 		results =
 		{
-			{type = "item", name = "catalyst-metal-violet", amount = 10},
+			{type = "item", name = "angels-catalyst-metal-violet", amount = 10},
 		},
 		icon = "__Clowns-Processing__/graphics/icons/catalyst-metal-violet.png",
 		icon_size = 32,
diff --git a/Clowns-Processing/prototypes/recipes/vanilla-recipes.lua b/Clowns-Processing/prototypes/recipes/vanilla-recipes.lua
index b2ead16..acff9de 100644
--- a/Clowns-Processing/prototypes/recipes/vanilla-recipes.lua
+++ b/Clowns-Processing/prototypes/recipes/vanilla-recipes.lua
@@ -13,7 +13,7 @@ if mods["angelsbioprocessing"] then
       energy_required = 4,
       ingredients =
       {
-        {type = "fluid", name = "liquid-dimethylmercury", amount = 100},
+        {type = "fluid", name = "angels-liquid-dimethylmercury", amount = 100},
         {type = "item", name = "steel-plate", amount = 2},
         {type = "item", name = "plastic-bar", amount = 5},
         {type = "item", name = "processing-unit", amount = 2},
@@ -85,7 +85,7 @@ data:extend(
     },
     results=
     {
-      {type = "item", name = "pellet-depleted-uranium", amount = 4},
+      {type = "item", name = "angels-pellet-depleted-uranium", amount = 4},
     },
     order = "b",
   },
@@ -99,11 +99,11 @@ data:extend(
     enabled = false,
     ingredients =
     {
-      {type = "item", name = "pellet-depleted-uranium", amount = 8},
+      {type = "item", name = "angels-pellet-depleted-uranium", amount = 8},
     },
     results=
     {
-      {type = "item", name = "powder-depleted-uranium", amount = 24},
+      {type = "item", name = "angels-powder-depleted-uranium", amount = 24},
     },
     order = "d",
   },
@@ -117,7 +117,7 @@ data:extend(
     enabled = false,
     ingredients =
     {
-      {type = "item", name = "powder-depleted-uranium", amount = 12},
+      {type = "item", name = "angels-powder-depleted-uranium", amount = 12},
     },
     results=
     {
@@ -136,8 +136,8 @@ data:extend(
     enabled = false,
     ingredients =
     {
-      {type = "item", name = "powder-depleted-uranium", amount = 12},
-      {type = "item", name = "powder-osmium", amount = 12},
+      {type = "item", name = "angels-powder-depleted-uranium", amount = 12},
+      {type = "item", name = "angels-powder-osmium", amount = 12},
     },
     results =
     {
@@ -155,7 +155,7 @@ data:extend(
     enabled = false,
     ingredients =
     {
-      {type = "item", name = "powder-depleted-uranium", amount = 12},
+      {type = "item", name = "angels-powder-depleted-uranium", amount = 12},
       {type = "item", name = "angels-powder-aluminium", amount = 12},
     },
     results =
@@ -174,8 +174,8 @@ data:extend(
     enabled = false,
     ingredients =
     {
-      {type = "item", name = "powder-depleted-uranium", amount = 12},
-      {type = "item", name = "powder-osmium", amount = 12},
+      {type = "item", name = "angels-powder-depleted-uranium", amount = 12},
+      {type = "item", name = "angels-powder-osmium", amount = 12},
       {type = "item", name = "angels-powder-aluminium", amount = 12},
     },
     results =
@@ -239,7 +239,7 @@ data:extend(
     },
 		results =
 		{
-			{type = "item", name = "pellet-magnesium", amount = 4},
+			{type = "item", name = "angels-pellet-magnesium", amount = 4},
 		},
 		order = "b",
   },
@@ -253,14 +253,14 @@ data:extend(
 		enabled = false,
 		ingredients =
 		{
-			{type = "item", name = "pellet-magnesium", amount = 8},
+			{type = "item", name = "angels-pellet-magnesium", amount = 8},
 			{type = "item", name = "angels-solid-coke", amount = 2},
 			{type = "item", name = "angels-solid-limestone", amount = 2},
 			{type = "fluid", name = "angels-liquid-hydrochloric-acid", amount = 30}
 		},
 		results =
 		{
-			{type = "item", name = "ingot-magnesium", amount = 24},
+			{type = "item", name = "angels-ingot-magnesium", amount = 24},
 			{type = "item", name = "angels-solid-calcium-chloride", amount = 2},
 		},
 		icon = "__Clowns-Processing__/graphics/icons/ingot-magnesium.png",
@@ -277,11 +277,11 @@ data:extend(
 		enabled = false,
 		ingredients =
 		{
-		  {type = "item", name = "ingot-magnesium", amount = 12},
+		  {type = "item", name = "angels-ingot-magnesium", amount = 12},
 		},
 		results =
 		{
-		  {type = "fluid", name = "liquid-molten-magnesium", amount = 120},
+		  {type = "fluid", name = "angels-liquid-molten-magnesium", amount = 120},
 		},
 		icon_size = 32,
 		order = "i",
@@ -296,7 +296,7 @@ data:extend(
     energy_required = 4,
     ingredients =
     {
-      {type = "fluid", name = "liquid-molten-magnesium", amount = 40}
+      {type = "fluid", name = "angels-liquid-molten-magnesium", amount = 40}
     },
     results =
     {
@@ -311,7 +311,7 @@ data:extend(
   --Mercury from thermal
   {
     type = "recipe",
-    name = "thermal-filtering-mercury",
+    name = "angels-thermal-filtering-mercury",
     category = "angels-water-treatment",
     subgroup = "angels-water-treatment",
     enabled = false,
@@ -322,12 +322,12 @@ data:extend(
     },
     results =
     {
-      {type = "fluid", name = "liquid-mercury", amount = 40},
+      {type = "fluid", name = "angels-liquid-mercury", amount = 40},
       {type = "fluid", name = "angels-water-purified", amount = 60},
     },
     icons = angelsmods.functions.create_liquid_recipe_icon({
       "angels-water-purified",
-      "liquid-mercury",
+      "angels-liquid-mercury",
     }, {{238,113,22},{203,99,15},{167,78,13}}),
     order = "h"
   },
@@ -346,13 +346,13 @@ if mods["angelsbioprocessing"] then
       energy_required = 10,
       ingredients =
       {
-        {type = "fluid", name = "liquid-mercury", amount = 10},
+        {type = "fluid", name = "angels-liquid-mercury", amount = 10},
         {type = "fluid", name = "angels-gas-chlor-methane", amount = 20},
         {type = "item", name = "angels-solid-sodium", amount = 2},
       },
       results =
       {
-        {type = "fluid", name = "liquid-dimethylmercury", amount = 10},
+        {type = "fluid", name = "angels-liquid-dimethylmercury", amount = 10},
         {type = "item", name = "angels-solid-salt", amount = 2},
       },
       icons = angelsmods.functions.create_viscous_liquid_recipe_icon(
@@ -403,7 +403,7 @@ data:extend(
     },
 		results =
 		{
-			{type = "item", name = "pellet-osmium", amount = 4},
+			{type = "item", name = "angels-pellet-osmium", amount = 4},
 		},
 		order = "b",
   },
@@ -418,14 +418,14 @@ data:extend(
 		enabled = false,
 		ingredients =
 		{
-			{type = "item", name = "pellet-osmium", amount = 8},
+			{type = "item", name = "angels-pellet-osmium", amount = 8},
 		},
 		results =
 		{
-			{type = "item", name = "powder-osmium", amount = 24},
+			{type = "item", name = "angels-powder-osmium", amount = 24},
 			{type = "item", name = "angels-solid-salt", amount = 6},
 		},
-    icons = angelsmods.functions.get_object_icons("powder-osmium"),
+    icons = angelsmods.functions.get_object_icons("angels-powder-osmium"),
 		order = "d",
   },
 	--powder-mix
@@ -438,7 +438,7 @@ data:extend(
 		enabled = false,
 		ingredients =
 		{
-			{type = "item", name = "powder-osmium", amount = 8},
+			{type = "item", name = "angels-powder-osmium", amount = 8},
       {type = "item", name = "angels-solid-sodium-hydroxide", amount = 8},
 		},
 		results =
@@ -523,7 +523,7 @@ data:extend(
     },
     results =
     {
-      {type = "item", name = "solid-white-phosphorus", amount = 24},--Should make phosphorus gas
+      {type = "item", name = "angels-solid-white-phosphorus", amount = 24},--Should make phosphorus gas
       {type = "fluid", name = "angels-gas-carbon-monoxide", amount = 10}
     },
   },
@@ -531,7 +531,7 @@ data:extend(
   {
     type = "recipe",
     name = "phosphoric-acid-1",
-    icons = angelsmods.functions.create_liquid_recipe_icon({"liquid-phosphoric-acid"}, {{ r = 244, g = 125, b = 001 },{ 242, 242, 242 },{ 214, 012, 012 }}), 
+    icons = angelsmods.functions.create_liquid_recipe_icon({"angels-liquid-phosphoric-acid"}, {{ r = 244, g = 125, b = 001 },{ 242, 242, 242 },{ 214, 012, 012 }}), 
     category = "chemistry",
     subgroup = "clowns-phosphorus",
     order = "b",
@@ -545,7 +545,7 @@ data:extend(
     },
     results =
     {
-      {type = "fluid", name = "liquid-phosphoric-acid", amount = 10},
+      {type = "fluid", name = "angels-liquid-phosphoric-acid", amount = 10},
       {type = "item", name = "angels-solid-calcium-sulfate", amount = 1}
     },
   },
@@ -563,12 +563,12 @@ data:extend(
     allow_decomposition = false,
     ingredients =
     {
-      {type = "item", name = "solid-white-phosphorus", amount = 24},--24 phosphorus ore
-      {type = "fluid", name = "liquid-phosphoric-acid", amount = 10},--8 phosphorus ore
+      {type = "item", name = "angels-solid-white-phosphorus", amount = 24},--24 phosphorus ore
+      {type = "fluid", name = "angels-liquid-phosphoric-acid", amount = 10},--8 phosphorus ore
     },
     results =
     {
-      {type = "fluid", name = "liquid-phosphoric-acid", amount = 60},--48 phosphorus ore i.e. 33% productivity gain
+      {type = "fluid", name = "angels-liquid-phosphoric-acid", amount = 60},--48 phosphorus ore i.e. 33% productivity gain
     },
   },
   --------------------------
@@ -625,7 +625,7 @@ data:extend(
     category = "centrifuging",
     ingredients = 
     {
-      {type = "item", name = "solid-uranium-hexafluoride", amount = 8} --20% less ingredients than vanilla
+      {type = "item", name = "angels-solid-uranium-hexafluoride", amount = 8} --20% less ingredients than vanilla
     },
     icons = 
     {
@@ -643,7 +643,7 @@ data:extend(
   --hexafluoride production
 	{
 		type = "recipe",
-		name = "solid-uranium-hexafluoride",
+		name = "angels-solid-uranium-hexafluoride",
 		icon = "__Clowns-Processing__/graphics/icons/solid-uranium-hexafluoride.png",
 		icon_size = 32,
 		category = "chemistry",
@@ -654,18 +654,18 @@ data:extend(
 		allow_decomposition = false,
 		ingredients =
 		{
-			{type = "item", name = "solid-uranium-tetrafluoride", amount = 12},
-			{type = "fluid", name = "gas-fluorine", amount = 10}
+			{type = "item", name = "angels-solid-uranium-tetrafluoride", amount = 12},
+			{type = "fluid", name = "angels-gas-fluorine", amount = 10}
 		},
 		results =
 		{
-			{type = "item", name = "solid-uranium-hexafluoride", amount = 12}
+			{type = "item", name = "angels-solid-uranium-hexafluoride", amount = 12}
 		},
   },
   --tetrafluoride
 	{
 		type = "recipe",
-		name = "solid-uranium-tetrafluoride",
+		name = "angels-solid-uranium-tetrafluoride",
 		icon = "__Clowns-Processing__/graphics/icons/solid-uranium-tetrafluoride.png",
 		icon_size = 32,
 		category = "chemistry",
@@ -676,18 +676,18 @@ data:extend(
 		allow_decomposition = false,
 		ingredients =
 		{
-			{type = "item", name = "solid-uranium-oxide", amount = 12},
+			{type = "item", name = "angels-solid-uranium-oxide", amount = 12},
 			{type = "fluid", name = "angels-liquid-hydrofluoric-acid", amount = 10}
 		},
 		results =
 		{
-			{type = "item", name = "solid-uranium-tetrafluoride", amount = 12}
+			{type = "item", name = "angels-solid-uranium-tetrafluoride", amount = 12}
 		},
   },
   --uranium oxide
 	{
 		type = "recipe",
-		name = "solid-uranium-oxide-1",
+		name = "angels-solid-uranium-oxide-1",
 		icon = "__Clowns-Processing__/graphics/icons/solid-uranium-oxide.png",
 		icon_size = 32,
 		category = "angels-chemical-smelting-3",
@@ -703,15 +703,15 @@ data:extend(
 		},
 		results =
 		{
-			{type = "item", name = "solid-uranium-oxide", amount = 24}
+			{type = "item", name = "angels-solid-uranium-oxide", amount = 24}
 		},
     icons = angelsmods.functions.add_number_icon_layer(
-      angelsmods.functions.get_object_icons("solid-uranium-oxide"),
+      angelsmods.functions.get_object_icons("angels-solid-uranium-oxide"),
       1, angelsmods.smelting.number_tint),
 	},
 	{
 		type = "recipe",
-		name = "solid-uranium-oxide-2",
+		name = "angels-solid-uranium-oxide-2",
 		icon = "__Clowns-Processing__/graphics/icons/solid-uranium-oxide.png",
 		icon_size = 32,
 		category = "angels-chemical-smelting-4",
@@ -722,21 +722,21 @@ data:extend(
 		allow_decomposition = false,
 		ingredients =
 		{
-			{type = "item", name = "solid-ammonium-diuranate", amount = 24},
+			{type = "item", name = "angels-solid-ammonium-diuranate", amount = 24},
 			{type = "fluid", name = "angels-gas-hydrogen", amount = 40}
 		},
 		results =
 		{
-			{type = "item", name = "solid-uranium-oxide", amount = 24},
+			{type = "item", name = "angels-solid-uranium-oxide", amount = 24},
 		},
     icons = angelsmods.functions.add_number_icon_layer(
-      angelsmods.functions.get_object_icons("solid-uranium-oxide"),
+      angelsmods.functions.get_object_icons("angels-solid-uranium-oxide"),
       2, angelsmods.smelting.number_tint),
   },
   --diuranate
 	{
 		type = "recipe",
-		name = "solid-ammonium-diuranate",
+		name = "angels-solid-ammonium-diuranate",
 		icon = "__Clowns-Processing__/graphics/icons/solid-ammonium-diuranate.png",
 		icon_size = 32,
 		category = "chemistry",
@@ -747,18 +747,18 @@ data:extend(
 		allow_decomposition = false,
 		ingredients =
 		{
-			{type = "item", name = "solid-uranyl-nitrate", amount = 12},
+			{type = "item", name = "angels-solid-uranyl-nitrate", amount = 12},
 			{type = "fluid", name = "angels-gas-ammonia", amount = 10}
 		},
 		results =
 		{
-			{type = "item", name = "solid-ammonium-diuranate", amount = 12}
+			{type = "item", name = "angels-solid-ammonium-diuranate", amount = 12}
 		},
   },
   --uranyl-nitrate
 	{
 		type = "recipe",
-		name = "solid-uranyl-nitrate",
+		name = "angels-solid-uranyl-nitrate",
 		icon = "__Clowns-Processing__/graphics/icons/solid-uranyl-nitrate.png",
 		icon_size = 32,
 		category = "chemistry",
@@ -774,7 +774,7 @@ data:extend(
 		},
 		results =
 		{
-			{type = "item", name = "solid-uranyl-nitrate", amount = 12}
+			{type = "item", name = "angels-solid-uranyl-nitrate", amount = 12}
 		},
 	},
   --Osmium Bullets
diff --git a/Clowns-Processing/prototypes/technology-updates.lua b/Clowns-Processing/prototypes/technology-updates.lua
index c816cee..6a45168 100644
--- a/Clowns-Processing/prototypes/technology-updates.lua
+++ b/Clowns-Processing/prototypes/technology-updates.lua
@@ -6,13 +6,13 @@ local unlock_lists = {
   {"angels-advanced-chemistry-3","catalytic-air-separation-nitrogen"},
   {"angels-advanced-chemistry-3","catalytic-water-separation-oxygen"},
   {"angels-advanced-chemistry-3","catalytic-water-separation-hydrogen"},
-  {"angels-advanced-chemistry-3","catalyst-metal-violet"},
-  {"water-washing-1","sluicer"},
-  {"water-treatment-4","intermediate-salination"},
+  {"angels-advanced-chemistry-3","angels-catalyst-metal-violet"},
+  {"angels-water-washing-1","sluicer"},
+  {"angels-water-treatment-4","intermediate-salination"},
 }
 if data.raw.recipe["sand-sluicing"] then
-  table.insert(unlock_lists,{"water-washing-1","sand-sluicing"})
-  table.insert(unlock_lists,{"water-washing-2","sluicer-2"})
+  table.insert(unlock_lists,{"angels-water-washing-1","sand-sluicing"})
+  table.insert(unlock_lists,{"angels-water-washing-2","sluicer-2"})
 end
 if data.raw.recipe["nickel-piercing-rounds-magazine"] then
   table.insert(unlock_lists,{"military-2","nickel-piercing-rounds-magazine"})
@@ -30,8 +30,8 @@ if data.raw.recipe["angels-brass-smelting-4"] then
   table.insert(unlock_lists,{"angels-brass-smelting-3","angels-brass-smelting-4"})
 end
 if angelsmods.trigger.smelting_products["titanium"].plate then
-  table.insert(unlock_lists,{"angels-titanium-smelting-2","sponge-magnesium-titanium-smelting"})
-  table.insert(unlock_lists,{"angels-titanium-smelting-3","pellet-magnesium-titanium-smelting"})
+  table.insert(unlock_lists,{"angels-titanium-smelting-2","angels-sponge-magnesium-titanium-smelting"})
+  table.insert(unlock_lists,{"angels-titanium-smelting-3","angels-pellet-magnesium-titanium-smelting"})
   if data.raw.technology["angels-sodium-processing"] then
     OV.add_prereq("angels-titanium-smelting-2", "angels-sodium-processing")
   else
diff --git a/Clowns-Processing/prototypes/technology/mercury.lua b/Clowns-Processing/prototypes/technology/mercury.lua
index 4e2b71c..8beccdc 100644
--- a/Clowns-Processing/prototypes/technology/mercury.lua
+++ b/Clowns-Processing/prototypes/technology/mercury.lua
@@ -9,7 +9,7 @@ data:extend(
 		{
 			{
 				type = "unlock-recipe",
-				recipe = "thermal-filtering-mercury"
+				recipe = "angels-thermal-filtering-mercury"
 			},
 		},
 		prerequisites = {"angels-thermal-water-extraction-2"},
diff --git a/Clowns-Processing/prototypes/technology/salination.lua b/Clowns-Processing/prototypes/technology/salination.lua
index bdfbfd5..b0a34a6 100644
--- a/Clowns-Processing/prototypes/technology/salination.lua
+++ b/Clowns-Processing/prototypes/technology/salination.lua
@@ -2,7 +2,7 @@ data:extend(
 {
 	{
 		type = "technology",
-		name = "water-treatment-5",
+		name = "angels-water-treatment-5",
 		icon = "__angelsrefininggraphics__/graphics/technology/water-treatment.png",
 		icon_size = 128,
 		prerequisites =
diff --git a/Clowns-Processing/prototypes/technology/uranium.lua b/Clowns-Processing/prototypes/technology/uranium.lua
index 0a9bf5d..6a4a08d 100644
--- a/Clowns-Processing/prototypes/technology/uranium.lua
+++ b/Clowns-Processing/prototypes/technology/uranium.lua
@@ -13,15 +13,15 @@ data:extend(
 			},
 			{
 				type = "unlock-recipe",
-				recipe = "solid-uranium-hexafluoride"
+				recipe = "angels-solid-uranium-hexafluoride"
 			},
 			{
 				type = "unlock-recipe",
-				recipe = "solid-uranium-tetrafluoride"
+				recipe = "angels-solid-uranium-tetrafluoride"
 			},
 			{
 				type = "unlock-recipe",
-				recipe = "solid-uranium-oxide-1"
+				recipe = "angels-solid-uranium-oxide-1"
 			},
 		},
 		prerequisites = {"nuclear-power", "angels-advanced-chemistry-4", "angels-metallurgy-4"},
@@ -49,15 +49,15 @@ data:extend(
 		{
 			{
 				type = "unlock-recipe",
-				recipe = "solid-uranium-oxide-2"
+				recipe = "angels-solid-uranium-oxide-2"
 			},
 			{
 				type = "unlock-recipe",
-				recipe = "solid-ammonium-diuranate"
+				recipe = "angels-solid-ammonium-diuranate"
 			},
 			{
 				type = "unlock-recipe",
-				recipe = "solid-uranyl-nitrate"
+				recipe = "angels-solid-uranyl-nitrate"
 			},
 		},
 		prerequisites = {"advanced-uranium-processing-1", "angels-metallurgy-5"},
diff --git a/Clowns-Science/prototypes/buildings/facility.lua b/Clowns-Science/prototypes/buildings/facility.lua
index deac9a9..f1469fa 100644
--- a/Clowns-Science/prototypes/buildings/facility.lua
+++ b/Clowns-Science/prototypes/buildings/facility.lua
@@ -9,7 +9,7 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 		energy_required = 2,
 		ingredients =
 		{
-			mods["bobelectronics"] and {"basic-circuit-board", 20} or {"electronic-circuit",30},
+			mods["bobelectronics"] and {"angels-basic-circuit-board", 20} or {"electronic-circuit",30},
 			{"pipe", 20},
 			{"stone-brick", 100}
 		},
diff --git a/Clowns-Science/prototypes/fallback-data.lua b/Clowns-Science/prototypes/fallback-data.lua
index df5c3ea..44a1314 100644
--- a/Clowns-Science/prototypes/fallback-data.lua
+++ b/Clowns-Science/prototypes/fallback-data.lua
@@ -216,7 +216,7 @@ Ings refers to how many ingredients per pack in final step]]
     ["military_2"]   = {theme="aoe", result_count = 4, ingredients = {
         {"explosives",1}, 
         {"shotgun",2}, 
-        {"stone-wall",3}
+        {"angels-stone-wall",3}
       }},--24375
     ["military_3"]   = {theme="wall", result_count = 9, ingredients = {
         {"gun-turret",1}, 
@@ -237,7 +237,7 @@ Ings refers to how many ingredients per pack in final step]]
       }},
     ["chemical_2"]   = {theme="fuel", result_count = 2, ingredients = {
         {"plastic-bar",2},
-        {"solid-fuel",6},
+        {"angels-solid-fuel",6},
         {"long-handed-inserter", 1},
         {"concrete",10}
       }},
@@ -308,7 +308,7 @@ local function update_tab(name,pos,new_ing)
 end
 --The order here is important, as the lower configs will "override" the higher ones if multiples are targetting the same item
 if mods["boblogistics"] then
-  update_tab("automation_1", 2, {"stone-pipe", 5})
+  update_tab("automation_1", 2, {"angels-stone-pipe", 5})
   if ctrig.bobplates then
     update_tab("logistic_4", 1, {"bronze-pipe-to-ground", 1})
     update_tab("chemical_4", 3, {"brass-pipe-to-ground", 1})
@@ -346,13 +346,13 @@ if mods["angelspetrochem"] then
   update_tab("production_3", 3, {"rocket-booster", 5})
 end
 if mods["angelsrefining"] then
-  update_tab("production_3", 2, {"ore-crusher", 2})
+  update_tab("production_3", 2, {"angels-ore-crusher", 2})
 end
 if mods["angelssmelting"] then
   update_tab("production_2", 1, {"angels-plate-manganese", 1})
-  update_tab("production_1", 3, {"blast-furnace", 1})
-  update_tab("production_3", 1, {"blast-furnace-2", 1})
-  update_tab("production_3", 4, {"reinforced-concrete-brick", 50})
+  update_tab("production_1", 3, {"angels-blast-furnace", 1})
+  update_tab("production_3", 1, {"angels-blast-furnace-2", 1})
+  update_tab("production_3", 4, {"angels-reinforced-concrete-brick", 50})
 end
 if mods["Clowns-processing"] then
   update_tab("production_2", 2, {"clowns-plate-osmium", 1})
diff --git a/Clowns-Science/prototypes/items/petrochem-extensions.lua b/Clowns-Science/prototypes/items/petrochem-extensions.lua
index ce15981..481eeb3 100644
--- a/Clowns-Science/prototypes/items/petrochem-extensions.lua
+++ b/Clowns-Science/prototypes/items/petrochem-extensions.lua
@@ -2,7 +2,7 @@ data:extend(
 {
 	{
 		type = "item",
-		name = "catalyst-metal-white",
+		name = "angels-catalyst-metal-white",
 		icon = "__angelspetrochem__/graphics/icons/catalyst-metal-blue.png",
 		icon_size = 32,
 		subgroup = "petrochem-raw",
@@ -12,7 +12,7 @@ data:extend(
 
 	{
 		type = "item",
-		name = "catalyst-metal-black",
+		name = "angels-catalyst-metal-black",
 		icon = "__angelspetrochem__/graphics/icons/catalyst-metal-blue.png",
 		icon_size = 32,
 		subgroup = "petrochem-raw",
diff --git a/Clowns-Science/prototypes/overrides.lua b/Clowns-Science/prototypes/overrides.lua
index a92fa45..0f3894d 100644
--- a/Clowns-Science/prototypes/overrides.lua
+++ b/Clowns-Science/prototypes/overrides.lua
@@ -69,9 +69,9 @@ if data.raw.recipe["omni-pack"] then
 	data.raw["tool"]["omni-pack"].order = "e-a"
 end
 
-local new_ing = "gas-carbon-monoxide"
-if data.raw.fluid["liquid-mercury"] then
-  new_ing = "liquid-mercury"
+local new_ing = "angels-gas-carbon-monoxide"
+if data.raw.fluid["angels-liquid-mercury"] then
+  new_ing = "angels-liquid-mercury"
 end
 for i,rec in pairs({"utility-science-pack-facility","advanced-logistic-science-pack-facility","production-science-pack-facility"}) do
   if data.raw.recipe[rec] then
@@ -104,14 +104,14 @@ if mods["angelspetrochem"] then
 end
 if not (mods["angelsindustries"] and angelsmods.industries.tech) then
   if mods["omnimatter_crystal"] then
-    omni.lib.add_recipe_ingredient("chemical-science-pack-alt1","basic-crystallonic")
-    omni.lib.add_recipe_ingredient("chemical-science-pack-alt2","basic-crystallonic")
-    omni.lib.add_recipe_ingredient("production-science-pack-alt1","basic-oscillo-crystallonic")
-    omni.lib.add_recipe_ingredient("production-science-pack-alt2","basic-oscillo-crystallonic")
-    omni.lib.add_recipe_ingredient("utility-science-pack-alt1","basic-oscillo-crystallonic")
-    omni.lib.add_recipe_ingredient("utility-science-pack-alt2","basic-oscillo-crystallonic")
-    omni.lib.add_recipe_ingredient("logistic-science-pack-alt1","basic-oscillo-crystallonic")
-		omni.lib.add_recipe_ingredient("logistic-science-pack-alt2","basic-oscillo-crystallonic")
+    omni.lib.add_recipe_ingredient("chemical-science-pack-alt1","angels-basic-crystallonic")
+    omni.lib.add_recipe_ingredient("chemical-science-pack-alt2","angels-basic-crystallonic")
+    omni.lib.add_recipe_ingredient("production-science-pack-alt1","angels-basic-oscillo-crystallonic")
+    omni.lib.add_recipe_ingredient("production-science-pack-alt2","angels-basic-oscillo-crystallonic")
+    omni.lib.add_recipe_ingredient("utility-science-pack-alt1","angels-basic-oscillo-crystallonic")
+    omni.lib.add_recipe_ingredient("utility-science-pack-alt2","angels-basic-oscillo-crystallonic")
+    omni.lib.add_recipe_ingredient("logistic-science-pack-alt1","angels-basic-oscillo-crystallonic")
+		omni.lib.add_recipe_ingredient("logistic-science-pack-alt2","angels-basic-oscillo-crystallonic")
   end
   if mods["bobtech"] and settings.startup["bobmods-burnerphase"].value == true then
     data.raw.recipe["automation-science-pack-alt1"].enabled=false
diff --git a/Clowns-Science/prototypes/recipes/facility.lua b/Clowns-Science/prototypes/recipes/facility.lua
index 384e3c4..ca10a00 100644
--- a/Clowns-Science/prototypes/recipes/facility.lua
+++ b/Clowns-Science/prototypes/recipes/facility.lua
@@ -23,7 +23,7 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 			icons = {new_icons["advanced-logistics"],overlay},
 			ingredients =
 			{
-				{type="fluid", name="liquid-nitric-acid", amount=gas_param},
+				{type="fluid", name="angels-liquid-nitric-acid", amount=gas_param},
 			},
 			result = clowns.triggers.angels_tech and "datacore-enhance-1" or "bob-advanced-logistic-science-pack"
 		}
@@ -46,7 +46,7 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 			ingredients =
 			{
 				{type="fluid", name="omniston", amount=gas_param},
-				{type="fluid", name="gas-carbon-dioxide", amount=gas_param}
+				{type="fluid", name="angels-gas-carbon-dioxide", amount=gas_param}
 			},
 			result = "omni-pack"
 		}
@@ -67,8 +67,8 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 			icons = {new_icons.automation,overlay},
 			ingredients =
 			{
-				{type="fluid", name="gas-oxygen", amount=gas_param},
-				{type="fluid", name="gas-carbon-dioxide", amount=gas_param}
+				{type="fluid", name="angels-gas-oxygen", amount=gas_param},
+				{type="fluid", name="angels-gas-carbon-dioxide", amount=gas_param}
 			},
 			result = clowns.triggers.angels_tech and "datacore-basic" or "automation-science-pack"
 		},
@@ -84,8 +84,8 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 			icons = {new_icons.logistic,overlay},
 			ingredients =
 			{
-				{type="fluid", name="gas-chlorine", amount=gas_param},
-				{type="fluid", name="gas-carbon-dioxide", amount=gas_param}
+				{type="fluid", name="angels-gas-chlorine", amount=gas_param},
+				{type="fluid", name="angels-gas-carbon-dioxide", amount=gas_param}
 			},
 			result = clowns.triggers.angels_tech and "datacore-logistic-1" or "logistic-science-pack"
 		},
@@ -100,8 +100,8 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 			icons = {new_icons.chemical,overlay},
 			ingredients =
 			{
-				{type="fluid", name="gas-ammonia", amount=gas_param},
-				{type="fluid", name="gas-carbon-monoxide", amount=gas_param}
+				{type="fluid", name="angels-gas-ammonia", amount=gas_param},
+				{type="fluid", name="angels-gas-carbon-monoxide", amount=gas_param}
 			},
 			result = clowns.triggers.angels_tech and "datacore-energy-1" or "chemical-science-pack"
 		},
@@ -116,8 +116,8 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 			icons = {new_icons.military,overlay},
 			ingredients =
 			{
-				{type="fluid", name="liquid-sulfuric-acid", amount=gas_param},
-				{type="fluid", name="gas-carbon-monoxide", amount=gas_param}
+				{type="fluid", name="angels-liquid-sulfuric-acid", amount=gas_param},
+				{type="fluid", name="angels-gas-carbon-monoxide", amount=gas_param}
 			},
 			result = clowns.triggers.angels_tech and "datacore-war-1" or "military-science-pack"
 		},
@@ -132,7 +132,7 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 			icons = {new_icons.production,overlay},
 			ingredients =
 			{
-				{type="fluid", name="gas-methanol", amount=gas_param},
+				{type="fluid", name="angels-gas-methanol", amount=gas_param},
 			},
 			result = clowns.triggers.angels_tech and "datacore-processing-1" or "production-science-pack"
 		},
@@ -147,7 +147,7 @@ if mods["angelspetrochem"] then --i may also activate these with pyanodons
 			icons = {new_icons.utility,overlay},
 			ingredients =
 			{
-				{type="fluid", name="liquid-hydrofluoric-acid", amount=gas_param},
+				{type="fluid", name="angels-liquid-hydrofluoric-acid", amount=gas_param},
 			},
 			result = clowns.triggers.angels_tech and "datacore-enhance-1" or "utility-science-pack"
 		},