diff --git a/Chromium2/data-util.lua b/Chromium2/data-util.lua
index 15f95e8..debafa9 100644
--- a/Chromium2/data-util.lua
+++ b/Chromium2/data-util.lua
@@ -11,7 +11,7 @@ function util.se_landfill(params)
         type = "recipe",
         icons = {
           { icon = "__base__/graphics/icons/landfill.png", icon_size = 64, icon_mipmaps = 3 },
-          { icon = "__Chromium__/graphics/icons/"..params.ore..".png", icon_size = params.icon_size, scale = 0.33*64/params.icon_size},
+          { icon = "__Chromium2__/graphics/icons/"..params.ore..".png", icon_size = params.icon_size, scale = 0.33*64/params.icon_size},
         },
         energy_required = 1,
         enabled=false,
@@ -48,7 +48,7 @@ function util.se_matter(params)
          icon_size = 64, scale = 0.5},
         {icon = "__space-exploration-graphics__/graphics/icons/fluid/particle-stream.png",
          icon_size = 64,  scale = 0.33, shift = {8,-8}},
-        {icon = "__Chromium__/graphics/icons/"..params.ore..".png",
+        {icon = "__Chromium2__/graphics/icons/"..params.ore..".png",
          icon_size = params.icon_size, scale = 0.33 * 64/params.icon_size, shift={-8, 8}},
         {icon = "__space-exploration-graphics__/graphics/icons/transition-arrow.png",
          icon_size = 64, scale = 0.5},
@@ -87,7 +87,7 @@ function util.se_matter(params)
            icon_size = 64, scale = 0.5},
           {icon = "__space-exploration-graphics__/graphics/icons/fluid/particle-stream.png",
            icon_size = 64,  scale = 0.33, shift = {-8,8}},
-          {icon = "__Chromium__/graphics/icons/"..params.ore..".png",
+          {icon = "__Chromium2__/graphics/icons/"..params.ore..".png",
            icon_size = params.icon_size, scale = 0.33 * 64/params.icon_size, shift={8, -8}},
           {icon = "__space-exploration-graphics__/graphics/icons/transition-arrow.png",
            icon_size = 64, scale = 0.5},
diff --git a/Chromium2/prototypes/chromite-ore.lua b/Chromium2/prototypes/chromite-ore.lua
index 2b685e4..a30dfcf 100644
--- a/Chromium2/prototypes/chromite-ore.lua
+++ b/Chromium2/prototypes/chromite-ore.lua
@@ -1,6 +1,9 @@
-local resource_autoplace = require('resource-autoplace')
+local resource_autoplace = require('resource-autoplace');
+local item_sounds = require('__base__.prototypes.item_sounds')
 
-local util = require("data-util")
+data.raw.planet.nauvis.map_gen_settings.autoplace_controls["chromite-ore"] = {}
+data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["chromite-ore"] = {}
+resource_autoplace.initialize_patch_set("chromite-ore", true)
 
 data:extend({
   {
@@ -10,16 +13,12 @@ data:extend({
     richness = true,
     order = "b-e"
   },
-  {
-    type = "noise-layer",
-    name = "chromite-ore"
-  },
   {
     type = "resource",
     icon_size = 64,
     icon_mipmaps = 3,
     name = "chromite-ore",
-    icon = "__Chromium__/graphics/icons/chromite-ore.png",
+    icon = "__Chromium2__/graphics/icons/chromite-ore.png",
     flags = { "placeable-neutral" },
     order = "a-b-a",
     map_color = { r = 0.90, g = 0.80, b = 1.00 },
@@ -48,7 +47,7 @@ data:extend({
     {
       sheet =
       {
-        filename = "__Chromium__/graphics/entity/ores/hr-chromite-ore.png",
+        filename = "__Chromium2__/graphics/entity/ores/hr-chromite-ore.png",
         priority = "extra-high",
         size = 128,
         frame_count = 8,
@@ -62,9 +61,13 @@ data:extend({
     name = "chromite-ore",
     icon_size = 64,
     icon_mipmaps = 3,
-    icon = "__Chromium__/graphics/icons/chromite-ore.png",
+    icon = "__Chromium2__/graphics/icons/chromite-ore.png",
     subgroup = "raw-resource",
     order = "t-c-a",
-    stack_size = 50
+    stack_size = 50,
+    weight = 20*kg,
+    inventory_move_sound = item_sounds.resource_inventory_move,
+    pick_sound = item_sounds.resource_inventory_pickup,
+    drop_sound = item_sounds.resource_inventory_move,
   },
 })
diff --git a/Chromium2/prototypes/chromium-248k.lua b/Chromium2/prototypes/chromium-248k.lua
index b808d25..c3a919f 100644
--- a/Chromium2/prototypes/chromium-248k.lua
+++ b/Chromium2/prototypes/chromium-248k.lua
@@ -12,14 +12,14 @@ data:extend({
         flow_color = { r=0.92, g=0.29, b=0.22 },
         pressure_to_speed_ratio = 0.400,
         flow_to_energy_ratio = 0,
-        icon = "__Chromium__/graphics/icons/fi-arc-pure-chrome.png",
+        icon = "__Chromium2__/graphics/icons/fi-arc-pure-chrome.png",
         icon_size = 64, icon_mipmaps = 4,
         order = "a-a"
     },
     {
         type = "item",
         name = "fi-materials-pure-chrome",
-        icon = "__Chromium__/graphics/icons/fi-materials-pure-chrome.png",
+        icon = "__Chromium2__/graphics/icons/fi-materials-pure-chrome.png",
         icon_size = 64,
         stack_size = 100,
         subgroup = "fi_item_subgroup_a-c",
@@ -45,9 +45,9 @@ data:extend({
         icons = (mods["Krastorio2"] and
         {
           { icon = "__248k__/ressources/fluids/el_dirty_water.png", icon_size = 64},
-          { icon = "__Chromium__/graphics/icons/chromite-ore.png", icon_size = 64, scale=0.2, shift= {-8, -8}},
+          { icon = "__Chromium2__/graphics/icons/chromite-ore.png", icon_size = 64, scale=0.2, shift= {-8, -8}},
         } or {
-          { icon = "__Chromium__/graphics/icons/chromite-ore.png", icon_size = 64},
+          { icon = "__Chromium2__/graphics/icons/chromite-ore.png", icon_size = 64},
         }),
         group = "fi_item_group",
         subgroup = "fi_item_subgroup_f",
diff --git a/Chromium2/prototypes/chromium-enriched.lua b/Chromium2/prototypes/chromium-enriched.lua
index a59e6ba..1294a18 100644
--- a/Chromium2/prototypes/chromium-enriched.lua
+++ b/Chromium2/prototypes/chromium-enriched.lua
@@ -7,7 +7,7 @@ data:extend(
     type = "item",
     name = "enriched-chromium",
     icon_size = 64,
-    icon = "__Chromium__/graphics/icons/enriched-chromium.png",
+    icon = "__Chromium2__/graphics/icons/enriched-chromium.png",
     group ="raw-material",
     subgroup = "chromium",
     order = "a",
@@ -17,7 +17,7 @@ data:extend(
     type = "recipe",
     name = "enriched-chromium",
     main_product="enriched-chromium",
-    icon = "__Chromium__/graphics/icons/enriched-chromium.png",
+    icon = "__Chromium2__/graphics/icons/enriched-chromium.png",
     icon_size = 64,
     category = "chemistry",
     energy_required = 3,
@@ -52,8 +52,8 @@ data:extend(
       name = "enriched-chromium-plate",
       icons =
       {
-        { icon = "__Chromium__/graphics/icons/chromium-plate.png", icon_size = 64 },
-        { icon = "__Chromium__/graphics/icons/enriched-chromium.png", icon_size = 64, scale=0.125, shift= {-8, -8}},
+        { icon = "__Chromium2__/graphics/icons/chromium-plate.png", icon_size = 64 },
+        { icon = "__Chromium2__/graphics/icons/enriched-chromium.png", icon_size = 64, scale=0.125, shift= {-8, -8}},
       },
       category = "smelting",
       energy_required = 16,
diff --git a/Chromium2/prototypes/chromium-matter.lua b/Chromium2/prototypes/chromium-matter.lua
index 90513e5..6414399 100644
--- a/Chromium2/prototypes/chromium-matter.lua
+++ b/Chromium2/prototypes/chromium-matter.lua
@@ -14,7 +14,7 @@ if mods["Krastorio2"] then
             icon_size = 256,
           },
           {
-            icon = "__Chromium__/graphics/icons/chromite-ore.png",
+            icon = "__Chromium2__/graphics/icons/chromite-ore.png",
             icon_size = 64,
             scale = 1.4,
           }
diff --git a/Chromium2/prototypes/chromium-recipe-se.lua b/Chromium2/prototypes/chromium-recipe-se.lua
index 57f6380..84fa73e 100644
--- a/Chromium2/prototypes/chromium-recipe-se.lua
+++ b/Chromium2/prototypes/chromium-recipe-se.lua
@@ -21,7 +21,7 @@ if mods["space-exploration"] then
   {
     type = "item",
     name = "chromium-ingot",
-    icons = {{icon = "__Chromium__/graphics/icons/chromium-ingot.png", icon_size = 64}},
+    icons = {{icon = "__Chromium2__/graphics/icons/chromium-ingot.png", icon_size = 64}},
     order = "b-b",
     stack_size = 50,
     subgroup = "chromium",
@@ -33,7 +33,7 @@ if mods["space-exploration"] then
     max_temperature = 232,
     base_color = {r=191, g=219, b=233},
     flow_color = {r=191, g=219, b=233},
-    icons = {{icon = "__Chromium__/graphics/icons/molten-chromium.png", icon_size = 64}},
+    icons = {{icon = "__Chromium2__/graphics/icons/molten-chromium.png", icon_size = 64}},
     order = "a[molten]-a",
     pressure_to_speed_ratio = 0.4,
     flow_to_energy_ratio = 0.59,
@@ -77,8 +77,8 @@ if mods["space-exploration"] then
     name = "chromium-ingot-to-plate",
 
     icons = {
-      {icon = "__Chromium__/graphics/icons/chromium-plate.png", icon_size = 64},
-      {icon = "__Chromium__/graphics/icons/chromium-ingot.png", icon_size = 32, scale = 0.125, shift = {-8, -8}},
+      {icon = "__Chromium2__/graphics/icons/chromium-plate.png", icon_size = 64},
+      {icon = "__Chromium2__/graphics/icons/chromium-ingot.png", icon_size = 32, scale = 0.125, shift = {-8, -8}},
     },
     results = {
       {name = "chromium-plate", amount = 10},
diff --git a/Chromium2/prototypes/chromium-recipe.lua b/Chromium2/prototypes/chromium-recipe.lua
index 9a5ed0c..7b69d84 100644
--- a/Chromium2/prototypes/chromium-recipe.lua
+++ b/Chromium2/prototypes/chromium-recipe.lua
@@ -18,7 +18,7 @@ data:extend({
   {
     type = "item",
     name = "chromium-plate",
-    icon = "__Chromium__/graphics/icons/chromium-plate.png",
+    icon = "__Chromium2__/graphics/icons/chromium-plate.png",
     icon_size = 64,
     subgroup = "chromium",
     order = "b[chromium-plate]",
@@ -31,10 +31,10 @@ data:extend({
     order = "a[chromium-plate]",
     icons = (mods["Krastorio2"] and
         {
-          { icon = "__Chromium__/graphics/icons/chromium-plate.png", icon_size = 64},
-          { icon = "__Chromium__/graphics/icons/chromite-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}},
+          { icon = "__Chromium2__/graphics/icons/chromium-plate.png", icon_size = 64},
+          { icon = "__Chromium2__/graphics/icons/chromite-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}},
         } or {
-          { icon = "__Chromium__/graphics/icons/chromium-plate.png", icon_size = 64},
+          { icon = "__Chromium2__/graphics/icons/chromium-plate.png", icon_size = 64},
         }
 ),
     main_product = "chromium-plate",
@@ -53,8 +53,8 @@ if mods["Krastorio2"] then
         type = "recipe",
         name = "chromium-electrolysis",
         icons = {
-          { icon = "__Chromium__/graphics/icons/chromium-plate.png", icon_size = 64},
-          { icon = "__Chromium__/graphics/icons/chromite-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}}
+          { icon = "__Chromium2__/graphics/icons/chromium-plate.png", icon_size = 64},
+          { icon = "__Chromium2__/graphics/icons/chromite-ore.png", icon_size = 64, scale=0.125, shift= {-8, -8}}
         },
         category = "electrolysis",
         order = "a[chromium-plate]",
@@ -87,7 +87,7 @@ data:extend({
   {
     type = "item",
     name = "stainless-steel-plate",
-    icon = "__Chromium__/graphics/icons/stainless-steel-plate.png",
+    icon = "__Chromium2__/graphics/icons/stainless-steel-plate.png",
     icon_size = 64,
     subgroup = "chromium",
     order = "b[stainless-steel-plate]",
@@ -143,7 +143,7 @@ data:extend({
   {
     type = "item",
     name = "chromel-r-fabric",
-    icon = "__Chromium__/graphics/icons/chromel-r-fabric.png",
+    icon = "__Chromium2__/graphics/icons/chromel-r-fabric.png",
     icon_size = 64,
     subgroup = "chromium",
     order = "c[chromel-r-fabric]",
@@ -169,7 +169,7 @@ data:extend({
   {
     type = "item",
     name = "basic-vehicle-frame",
-    icon = "__Chromium__/graphics/icons/basic-vehicle-frame.png",
+    icon = "__Chromium2__/graphics/icons/basic-vehicle-frame.png",
     icon_size = 128,
     subgroup = "intermediate-product",
     order = "v[basic-vehicle-frame]",
@@ -195,7 +195,7 @@ data:extend({
   {
     type = "item",
     name = "vehicle-frame",
-    icon = "__Chromium__/graphics/icons/vehicle-frame.png",
+    icon = "__Chromium2__/graphics/icons/vehicle-frame.png",
     icon_size = 128,
     subgroup = "intermediate-product",
     order = "v[vehicle-frame]",
@@ -227,7 +227,7 @@ data:extend({
   {
     type = "item",
     name = "inconel-718",
-    icon = "__Chromium__/graphics/icons/inconel-718.png",
+    icon = "__Chromium2__/graphics/icons/inconel-718.png",
     icon_size = 64,
     group = "intermediate-products",
     subgroup = inconel_subgroup,
@@ -256,7 +256,7 @@ end
     {
       type = "item",
       name = "automation-core-3",
-      icon = "__Chromium__/graphics/icons/automation-core-3.png",
+      icon = "__Chromium2__/graphics/icons/automation-core-3.png",
       icon_size = 64,
       group = "intermediate-product",
       subgroup = automation_core3_subgroup,
@@ -281,7 +281,10 @@ end
   end
   util.add_productivity("automation-core-3")
 
-local turbines_blade_ingredients = {{type="item", name="inconel-718", amount=10}, mods["248k-Redux"] and {type="item", name="fi_materials_GFK", amount=5}, {type="item", name="air-bearing", amount=2}}
+local turbines_blade_ingredients = {{type="item", name="inconel-718", amount=10}, {type="item", name="air-bearing", amount=2}}
+if mods["248k-Redux"] then
+  table.insert(turbines_blade_ingredients, {type="item", name="fi_materials_GFK", amount=5})
+end
 local turbines_blade_subgroup = "intermediate-product"
 if mods["IfNickel-Updated"] then
   turbines_blade_subgroup = "engine-components"
@@ -290,7 +293,7 @@ data:extend({
   {
     type = "item",
     name = "turbine-blades",
-    icon = "__Chromium__/graphics/icons/turbine-blades.png",
+    icon = "__Chromium2__/graphics/icons/turbine-blades.png",
     icon_size = 64,
     group = "intermediate-products",
     subgroup = turbines_blade_subgroup,
@@ -321,7 +324,7 @@ data:extend({
   {
     type = "item",
     name = "heat-resistant-low-density-structure",
-    icon = "__Chromium__/graphics/icons/heat-resistant-low-density-structure.png",
+    icon = "__Chromium2__/graphics/icons/heat-resistant-low-density-structure.png",
     icon_size = 64,
     group = "intermediate-products",
     subgroup = hrld_structure_subgroup,
@@ -340,11 +343,15 @@ data:extend({
   }
 })
 
+local air_bearing_ingredients = {{type="item", name="stainless-steel-plate", amount=2},{ type = "fluid", name = "lubricant", amount = 5 }}
+if data.raw.item["cryogenic-seal"] then
+  table.insert(air_bearing_ingredients, {type="item", name="cryogenic-seal", amount=1})
+end
 data:extend({
   {
     type = "item",
     name = "air-bearing",
-    icon = "__Chromium__/graphics/icons/air-bearing.png",
+    icon = "__Chromium2__/graphics/icons/air-bearing.png",
     icon_size = 64,
     group = "intermediate-products",
     subgroup = "intermediate-product",
@@ -358,7 +365,7 @@ data:extend({
     order = "h",
     enabled = false,
     energy_required = 5,
-    ingredients = {{type="item", name="stainless-steel-plate", amount=2},data.raw.item["cryogenic-seal"] and {type="item", name="cryogenic-seal", amount=1}, { type = "fluid", name = "lubricant", amount = 5 }},
+    ingredients = air_bearing_ingredients,
     results = {{type="item", name="air-bearing", amount=1}},
   }
 })
@@ -371,11 +378,15 @@ local advanced_electric_motor_subgroup = "intermediate-product"
 if mods["IfNickel-Updated"] then
   advanced_electric_motor_subgroup = "engine-components"
 end
+local advanced_electric_motor_ingredients = {{type="item", name="inconel-718", amount=2}, {type="item", name="air-bearing", amount=1}, {type="item", name="electric-engine-unit", amount=2}, { type = "fluid", name = "lubricant", amount = 40 }}
+if mods["ThemTharHills-Updated"] then
+  table.insert(advanced_electric_motor_ingredients, {type="item", name="hv-power-regulator", amount=1})
+end
 data:extend({
   {
     type = "item",
     name = "advanced-electric-motor",
-    icon = "__Chromium__/graphics/icons/advanced-electric-motor.png",
+    icon = "__Chromium2__/graphics/icons/advanced-electric-motor.png",
     icon_size = 64,
     group = "intermediate-products",
     subgroup = advanced_electric_motor_subgroup,
@@ -389,7 +400,7 @@ data:extend({
     order = "g",
     enabled = false,
     energy_required = 12,
-    ingredients = {{type="item", name="inconel-718", amount=2}, {type="item", name="air-bearing", amount=1}, {type="item", name="electric-engine-unit", amount=2}, mods["ThemTharHills-Updated"] and {type="item", name="hv-power-regulator", amount=1}, { type = "fluid", name = "lubricant", amount = 40 }},
+    ingredients = advanced_electric_motor_ingredients,
     results = {{type="item", name="advanced-electric-motor", amount=1}},
   }
 })
@@ -405,7 +416,7 @@ if mods["space-exploration"] then
       type = "recipe",
       name = "beryllium-heat-resistant-low-density-structure",
       icons = {
-        { icon = "__Chromium__/graphics/icons/heat-resistant-low-density-structure.png", icon_size = 64},
+        { icon = "__Chromium2__/graphics/icons/heat-resistant-low-density-structure.png", icon_size = 64},
         { icon = "__space-exploration-graphics__/graphics/icons/astronomic/planet-orbit.png", icon_size = 64, scale=0.25, shift= {-8, -8}}
       },
       category = "space-crafting",
diff --git a/Chromium2/prototypes/technology.lua b/Chromium2/prototypes/technology.lua
index 2219f6d..12fde73 100644
--- a/Chromium2/prototypes/technology.lua
+++ b/Chromium2/prototypes/technology.lua
@@ -7,7 +7,7 @@ data:extend(
         type = "technology",
         name = "chromium-processing",
         icon_size = 64,
-        icon = "__Chromium__/graphics/icons/chromite-ore.png",
+        icon = "__Chromium2__/graphics/icons/chromite-ore.png",
         prerequisites = {"kr-advanced-chemistry"},
         effects = {
             {
@@ -44,7 +44,7 @@ data:extend(
     type = "technology",
     name = "polyethylene-plastic",
     icons = {
-        { icon = "__Chromium__/graphics/technology/polyethylene.png", icon_size = 64}
+        { icon = "__Chromium2__/graphics/technology/polyethylene.png", icon_size = 64}
       },
     prerequisites = polyethylene_plastic_prerequisites,
     effects = {
@@ -73,7 +73,7 @@ data:extend(
         type = "technology",
         name = "stainless-steel-processing",
         icons = {
-            { icon = "__Chromium__/graphics/icons/stainless-steel-plate.png", icon_size = 64}
+            { icon = "__Chromium2__/graphics/icons/stainless-steel-plate.png", icon_size = 64}
           },
         prerequisites = { "advanced-material-processing"},
         effects = {
@@ -112,7 +112,7 @@ data:extend(
           type = "technology",
           name = "chrome-alloys",
           icons = {
-              { icon = "__Chromium__/graphics/icons/inconel-718.png", icon_size = 64}
+              { icon = "__Chromium2__/graphics/icons/inconel-718.png", icon_size = 64}
             },
           prerequisites = chrome_alloys_prerequisites,
           effects = {
@@ -141,7 +141,7 @@ data:extend(
         type = "technology",
         name = "basic-vehicle-frame-production",
         icons = {
-            { icon = "__Chromium__/graphics/icons/basic-vehicle-frame.png", icon_size = 128}
+            { icon = "__Chromium2__/graphics/icons/basic-vehicle-frame.png", icon_size = 128}
           },
         prerequisites = {"steel-processing"},
         effects = {
@@ -169,7 +169,7 @@ data:extend(
           type = "technology",
           name = "vehicle-frame-production",
           icons = {
-              { icon = "__Chromium__/graphics/icons/vehicle-frame.png", icon_size = 128}
+              { icon = "__Chromium2__/graphics/icons/vehicle-frame.png", icon_size = 128}
             },
           prerequisites = { "stainless-steel-processing", "automobilism"},
           effects = {
@@ -213,7 +213,7 @@ data:extend(
             type = "technology",
             name = "chromel-r-fabric",
             icons = {
-                { icon = "__Chromium__/graphics/icons/chromel-r-fabric.png", icon_size = 64}
+                { icon = "__Chromium2__/graphics/icons/chromel-r-fabric.png", icon_size = 64}
               },
             prerequisites = chromel_r_fabric_prerequisites,
             effects = {
@@ -256,7 +256,7 @@ data:extend(
             type = "technology",
             name = "heat-resistant-low-density-structure",
             icons = {
-                { icon = "__Chromium__/graphics/icons/heat-resistant-low-density-structure.png", icon_size = 64}
+                { icon = "__Chromium2__/graphics/icons/heat-resistant-low-density-structure.png", icon_size = 64}
               },
             prerequisites = hr_low_density_structure_prerequisites,
             effects = {
@@ -280,7 +280,7 @@ data:extend(
               type = "technology",
               name = "beryllium-heat-resistant-low-density-structure",
               icons = {
-                { icon = "__Chromium__/graphics/icons/heat-resistant-low-density-structure.png", icon_size = 64},
+                { icon = "__Chromium2__/graphics/icons/heat-resistant-low-density-structure.png", icon_size = 64},
                 { icon = "__space-exploration-graphics__/graphics/icons/astronomic/planet-orbit.png", icon_size = 64, scale=0.25, shift= {-8, -8}}
               },
               prerequisites = {"se-astronomic-science-pack-1"},