diff --git a/Bio_Industries_2/graphics/entities/rocket-shadow.png b/Bio_Industries_2/graphics/entities/rocket-shadow.png
new file mode 100644
index 0000000..58478cc
Binary files /dev/null and b/Bio_Industries_2/graphics/entities/rocket-shadow.png differ
diff --git a/Bio_Industries_2/graphics/entities/rocket.png b/Bio_Industries_2/graphics/entities/rocket.png
new file mode 100644
index 0000000..31f3f73
Binary files /dev/null and b/Bio_Industries_2/graphics/entities/rocket.png differ
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
index e8355c2..2b45286 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/entities.lua
@@ -624,7 +624,7 @@ data:extend({
     },
     light = {intensity = 0.8, size = 15},
     animation = {
-      filename = "__base__/graphics/entity/rocket/rocket.png",
+      filename = "__Bio_Industries_2__/graphics/entities/rocket.png",
       frame_count = 8,
       line_length = 8,
       width = 9,
@@ -633,7 +633,7 @@ data:extend({
       priority = "high"
     },
     shadow = {
-      filename = "__base__/graphics/entity/rocket/rocket-shadow.png",
+      filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png",
       frame_count = 1,
       width = 7,
       height = 24,
@@ -685,7 +685,7 @@ data:extend({
     },
     light = {intensity = 0.8, size = 15},
     animation = {
-      filename = "__base__/graphics/entity/rocket/rocket.png",
+      filename = "__Bio_Industries_2__/graphics/entities/rocket.png",
       frame_count = 8,
       line_length = 8,
       width = 9,
@@ -694,7 +694,7 @@ data:extend({
       priority = "high"
     },
     shadow = {
-      filename = "__base__/graphics/entity/rocket/rocket-shadow.png",
+      filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png",
       frame_count = 1,
       width = 7,
       height = 24,
@@ -746,7 +746,7 @@ data:extend({
     },
     light = {intensity = 0.8, size = 15},
     animation = {
-      filename = "__base__/graphics/entity/rocket/rocket.png",
+      filename = "__Bio_Industries_2__/graphics/entities/rocket.png",
       frame_count = 8,
       line_length = 8,
       width = 9,
@@ -755,7 +755,7 @@ data:extend({
       priority = "high"
     },
     shadow = {
-      filename = "__base__/graphics/entity/rocket/rocket-shadow.png",
+      filename = "__Bio_Industries_2__/graphics/entities/rocket-shadow.png",
       frame_count = 1,
       width = 7,
       height = 24,
diff --git a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua
index 789b1d2..1dca551 100644
--- a/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua
+++ b/Bio_Industries_2/prototypes/Bio_Farm/pipeConnectors.lua
@@ -15,7 +15,7 @@ function assembler2pipepicturesCokery()
         scale = 0.5,
     },
     east = {
-        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-E.png",
+        filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png",
         priority = "extra-high",
         width = 42,
         height = 76,
@@ -31,7 +31,7 @@ function assembler2pipepicturesCokery()
         scale = 0.5,
     },
     west = {
-        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-W.png",
+        filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png",
         priority = "extra-high",
         width = 39,
         height = 73,
@@ -123,7 +123,7 @@ function assembler2pipepicturesBioreactor()
         scale = 0.5,
     },
     east = {
-        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-E.png",
+        filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-E.png",
         priority = "extra-high",
         width = 42,
         height = 76,
@@ -131,7 +131,7 @@ function assembler2pipepicturesBioreactor()
         scale = 0.5,
     },
     south = {
-        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-S.png",
+        filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-S.png",
         priority = "extra-high",
         width = 88,
         height = 61,
@@ -139,7 +139,7 @@ function assembler2pipepicturesBioreactor()
         scale = 0.5,
     },
     west = {
-        filename = "__base__/graphics/entity/assembling-machine-2/hr-assembling-machine-2-pipe-W.png",
+        filename = "__base__/graphics/entity/assembling-machine-2/assembling-machine-2-pipe-W.png",
         priority = "extra-high",
         width = 39,
         height = 73,
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
index b53f4ab..392acf3 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/entities.lua
@@ -194,7 +194,7 @@ if BI.Settings.BI_Bio_Fuel then
         north = {
         layers = {
           {
-              filename = ENTITYPATH .. "hr-boiler-N-idle.png",
+              filename = ENTITYPATH .. "boiler-N-idle.png",
               priority = "extra-high",
               width = 269,
               height = 221,
@@ -203,7 +203,7 @@ if BI.Settings.BI_Bio_Fuel then
               tint = bio_boiler_tint,
           },
           {
-              filename = ENTITYPATH .. "hr-boiler-N-shadow.png",
+              filename = ENTITYPATH .. "boiler-N-shadow.png",
               priority = "extra-high",
               width = 274,
               height = 164,
@@ -216,7 +216,7 @@ if BI.Settings.BI_Bio_Fuel then
       east = {
         layers = {
           {
-              filename = ENTITYPATH .. "hr-boiler-E-idle.png",
+              filename = ENTITYPATH .. "boiler-E-idle.png",
               priority = "extra-high",
               width = 216,
               height = 301,
@@ -225,7 +225,7 @@ if BI.Settings.BI_Bio_Fuel then
               tint = bio_boiler_tint,
           },
           {
-              filename = ENTITYPATH .. "hr-boiler-E-shadow.png",
+              filename = ENTITYPATH .. "boiler-E-shadow.png",
               priority = "extra-high",
               width = 184,
               height = 194,
@@ -238,7 +238,7 @@ if BI.Settings.BI_Bio_Fuel then
       south = {
         layers = {
           {
-              filename = ENTITYPATH .. "hr-boiler-S-idle.png",
+              filename = ENTITYPATH .. "boiler-S-idle.png",
               priority = "extra-high",
               width = 260,
               height = 192,
@@ -247,7 +247,7 @@ if BI.Settings.BI_Bio_Fuel then
               tint = bio_boiler_tint,
           },
           {
-              filename = ENTITYPATH .. "hr-boiler-S-shadow.png",
+              filename = ENTITYPATH .. "boiler-S-shadow.png",
               priority = "extra-high",
               width = 311,
               height = 131,
@@ -260,7 +260,7 @@ if BI.Settings.BI_Bio_Fuel then
       west = {
         layers = {
           {
-              filename = ENTITYPATH .. "hr-boiler-W-idle.png",
+              filename = ENTITYPATH .. "boiler-W-idle.png",
               priority = "extra-high",
               width = 196,
               height = 273,
@@ -269,7 +269,7 @@ if BI.Settings.BI_Bio_Fuel then
               tint = bio_boiler_tint,
           },
           {
-              filename = ENTITYPATH .. "hr-boiler-W-shadow.png",
+              filename = ENTITYPATH .. "boiler-W-shadow.png",
               priority = "extra-high",
               width = 206,
               height = 218,
@@ -282,7 +282,7 @@ if BI.Settings.BI_Bio_Fuel then
     },
     patch = {
       east = {
-          filename = ENTITYPATH .. "hr-boiler-E-patch.png",
+          filename = ENTITYPATH .. "boiler-E-patch.png",
           width = 6,
           height = 36,
           shift = util.by_pixel(33.5, -13.5),
@@ -293,7 +293,7 @@ if BI.Settings.BI_Bio_Fuel then
     fire_flicker_enabled = true,
       fire = {
         north = {
-            filename = ENTITYPATH .. "hr-boiler-N-fire.png",
+            filename = ENTITYPATH .. "boiler-N-fire.png",
             priority = "extra-high",
             frame_count = 64,
             line_length = 8,
@@ -304,7 +304,7 @@ if BI.Settings.BI_Bio_Fuel then
             scale = 0.5
         },
         east = {
-            filename = ENTITYPATH .. "hr-boiler-E-fire.png",
+            filename = ENTITYPATH .. "boiler-E-fire.png",
             priority = "extra-high",
             frame_count = 64,
             line_length = 8,
@@ -315,7 +315,7 @@ if BI.Settings.BI_Bio_Fuel then
             scale = 0.5
         },
         south = {
-            filename = ENTITYPATH .. "hr-boiler-S-fire.png",
+            filename = ENTITYPATH .. "boiler-S-fire.png",
             priority = "extra-high",
             frame_count = 64,
             line_length = 8,
@@ -326,7 +326,7 @@ if BI.Settings.BI_Bio_Fuel then
             scale = 0.5
         },
         west = {
-            filename = ENTITYPATH .. "hr-boiler-W-fire.png",
+            filename = ENTITYPATH .. "boiler-W-fire.png",
             priority = "extra-high",
             frame_count = 64,
             line_length = 8,
@@ -340,7 +340,7 @@ if BI.Settings.BI_Bio_Fuel then
       fire_glow_flicker_enabled = true,
       fire_glow = {
         north = {
-            filename = ENTITYPATH .. "hr-boiler-N-light.png",
+            filename = ENTITYPATH .. "boiler-N-light.png",
             priority = "extra-high",
             frame_count = 1,
             width = 200,
@@ -350,7 +350,7 @@ if BI.Settings.BI_Bio_Fuel then
             scale = 0.5
         },
         east = {
-            filename = ENTITYPATH .. "hr-boiler-E-light.png",
+            filename = ENTITYPATH .. "boiler-E-light.png",
             priority = "extra-high",
             frame_count = 1,
             width = 139,
@@ -360,7 +360,7 @@ if BI.Settings.BI_Bio_Fuel then
             scale = 0.5
         },
         south = {
-            filename = ENTITYPATH .. "hr-boiler-S-light.png",
+            filename = ENTITYPATH .. "boiler-S-light.png",
             priority = "extra-high",
             frame_count = 1,
             width = 200,
@@ -370,7 +370,7 @@ if BI.Settings.BI_Bio_Fuel then
             scale = 0.5
         },
         west = {
-            filename = ENTITYPATH .. "hr-boiler-W-light.png",
+            filename = ENTITYPATH .. "boiler-W-light.png",
             priority = "extra-high",
             frame_count = 1,
             width = 136,
diff --git a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua
index b481898..d401ef5 100644
--- a/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua
+++ b/Bio_Industries_2/prototypes/Bio_Fuel/pipeConnectors.lua
@@ -15,7 +15,7 @@ function assembler2pipepicturesBioreactor()
         scale = 0.5,
     },
     east = {
-        filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-E.png",
+        filename = ENTITYPATH .. "assembling-machine-2-pipe-E.png",
         priority = "extra-high",
         width = 42,
         height = 76,
@@ -23,7 +23,7 @@ function assembler2pipepicturesBioreactor()
         scale = 0.5,
     },
     south = {
-        filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-S.png",
+        filename = ENTITYPATH .. "assembling-machine-2-pipe-S.png",
         priority = "extra-high",
         width = 88,
         height = 61,
@@ -31,7 +31,7 @@ function assembler2pipepicturesBioreactor()
         scale = 0.5,
     },
     west = {
-        filename = ENTITYPATH .. "hr-assembling-machine-2-pipe-W.png",
+        filename = ENTITYPATH .. "assembling-machine-2-pipe-W.png",
         priority = "extra-high",
         width = 39,
         height = 73,
@@ -52,21 +52,21 @@ function pipecoverspicturesBioreactor()
         scale = 0.5
     },
     east = {
-        filename = PIPEPATH .. "hr-pipe-cover-east.png",
+        filename = PIPEPATH .. "pipe-cover-east.png",
         priority = "extra-high",
         width = 128,
         height = 128,
         scale = 0.5
     },
     south = {
-        filename = PIPEPATH .. "hr-pipe-cover-south.png",
+        filename = PIPEPATH .. "pipe-cover-south.png",
         priority = "extra-high",
         width = 128,
         height = 128,
         scale = 0.5
     },
     west = {
-        filename = PIPEPATH .. "hr-pipe-cover-west.png",
+        filename = PIPEPATH .. "pipe-cover-west.png",
         priority = "extra-high",
         width = 128,
         height = 128,
diff --git a/Bio_Industries_2/prototypes/Wood_Products/entities.lua b/Bio_Industries_2/prototypes/Wood_Products/entities.lua
index 8e4c6c7..26bf1d9 100644
--- a/Bio_Industries_2/prototypes/Wood_Products/entities.lua
+++ b/Bio_Industries_2/prototypes/Wood_Products/entities.lua
@@ -23,128 +23,128 @@ end
 pipepictures_w = function()
   return {
     straight_vertical_single = {
-        filename = PIPEPATH .. "hr-pipe-straight-vertical-single.png",
+        filename = PIPEPATH .. "pipe-straight-vertical-single.png",
         priority = "extra-high",
         width = 160,
         height = 160,
         scale = 0.5
     },
     straight_vertical = {
-        filename = PIPEPATH .. "hr-pipe-straight-vertical.png",
+        filename = PIPEPATH .. "pipe-straight-vertical.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     straight_vertical_window = {
-        filename = PIPEPATH .. "hr-pipe-straight-vertical-window.png",
+        filename = PIPEPATH .. "pipe-straight-vertical-window.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     straight_horizontal_window = {
-        filename = PIPEPATH .. "hr-pipe-straight-horizontal-window.png",
+        filename = PIPEPATH .. "pipe-straight-horizontal-window.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     straight_horizontal = {
-        filename = PIPEPATH .. "hr-pipe-straight-horizontal.png",
+        filename = PIPEPATH .. "pipe-straight-horizontal.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     corner_up_right = {
-        filename = PIPEPATH .. "hr-pipe-corner-up-right.png",
+        filename = PIPEPATH .. "pipe-corner-up-right.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     corner_up_left = {
-        filename = PIPEPATH .. "hr-pipe-corner-up-left.png",
+        filename = PIPEPATH .. "pipe-corner-up-left.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     corner_down_right = {
-        filename = PIPEPATH .. "hr-pipe-corner-down-right.png",
+        filename = PIPEPATH .. "pipe-corner-down-right.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     corner_down_left = {
-        filename = PIPEPATH .. "hr-pipe-corner-down-left.png",
+        filename = PIPEPATH .. "pipe-corner-down-left.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     t_up = {
-        filename = PIPEPATH .. "hr-pipe-t-up.png",
+        filename = PIPEPATH .. "pipe-t-up.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     t_down = {
-        filename = PIPEPATH .. "hr-pipe-t-down.png",
+        filename = PIPEPATH .. "pipe-t-down.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     t_right = {
-        filename = PIPEPATH .. "hr-pipe-t-right.png",
+        filename = PIPEPATH .. "pipe-t-right.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     t_left = {
-        filename = PIPEPATH .. "hr-pipe-t-left.png",
+        filename = PIPEPATH .. "pipe-t-left.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     cross = {
-        filename = PIPEPATH .. "hr-pipe-cross.png",
+        filename = PIPEPATH .. "pipe-cross.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     ending_up = {
-        filename = PIPEPATH .. "hr-pipe-ending-up.png",
+        filename = PIPEPATH .. "pipe-ending-up.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     ending_down = {
-        filename = PIPEPATH .. "hr-pipe-ending-down.png",
+        filename = PIPEPATH .. "pipe-ending-down.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     ending_right = {
-        filename = PIPEPATH .. "hr-pipe-ending-right.png",
+        filename = PIPEPATH .. "pipe-ending-right.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     ending_left = {
-        filename = PIPEPATH .. "hr-pipe-ending-left.png",
+        filename = PIPEPATH .. "pipe-ending-left.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     horizontal_window_background = {
-        filename = PIPEPATH .. "hr-pipe-horizontal-window-background.png",
+        filename = PIPEPATH .. "pipe-horizontal-window-background.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     vertical_window_background = {
-        filename = PIPEPATH .. "hr-pipe-vertical-window-background.png",
+        filename = PIPEPATH .. "pipe-vertical-window-background.png",
         priority = "extra-high",
         size = 128,
         scale = 0.5
     },
     fluid_background = {
-        filename = PIPEPATH .. "hr-fluid-background.png",
+        filename = PIPEPATH .. "fluid-background.png",
         priority = "extra-high",
         width = 64,
         height = 40,
@@ -169,7 +169,7 @@ pipepictures_w = function()
       height = 18
     },
     gas_flow = {
-        filename = PIPEPATH .. "hr-steam.png",
+        filename = PIPEPATH .. "steam.png",
         priority = "extra-high",
         line_length = 10,
         width = 48,
@@ -815,25 +815,25 @@ data:extend({
     --~ vehicle_impact_sound =  { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
     pictures = {
       north = {
-          filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-up.png",
+          filename = ENTITYPATH .. "/pipe-to-ground/pipe-to-ground-up.png",
           priority = "extra-high",
           size = 128,
           scale = 0.5
       },
       south = {
-          filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-down.png",
+          filename = ENTITYPATH .. "/pipe-to-ground/pipe-to-ground-down.png",
           priority = "extra-high",
           size = 128,
           scale = 0.5
       },
       west = {
-          filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-left.png",
+          filename = ENTITYPATH .. "/pipe-to-ground/pipe-to-ground-left.png",
           priority = "extra-high",
           size = 128,
           scale = 0.5
       },
       east = {
-          filename = ENTITYPATH .. "/pipe-to-ground/hr-pipe-to-ground-right.png",
+          filename = ENTITYPATH .. "/pipe-to-ground/pipe-to-ground-right.png",
           priority = "extra-high",
           size = 128,
           scale = 0.5
diff --git a/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua b/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua
index b923a78..869809c 100644
--- a/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua
+++ b/Bio_Industries_2/prototypes/compound_entities/hidden_radars.lua
@@ -112,7 +112,7 @@ BioInd.show("radar.name", c_entities["bi-arboretum"].hidden[h_key].name)
     radar.pictures = {
       layers = {
         {
-            filename = "__base__/graphics/entity/radar/hr-radar.png",
+            filename = "__base__/graphics/entity/radar/radar.png",
             priority = "extra-high",
             width = 196,
             height = 254,