diff --git a/bobpower/graphics/accumulator/hr-large-accumulator-shadow.png b/bobpower/graphics/accumulator/hr-large-accumulator-shadow.png
deleted file mode 100644
index 72ed9f313..000000000
Binary files a/bobpower/graphics/accumulator/hr-large-accumulator-shadow.png and /dev/null differ
diff --git a/bobpower/graphics/accumulator/hr-large-accumulator.png b/bobpower/graphics/accumulator/hr-large-accumulator.png
deleted file mode 100644
index 8e7ef05b3..000000000
Binary files a/bobpower/graphics/accumulator/hr-large-accumulator.png and /dev/null differ
diff --git a/bobpower/graphics/accumulator/large-accumulator-shadow.png b/bobpower/graphics/accumulator/large-accumulator-shadow.png
index 066d49b93..72ed9f313 100644
Binary files a/bobpower/graphics/accumulator/large-accumulator-shadow.png and b/bobpower/graphics/accumulator/large-accumulator-shadow.png differ
diff --git a/bobpower/graphics/accumulator/large-accumulator.png b/bobpower/graphics/accumulator/large-accumulator.png
index d7ec89723..8e7ef05b3 100644
Binary files a/bobpower/graphics/accumulator/large-accumulator.png and b/bobpower/graphics/accumulator/large-accumulator.png differ
diff --git a/bobpower/graphics/burner-reactor/hr-reactor-connect-patches-2.png b/bobpower/graphics/burner-reactor/hr-reactor-connect-patches-2.png
deleted file mode 100644
index 146ddf5d7..000000000
Binary files a/bobpower/graphics/burner-reactor/hr-reactor-connect-patches-2.png and /dev/null differ
diff --git a/bobpower/graphics/burner-reactor/hr-reactor-connect-patches.png b/bobpower/graphics/burner-reactor/hr-reactor-connect-patches.png
deleted file mode 100644
index 323c73a21..000000000
Binary files a/bobpower/graphics/burner-reactor/hr-reactor-connect-patches.png and /dev/null differ
diff --git a/bobpower/graphics/burner-reactor/hr-reactor-pipes-2.png b/bobpower/graphics/burner-reactor/hr-reactor-pipes-2.png
deleted file mode 100644
index 58344927d..000000000
Binary files a/bobpower/graphics/burner-reactor/hr-reactor-pipes-2.png and /dev/null differ
diff --git a/bobpower/graphics/burner-reactor/hr-reactor-pipes.png b/bobpower/graphics/burner-reactor/hr-reactor-pipes.png
deleted file mode 100644
index bec456768..000000000
Binary files a/bobpower/graphics/burner-reactor/hr-reactor-pipes.png and /dev/null differ
diff --git a/bobpower/graphics/burner-reactor/reactor-connect-patches-2.png b/bobpower/graphics/burner-reactor/reactor-connect-patches-2.png
index a2310940f..b13fd5a0e 100644
Binary files a/bobpower/graphics/burner-reactor/reactor-connect-patches-2.png and b/bobpower/graphics/burner-reactor/reactor-connect-patches-2.png differ
diff --git a/bobpower/graphics/burner-reactor/reactor-connect-patches-3.png b/bobpower/graphics/burner-reactor/reactor-connect-patches-3.png
index 068d93679..146ddf5d7 100644
Binary files a/bobpower/graphics/burner-reactor/reactor-connect-patches-3.png and b/bobpower/graphics/burner-reactor/reactor-connect-patches-3.png differ
diff --git a/bobpower/graphics/burner-reactor/hr-reactor-connect-patches-3.png b/bobpower/graphics/burner-reactor/reactor-connect-patches-4.png
similarity index 100%
rename from bobpower/graphics/burner-reactor/hr-reactor-connect-patches-3.png
rename to bobpower/graphics/burner-reactor/reactor-connect-patches-4.png
diff --git a/bobpower/graphics/burner-reactor/reactor-connect-patches.png b/bobpower/graphics/burner-reactor/reactor-connect-patches.png
index 0a8fd2b9a..323c73a21 100644
Binary files a/bobpower/graphics/burner-reactor/reactor-connect-patches.png and b/bobpower/graphics/burner-reactor/reactor-connect-patches.png differ
diff --git a/bobpower/graphics/burner-reactor/reactor-pipes-2.png b/bobpower/graphics/burner-reactor/reactor-pipes-2.png
index a468b05ae..a0f6f114a 100644
Binary files a/bobpower/graphics/burner-reactor/reactor-pipes-2.png and b/bobpower/graphics/burner-reactor/reactor-pipes-2.png differ
diff --git a/bobpower/graphics/burner-reactor/reactor-pipes-3.png b/bobpower/graphics/burner-reactor/reactor-pipes-3.png
index 72e10c0fa..58344927d 100644
Binary files a/bobpower/graphics/burner-reactor/reactor-pipes-3.png and b/bobpower/graphics/burner-reactor/reactor-pipes-3.png differ
diff --git a/bobpower/graphics/burner-reactor/hr-reactor-pipes-3.png b/bobpower/graphics/burner-reactor/reactor-pipes-4.png
similarity index 100%
rename from bobpower/graphics/burner-reactor/hr-reactor-pipes-3.png
rename to bobpower/graphics/burner-reactor/reactor-pipes-4.png
diff --git a/bobpower/graphics/burner-reactor/reactor-pipes.png b/bobpower/graphics/burner-reactor/reactor-pipes.png
index c32c6d48d..bec456768 100644
Binary files a/bobpower/graphics/burner-reactor/reactor-pipes.png and b/bobpower/graphics/burner-reactor/reactor-pipes.png differ
diff --git a/bobpower/graphics/fluid-generator/hr-boiler-N-fire.png b/bobpower/graphics/fluid-generator/boiler-N-fire.png
similarity index 100%
rename from bobpower/graphics/fluid-generator/hr-boiler-N-fire.png
rename to bobpower/graphics/fluid-generator/boiler-N-fire.png
diff --git a/bobpower/graphics/fluid-generator/hr-boiler-S-fire.png b/bobpower/graphics/fluid-generator/boiler-S-fire.png
similarity index 100%
rename from bobpower/graphics/fluid-generator/hr-boiler-S-fire.png
rename to bobpower/graphics/fluid-generator/boiler-S-fire.png
diff --git a/bobpower/graphics/fluid-generator/hr-fluid-generator-fan-spin.png b/bobpower/graphics/fluid-generator/fluid-generator-fan-spin.png
similarity index 100%
rename from bobpower/graphics/fluid-generator/hr-fluid-generator-fan-spin.png
rename to bobpower/graphics/fluid-generator/fluid-generator-fan-spin.png
diff --git a/bobpower/graphics/fluid-generator/hr-fluid-generator-fan.png b/bobpower/graphics/fluid-generator/fluid-generator-fan.png
similarity index 100%
rename from bobpower/graphics/fluid-generator/hr-fluid-generator-fan.png
rename to bobpower/graphics/fluid-generator/fluid-generator-fan.png
diff --git a/bobpower/graphics/fluid-generator/hr-fluid-generator-light.png b/bobpower/graphics/fluid-generator/fluid-generator-light.png
similarity index 100%
rename from bobpower/graphics/fluid-generator/hr-fluid-generator-light.png
rename to bobpower/graphics/fluid-generator/fluid-generator-light.png
diff --git a/bobpower/graphics/fluid-generator/hr-fluid-generator-shadow.png b/bobpower/graphics/fluid-generator/fluid-generator-shadow.png
similarity index 100%
rename from bobpower/graphics/fluid-generator/hr-fluid-generator-shadow.png
rename to bobpower/graphics/fluid-generator/fluid-generator-shadow.png
diff --git a/bobpower/graphics/fluid-generator/hr-fluid-generator.png b/bobpower/graphics/fluid-generator/fluid-generator.png
similarity index 100%
rename from bobpower/graphics/fluid-generator/hr-fluid-generator.png
rename to bobpower/graphics/fluid-generator/fluid-generator.png
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-1.png
index 4e8635626..beba699ea 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-2.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-2.png
index 0425063dd..c31e0f27e 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-2.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-2.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-3.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-3.png
index 35e1ec2e8..cd34c0543 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-3.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-3.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-4.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-4.png
index a732adde4..cef91868a 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-4.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-4.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-5.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-5.png
index 5c67387e3..50decda62 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-5.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-5.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-6.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-6.png
index b3b2dc4c9..9b6195cd0 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-6.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-left-6.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-1.png
index b6bf588e8..4d925e061 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-2.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-2.png
index 4474653e1..cb434cb45 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-2.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-2.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-3.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-3.png
index f0f7407ce..7b167be8c 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-3.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-3.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-4.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-4.png
index f3a48aee5..2a3f46ef3 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-4.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-4.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-5.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-5.png
index c59813b1b..1f4c0ad33 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-5.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-5.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-6.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-6.png
index 297462c72..b31876f05 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-6.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-down-right-6.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-1.png
index ac7d973c7..5128605a6 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-2.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-2.png
index 74d6168de..d207f2e8e 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-2.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-2.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-3.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-3.png
index 069b57898..5df26bc0a 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-3.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-3.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-4.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-4.png
index 1ed1dcb2a..83b77f042 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-4.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-4.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-5.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-5.png
index 86f1be08a..c15c98de2 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-5.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-5.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-6.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-6.png
index d8ee400ef..a0abd366c 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-6.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-left-6.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-1.png
index bc523ea9a..f44cbe5b5 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-2.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-2.png
index 93385d008..edd95bf94 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-2.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-2.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-3.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-3.png
index d2fea616c..a4d240657 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-3.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-3.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-4.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-4.png
index 5fc32f336..2a8fb3dfe 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-4.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-4.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-5.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-5.png
index 8b2a883a0..6325fca3a 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-5.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-5.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-6.png b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-6.png
index c4937314f..922770eae 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-6.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-corner-up-right-6.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-ending-down-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-ending-down-1.png
index 69fae0848..24141d583 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-ending-down-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-ending-down-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-ending-left-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-ending-left-1.png
index c39ed3f72..823c9eb27 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-ending-left-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-ending-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-ending-right-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-ending-right-1.png
index 56182c5f4..cad8088df 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-ending-right-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-ending-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-ending-up-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-ending-up-1.png
index 2465d499e..cec485fb9 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-ending-up-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-ending-up-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-1.png
index 93603c81a..d0dd73887 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-2.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-2.png
index 016b31466..f608cece9 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-2.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-2.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-3.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-3.png
index 9590db61c..85449f037 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-3.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-3.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-4.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-4.png
index 9f920e508..b1b2a6510 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-4.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-4.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-5.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-5.png
index 40e2abd03..6afdd9eb3 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-5.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-5.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-6.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-6.png
index 7d03be763..00851b136 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-6.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-6.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-single.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-single.png
deleted file mode 100644
index 75ae57108..000000000
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-horizontal-single.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-1.png
index 2f115b603..ad71324a9 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-2.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-2.png
index fecbffd08..5fbf7614b 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-2.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-2.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-3.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-3.png
index be95e6f64..51ed6369c 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-3.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-3.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-4.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-4.png
index c3b39418b..a25c56688 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-4.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-4.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-5.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-5.png
index d834dd815..2d646d792 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-5.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-5.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-6.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-6.png
index ceb682ec7..e3c976b0d 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-6.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-6.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-single.png b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-single.png
index 3f1267798..a6a10195f 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-single.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-straight-vertical-single.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-t-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-t-1.png
index 0e8616329..5a6e025dc 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-t-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-t-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-t-down-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-t-down-1.png
index 23dfd650d..479d2cb4e 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-t-down-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-t-down-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-t-left-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-t-left-1.png
index a456b2c15..f9e63ff95 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-t-left-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-t-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-t-right-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-t-right-1.png
index 56baa2f50..86133222b 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-t-right-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-t-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/heat-pipe-t-up-1.png b/bobpower/graphics/heat-pipe-2/heat-pipe-t-up-1.png
index 7b3bedf17..dc5c83af9 100644
Binary files a/bobpower/graphics/heat-pipe-2/heat-pipe-t-up-1.png and b/bobpower/graphics/heat-pipe-2/heat-pipe-t-up-1.png differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-1.png
deleted file mode 100644
index 1e531ebf9..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-2.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-2.png
deleted file mode 100644
index 42a08e99a..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-3.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-3.png
deleted file mode 100644
index a4d16034b..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-4.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-4.png
deleted file mode 100644
index b85c5b164..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-5.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-5.png
deleted file mode 100644
index cd88e80ec..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-6.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-6.png
deleted file mode 100644
index b45918f2f..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-left-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-1.png
deleted file mode 100644
index ea1728fb4..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-2.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-2.png
deleted file mode 100644
index d403c40f7..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-3.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-3.png
deleted file mode 100644
index 05622a7f9..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-4.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-4.png
deleted file mode 100644
index 204d78d74..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-5.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-5.png
deleted file mode 100644
index 070856401..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-6.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-6.png
deleted file mode 100644
index 46e56af4a..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-down-right-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-1.png
deleted file mode 100644
index bff14f9ec..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-2.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-2.png
deleted file mode 100644
index ee876c1bb..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-3.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-3.png
deleted file mode 100644
index 07f2043dd..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-4.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-4.png
deleted file mode 100644
index 45c7b6115..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-5.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-5.png
deleted file mode 100644
index 95b3188e8..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-6.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-6.png
deleted file mode 100644
index affb36f89..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-left-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-1.png
deleted file mode 100644
index 2e3f6b1f7..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-2.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-2.png
deleted file mode 100644
index cd6adeb6e..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-3.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-3.png
deleted file mode 100644
index ce85b7ac2..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-4.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-4.png
deleted file mode 100644
index 315cd7ceb..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-5.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-5.png
deleted file mode 100644
index 0f88f89ad..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-6.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-6.png
deleted file mode 100644
index 6814876f9..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-corner-up-right-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-down-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-down-1.png
deleted file mode 100644
index 341b25ba6..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-down-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-left-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-left-1.png
deleted file mode 100644
index f370bdcdf..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-right-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-right-1.png
deleted file mode 100644
index b8f71d964..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-up-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-up-1.png
deleted file mode 100644
index dcb24ae13..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-ending-up-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-1.png
deleted file mode 100644
index cd8a62ceb..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-2.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-2.png
deleted file mode 100644
index 491d60ad9..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-3.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-3.png
deleted file mode 100644
index 42db32fd9..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-4.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-4.png
deleted file mode 100644
index 98ec245ce..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-5.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-5.png
deleted file mode 100644
index 5c1672cbd..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-6.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-6.png
deleted file mode 100644
index 935248e3b..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-single.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-single.png
deleted file mode 100644
index d88d8f378..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-horizontal-single.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-1.png
deleted file mode 100644
index aa78f3a8e..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-2.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-2.png
deleted file mode 100644
index cfa39ddc4..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-3.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-3.png
deleted file mode 100644
index 44ff86db1..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-4.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-4.png
deleted file mode 100644
index 0158a1ccc..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-5.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-5.png
deleted file mode 100644
index 0a17f8810..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-6.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-6.png
deleted file mode 100644
index be6c0cb56..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-single.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-single.png
deleted file mode 100644
index 9d150ede4..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-straight-vertical-single.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-1.png
deleted file mode 100644
index ae28d04b7..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-down-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-down-1.png
deleted file mode 100644
index 13999f37b..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-down-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-left-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-left-1.png
deleted file mode 100644
index 72c674207..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-right-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-right-1.png
deleted file mode 100644
index ba499a31d..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-up-1.png b/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-up-1.png
deleted file mode 100644
index 308ccf51a..000000000
Binary files a/bobpower/graphics/heat-pipe-2/hr-heat-pipe-t-up-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-1.png
index bc75d0605..1e531ebf9 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-2.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-2.png
index f8e6afd91..42a08e99a 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-2.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-2.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-3.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-3.png
index f47e9cb31..a4d16034b 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-3.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-3.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-4.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-4.png
index bf9c8a49f..b85c5b164 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-4.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-4.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-5.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-5.png
index 8bff96f10..cd88e80ec 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-5.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-5.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-6.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-6.png
index 748758a43..b45918f2f 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-6.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-left-6.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-1.png
index 5821318a6..ea1728fb4 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-2.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-2.png
index 10f269513..d403c40f7 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-2.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-2.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-3.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-3.png
index e743ed297..05622a7f9 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-3.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-3.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-4.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-4.png
index e5c99cac6..204d78d74 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-4.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-4.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-5.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-5.png
index ecb240bb4..070856401 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-5.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-5.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-6.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-6.png
index fbb54b969..46e56af4a 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-6.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-down-right-6.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-1.png
index 469664d2c..bff14f9ec 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-2.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-2.png
index e61e26242..ee876c1bb 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-2.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-2.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-3.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-3.png
index 669d3fd76..07f2043dd 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-3.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-3.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-4.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-4.png
index 41d4b693d..45c7b6115 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-4.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-4.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-5.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-5.png
index 31146aacd..95b3188e8 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-5.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-5.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-6.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-6.png
index 228ba6cb9..affb36f89 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-6.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-left-6.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-1.png
index b7598f8b2..2e3f6b1f7 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-2.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-2.png
index 6c8c5220f..cd6adeb6e 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-2.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-2.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-3.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-3.png
index 73f903253..ce85b7ac2 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-3.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-3.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-4.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-4.png
index a4bbb979a..315cd7ceb 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-4.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-4.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-5.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-5.png
index 26f1cc9d1..0f88f89ad 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-5.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-5.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-6.png b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-6.png
index 67c57fad1..6814876f9 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-6.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-corner-up-right-6.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-ending-down-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-ending-down-1.png
index 324f007d3..341b25ba6 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-ending-down-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-ending-down-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-ending-left-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-ending-left-1.png
index ff616883e..f370bdcdf 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-ending-left-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-ending-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-ending-right-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-ending-right-1.png
index 4a3bca0d1..b8f71d964 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-ending-right-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-ending-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-ending-up-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-ending-up-1.png
index 4a6fef925..dcb24ae13 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-ending-up-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-ending-up-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-1.png
index e5842bfb5..cd8a62ceb 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-2.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-2.png
index ce54dbaa8..491d60ad9 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-2.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-2.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-3.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-3.png
index bf1d95bed..42db32fd9 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-3.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-3.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-4.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-4.png
index d2705adbc..98ec245ce 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-4.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-4.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-5.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-5.png
index 80aec17b7..5c1672cbd 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-5.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-5.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-6.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-6.png
index f56a07681..935248e3b 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-6.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-6.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-single.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-single.png
index f535284a2..d88d8f378 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-single.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-horizontal-single.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-1.png
index ec7dd66c1..aa78f3a8e 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-2.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-2.png
index 111142543..cfa39ddc4 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-2.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-2.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-3.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-3.png
index 147782a18..44ff86db1 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-3.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-3.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-4.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-4.png
index 37b8f9c4f..0158a1ccc 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-4.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-4.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-5.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-5.png
index d370a3f4e..0a17f8810 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-5.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-5.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-6.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-6.png
index 4aec8a894..be6c0cb56 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-6.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-6.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-single.png b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-single.png
index 6b531d6a2..9d150ede4 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-single.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-straight-vertical-single.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-t-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-t-1.png
index 3dbf33fa9..ae28d04b7 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-t-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-t-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-t-down-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-t-down-1.png
index 7f095e6bd..13999f37b 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-t-down-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-t-down-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-t-left-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-t-left-1.png
index 6e016c20e..72c674207 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-t-left-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-t-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-t-right-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-t-right-1.png
index 7fb9e8373..ba499a31d 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-t-right-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-t-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/heat-pipe-t-up-1.png b/bobpower/graphics/heat-pipe-3/heat-pipe-t-up-1.png
index b84f2db27..308ccf51a 100644
Binary files a/bobpower/graphics/heat-pipe-3/heat-pipe-t-up-1.png and b/bobpower/graphics/heat-pipe-3/heat-pipe-t-up-1.png differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-1.png
deleted file mode 100644
index dd8addc19..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-2.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-2.png
deleted file mode 100644
index acd06eaf3..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-3.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-3.png
deleted file mode 100644
index b8abe1d5a..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-4.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-4.png
deleted file mode 100644
index 5fe1286f0..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-5.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-5.png
deleted file mode 100644
index b530670eb..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-6.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-6.png
deleted file mode 100644
index c405246cc..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-left-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-1.png
deleted file mode 100644
index 00b7fe315..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-2.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-2.png
deleted file mode 100644
index ae7702891..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-3.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-3.png
deleted file mode 100644
index d25147e7c..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-4.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-4.png
deleted file mode 100644
index 65e0a01eb..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-5.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-5.png
deleted file mode 100644
index 9df17e11a..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-6.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-6.png
deleted file mode 100644
index 5b2969f40..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-down-right-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-1.png
deleted file mode 100644
index 3d063ff80..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-2.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-2.png
deleted file mode 100644
index 1914f975c..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-3.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-3.png
deleted file mode 100644
index c2d2b9c44..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-4.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-4.png
deleted file mode 100644
index 986d51337..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-5.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-5.png
deleted file mode 100644
index 701aa0c53..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-6.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-6.png
deleted file mode 100644
index 3adbd5d0f..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-left-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-1.png
deleted file mode 100644
index 13cdc154b..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-2.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-2.png
deleted file mode 100644
index 30e6a8fa6..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-3.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-3.png
deleted file mode 100644
index cc7a5e351..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-4.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-4.png
deleted file mode 100644
index def7ff676..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-5.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-5.png
deleted file mode 100644
index c836b209c..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-6.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-6.png
deleted file mode 100644
index cb6ba8f9f..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-corner-up-right-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-down-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-down-1.png
deleted file mode 100644
index 3f1e4307d..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-down-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-left-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-left-1.png
deleted file mode 100644
index a6e0e3537..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-right-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-right-1.png
deleted file mode 100644
index 0ad9180de..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-up-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-up-1.png
deleted file mode 100644
index ea1b4dbe7..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-ending-up-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-1.png
deleted file mode 100644
index 88ac29b54..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-2.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-2.png
deleted file mode 100644
index 819bb59ec..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-3.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-3.png
deleted file mode 100644
index a7fec19fc..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-4.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-4.png
deleted file mode 100644
index 59870f742..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-5.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-5.png
deleted file mode 100644
index 2c1029b11..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-6.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-6.png
deleted file mode 100644
index 352af5533..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-1.png
deleted file mode 100644
index 0b234f4ce..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-2.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-2.png
deleted file mode 100644
index 2e5ca2fd9..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-3.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-3.png
deleted file mode 100644
index a56c8fdd9..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-4.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-4.png
deleted file mode 100644
index d85302194..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-5.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-5.png
deleted file mode 100644
index 5d6cad5c2..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-6.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-6.png
deleted file mode 100644
index 2ef2b4c61..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-single.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-single.png
deleted file mode 100644
index b6f18a247..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-vertical-single.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-1.png
deleted file mode 100644
index 16a79e5bf..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-down-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-down-1.png
deleted file mode 100644
index 5b7a05fa8..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-down-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-left-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-left-1.png
deleted file mode 100644
index 9fb34d6fc..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-right-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-right-1.png
deleted file mode 100644
index a47051b99..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-up-1.png b/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-up-1.png
deleted file mode 100644
index 0ebb8f4f1..000000000
Binary files a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-t-up-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-1.png
index 74c4e255c..dd8addc19 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-2.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-2.png
index ad3633908..acd06eaf3 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-2.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-2.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-3.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-3.png
index 26ba76f52..b8abe1d5a 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-3.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-3.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-4.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-4.png
index 9878f25b9..5fe1286f0 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-4.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-4.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-5.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-5.png
index 46fecb535..b530670eb 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-5.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-5.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-6.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-6.png
index 8da67bedf..c405246cc 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-6.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-left-6.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-1.png
index a29cfbec9..00b7fe315 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-2.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-2.png
index e148ef967..ae7702891 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-2.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-2.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-3.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-3.png
index 1808ee8e9..d25147e7c 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-3.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-3.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-4.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-4.png
index 301adae41..65e0a01eb 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-4.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-4.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-5.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-5.png
index a4860d60a..9df17e11a 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-5.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-5.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-6.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-6.png
index 94943fc30..5b2969f40 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-6.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-down-right-6.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-1.png
index a9264bbcb..3d063ff80 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-2.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-2.png
index 869699b1f..1914f975c 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-2.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-2.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-3.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-3.png
index 6ac3a0fa3..c2d2b9c44 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-3.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-3.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-4.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-4.png
index 868a9f4d1..986d51337 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-4.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-4.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-5.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-5.png
index d0e95a5f5..701aa0c53 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-5.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-5.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-6.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-6.png
index 3ce6d7f01..3adbd5d0f 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-6.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-left-6.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-1.png
index 1a020677a..13cdc154b 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-2.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-2.png
index 052c33d4e..30e6a8fa6 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-2.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-2.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-3.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-3.png
index 1024e72cb..cc7a5e351 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-3.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-3.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-4.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-4.png
index c53946e85..def7ff676 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-4.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-4.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-5.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-5.png
index 5eaa33deb..c836b209c 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-5.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-5.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-6.png b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-6.png
index b3027704c..cb6ba8f9f 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-6.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-corner-up-right-6.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-ending-down-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-ending-down-1.png
index db0801e1a..3f1e4307d 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-ending-down-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-ending-down-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-ending-left-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-ending-left-1.png
index f23ed9aac..a6e0e3537 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-ending-left-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-ending-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-ending-right-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-ending-right-1.png
index b9e772e52..0ad9180de 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-ending-right-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-ending-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-ending-up-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-ending-up-1.png
index 7e303231c..ea1b4dbe7 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-ending-up-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-ending-up-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-1.png
index d3b828b6d..88ac29b54 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-2.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-2.png
index 65bf7ad02..819bb59ec 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-2.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-2.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-3.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-3.png
index c598e0fe9..a7fec19fc 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-3.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-3.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-4.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-4.png
index 9cd35568e..59870f742 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-4.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-4.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-5.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-5.png
index 21a3b5d99..2c1029b11 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-5.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-5.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-6.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-6.png
index 667ce9c19..352af5533 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-6.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-6.png differ
diff --git a/bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-single.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-single.png
similarity index 100%
rename from bobpower/graphics/heat-pipe-3/hr-heat-pipe-straight-horizontal-single.png
rename to bobpower/graphics/heat-pipe-4/heat-pipe-straight-horizontal-single.png
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-1.png
index 389cce89e..0b234f4ce 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-2.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-2.png
index 2e4ec5738..2e5ca2fd9 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-2.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-2.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-3.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-3.png
index ce589af7c..a56c8fdd9 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-3.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-3.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-4.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-4.png
index ef2b495e5..d85302194 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-4.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-4.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-5.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-5.png
index 5a0fc8d6a..5d6cad5c2 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-5.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-5.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-6.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-6.png
index 276d1164e..2ef2b4c61 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-6.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-6.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-single.png b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-single.png
index f3538787b..b6f18a247 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-single.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-straight-vertical-single.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-t-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-t-1.png
index 3670afd91..16a79e5bf 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-t-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-t-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-t-down-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-t-down-1.png
index 45aefb617..5b7a05fa8 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-t-down-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-t-down-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-t-left-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-t-left-1.png
index cbb3b97a0..9fb34d6fc 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-t-left-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-t-left-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-t-right-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-t-right-1.png
index c88f990ee..a47051b99 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-t-right-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-t-right-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/heat-pipe-t-up-1.png b/bobpower/graphics/heat-pipe-4/heat-pipe-t-up-1.png
index 503bc209b..0ebb8f4f1 100644
Binary files a/bobpower/graphics/heat-pipe-4/heat-pipe-t-up-1.png and b/bobpower/graphics/heat-pipe-4/heat-pipe-t-up-1.png differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-1.png
deleted file mode 100644
index 9a8f888d9..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-2.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-2.png
deleted file mode 100644
index 6a13905bb..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-3.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-3.png
deleted file mode 100644
index 7e52f135f..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-4.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-4.png
deleted file mode 100644
index 30b0c06c8..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-5.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-5.png
deleted file mode 100644
index 2c6eb1eb0..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-6.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-6.png
deleted file mode 100644
index ecdf70b18..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-left-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-1.png
deleted file mode 100644
index d1ab083aa..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-2.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-2.png
deleted file mode 100644
index 1e4a10783..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-3.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-3.png
deleted file mode 100644
index 8676cc96a..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-4.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-4.png
deleted file mode 100644
index efe1302c2..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-5.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-5.png
deleted file mode 100644
index 280e99231..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-6.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-6.png
deleted file mode 100644
index 9e2c3a287..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-down-right-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-1.png
deleted file mode 100644
index 6fba8d969..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-2.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-2.png
deleted file mode 100644
index 1b3577a79..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-3.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-3.png
deleted file mode 100644
index 018e30a82..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-4.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-4.png
deleted file mode 100644
index bf0ca78b2..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-5.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-5.png
deleted file mode 100644
index 831f88e43..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-6.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-6.png
deleted file mode 100644
index b2ef2e758..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-left-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-1.png
deleted file mode 100644
index adc835ea7..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-2.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-2.png
deleted file mode 100644
index 8b65f48a4..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-3.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-3.png
deleted file mode 100644
index 1a9738552..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-4.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-4.png
deleted file mode 100644
index 5a8fa409c..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-5.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-5.png
deleted file mode 100644
index ec6973395..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-6.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-6.png
deleted file mode 100644
index 72a65c405..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-corner-up-right-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-down-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-down-1.png
deleted file mode 100644
index edfb12574..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-down-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-left-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-left-1.png
deleted file mode 100644
index e1e76e33d..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-right-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-right-1.png
deleted file mode 100644
index cb332b977..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-up-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-up-1.png
deleted file mode 100644
index e46ed25ef..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-ending-up-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-1.png
deleted file mode 100644
index e032f132e..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-2.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-2.png
deleted file mode 100644
index e809284f4..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-3.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-3.png
deleted file mode 100644
index ffe2b64d6..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-4.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-4.png
deleted file mode 100644
index 39d1480aa..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-5.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-5.png
deleted file mode 100644
index 5fae79b78..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-6.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-6.png
deleted file mode 100644
index f4c15d2ff..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-horizontal-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-1.png
deleted file mode 100644
index f062418c8..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-2.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-2.png
deleted file mode 100644
index 298c083db..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-2.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-3.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-3.png
deleted file mode 100644
index e628b2428..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-3.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-4.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-4.png
deleted file mode 100644
index 1feb4d6d8..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-4.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-5.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-5.png
deleted file mode 100644
index 080b9190d..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-5.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-6.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-6.png
deleted file mode 100644
index 31a48af03..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-6.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-single.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-single.png
deleted file mode 100644
index d5b2e50cd..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-straight-vertical-single.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-1.png
deleted file mode 100644
index f02e69d36..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-down-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-down-1.png
deleted file mode 100644
index 85565e6aa..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-down-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-left-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-left-1.png
deleted file mode 100644
index 00ba0b6d6..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-left-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-right-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-right-1.png
deleted file mode 100644
index 86d334baa..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-right-1.png and /dev/null differ
diff --git a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-up-1.png b/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-up-1.png
deleted file mode 100644
index bd775b3f2..000000000
Binary files a/bobpower/graphics/heat-pipe-4/hr-heat-pipe-t-up-1.png and /dev/null differ
diff --git a/bobpower/graphics/icons/burner-generator.png b/bobpower/graphics/icons/burner-generator.png
index 1b11be3fe..99f347889 100644
Binary files a/bobpower/graphics/icons/burner-generator.png and b/bobpower/graphics/icons/burner-generator.png differ
diff --git a/bobpower/graphics/icons/burner-reactor.png b/bobpower/graphics/icons/burner-reactor.png
index 7efc0968e..e187240f4 100644
Binary files a/bobpower/graphics/icons/burner-reactor.png and b/bobpower/graphics/icons/burner-reactor.png differ
diff --git a/bobpower/graphics/icons/fluid-generator.png b/bobpower/graphics/icons/fluid-generator.png
index 259cae689..2024cdf63 100644
Binary files a/bobpower/graphics/icons/fluid-generator.png and b/bobpower/graphics/icons/fluid-generator.png differ
diff --git a/bobpower/graphics/icons/heat-pipe-2.png b/bobpower/graphics/icons/heat-pipe-2.png
index e7dcf85c8..134a2c5a2 100644
Binary files a/bobpower/graphics/icons/heat-pipe-2.png and b/bobpower/graphics/icons/heat-pipe-2.png differ
diff --git a/bobpower/graphics/icons/heat-pipe-3.png b/bobpower/graphics/icons/heat-pipe-3.png
index ee587dbfe..ca341a25a 100644
Binary files a/bobpower/graphics/icons/heat-pipe-3.png and b/bobpower/graphics/icons/heat-pipe-3.png differ
diff --git a/bobpower/graphics/icons/heat-pipe-4.png b/bobpower/graphics/icons/heat-pipe-4.png
index 6d161e36e..a3e8d5355 100644
Binary files a/bobpower/graphics/icons/heat-pipe-4.png and b/bobpower/graphics/icons/heat-pipe-4.png differ
diff --git a/bobpower/graphics/icons/oil-boiler.png b/bobpower/graphics/icons/oil-boiler.png
index ee969dbc4..505b852d8 100644
Binary files a/bobpower/graphics/icons/oil-boiler.png and b/bobpower/graphics/icons/oil-boiler.png differ
diff --git a/bobpower/graphics/icons/technology/fluid-generator.png b/bobpower/graphics/icons/technology/fluid-generator.png
index 40f93b90a..b8593622d 100644
Binary files a/bobpower/graphics/icons/technology/fluid-generator.png and b/bobpower/graphics/icons/technology/fluid-generator.png differ
diff --git a/bobpower/graphics/icons/technology/steam-engine.png b/bobpower/graphics/icons/technology/steam-engine.png
index c732563a3..4b554968b 100644
Binary files a/bobpower/graphics/icons/technology/steam-engine.png and b/bobpower/graphics/icons/technology/steam-engine.png differ
diff --git a/bobpower/graphics/icons/technology/steam-turbine.png b/bobpower/graphics/icons/technology/steam-turbine.png
index 09e2d9a67..8ed6634d0 100644
Binary files a/bobpower/graphics/icons/technology/steam-turbine.png and b/bobpower/graphics/icons/technology/steam-turbine.png differ
diff --git a/bobpower/graphics/nuclear-reactor/hr-reactor-connect-patches-2.png b/bobpower/graphics/nuclear-reactor/hr-reactor-connect-patches-2.png
deleted file mode 100644
index 99661cc0b..000000000
Binary files a/bobpower/graphics/nuclear-reactor/hr-reactor-connect-patches-2.png and /dev/null differ
diff --git a/bobpower/graphics/nuclear-reactor/hr-reactor-connect-patches-3.png b/bobpower/graphics/nuclear-reactor/hr-reactor-connect-patches-3.png
deleted file mode 100644
index d21140270..000000000
Binary files a/bobpower/graphics/nuclear-reactor/hr-reactor-connect-patches-3.png and /dev/null differ
diff --git a/bobpower/graphics/nuclear-reactor/hr-reactor-lights.png b/bobpower/graphics/nuclear-reactor/hr-reactor-lights.png
deleted file mode 100644
index f179c98b0..000000000
Binary files a/bobpower/graphics/nuclear-reactor/hr-reactor-lights.png and /dev/null differ
diff --git a/bobpower/graphics/nuclear-reactor/hr-reactor-pipes-2.png b/bobpower/graphics/nuclear-reactor/hr-reactor-pipes-2.png
deleted file mode 100644
index e4fd66f69..000000000
Binary files a/bobpower/graphics/nuclear-reactor/hr-reactor-pipes-2.png and /dev/null differ
diff --git a/bobpower/graphics/nuclear-reactor/hr-reactor-pipes-3.png b/bobpower/graphics/nuclear-reactor/hr-reactor-pipes-3.png
deleted file mode 100644
index d45ad86a3..000000000
Binary files a/bobpower/graphics/nuclear-reactor/hr-reactor-pipes-3.png and /dev/null differ
diff --git a/bobpower/graphics/nuclear-reactor/reactor-connect-patches-2.png b/bobpower/graphics/nuclear-reactor/reactor-connect-patches-2.png
index 0c2d9fe90..99661cc0b 100644
Binary files a/bobpower/graphics/nuclear-reactor/reactor-connect-patches-2.png and b/bobpower/graphics/nuclear-reactor/reactor-connect-patches-2.png differ
diff --git a/bobpower/graphics/nuclear-reactor/reactor-connect-patches-3.png b/bobpower/graphics/nuclear-reactor/reactor-connect-patches-3.png
index 722aecf8d..d21140270 100644
Binary files a/bobpower/graphics/nuclear-reactor/reactor-connect-patches-3.png and b/bobpower/graphics/nuclear-reactor/reactor-connect-patches-3.png differ
diff --git a/bobpower/graphics/nuclear-reactor/reactor-connect-patches.png b/bobpower/graphics/nuclear-reactor/reactor-connect-patches.png
new file mode 100644
index 000000000..995a69306
Binary files /dev/null and b/bobpower/graphics/nuclear-reactor/reactor-connect-patches.png differ
diff --git a/bobpower/graphics/nuclear-reactor/reactor-lights.png b/bobpower/graphics/nuclear-reactor/reactor-lights.png
index 40980fae5..f179c98b0 100644
Binary files a/bobpower/graphics/nuclear-reactor/reactor-lights.png and b/bobpower/graphics/nuclear-reactor/reactor-lights.png differ
diff --git a/bobpower/graphics/nuclear-reactor/reactor-pipes-2.png b/bobpower/graphics/nuclear-reactor/reactor-pipes-2.png
index ba2bba8cf..e4fd66f69 100644
Binary files a/bobpower/graphics/nuclear-reactor/reactor-pipes-2.png and b/bobpower/graphics/nuclear-reactor/reactor-pipes-2.png differ
diff --git a/bobpower/graphics/nuclear-reactor/reactor-pipes-3.png b/bobpower/graphics/nuclear-reactor/reactor-pipes-3.png
index f20bc7c9f..d45ad86a3 100644
Binary files a/bobpower/graphics/nuclear-reactor/reactor-pipes-3.png and b/bobpower/graphics/nuclear-reactor/reactor-pipes-3.png differ
diff --git a/bobpower/graphics/nuclear-reactor/reactor-pipes.png b/bobpower/graphics/nuclear-reactor/reactor-pipes.png
new file mode 100644
index 000000000..a2961f498
Binary files /dev/null and b/bobpower/graphics/nuclear-reactor/reactor-pipes.png differ
diff --git a/bobpower/prototypes/burner-generator.lua b/bobpower/prototypes/burner-generator.lua
index 9120292e0..dbc32c915 100644
--- a/bobpower/prototypes/burner-generator.lua
+++ b/bobpower/prototypes/burner-generator.lua
@@ -9,6 +9,18 @@ if settings.startup["bobmods-power-burnergenerator"].value == true then
       order = "burner-generator",
       place_result = "bob-burner-generator",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
 
     {
@@ -51,10 +63,11 @@ if settings.startup["bobmods-power-burnergenerator"].value == true then
         usage_priority = "secondary-output",
       },
       burner = {
-        fuel_category = "chemical",
+        type = "burner",
+        fuel_categories = {"chemical"},
         effectivity = 0.75,
         fuel_inventory_size = 1,
-        emissions_per_minute = 15,
+        emissions_per_minute = {pollution = 15},
         smoke = {
           {
             name = "smoke",
@@ -96,7 +109,7 @@ if settings.startup["bobmods-power-burnergenerator"].value == true then
           },
         },
       },
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal-large",
       working_sound = {
         sound = {
           filename = "__base__/sound/steam-engine-90bpm.ogg",
diff --git a/bobpower/prototypes/burner-reactor.lua b/bobpower/prototypes/burner-reactor.lua
index bcc184d50..fd11829d5 100644
--- a/bobpower/prototypes/burner-reactor.lua
+++ b/bobpower/prototypes/burner-reactor.lua
@@ -2,16 +2,10 @@ if settings.startup["bobmods-power-heatsources"].value == true then
   local function lower_layer_picture(suffix)
     return {
       filename = "__bobpower__/graphics/burner-reactor/reactor-pipes" .. suffix .. ".png",
-      width = 96,
-      height = 96,
+      width = 192,
+      height = 192,
+      scale = 0.5,
       shift = { -0.03125, -0.1875 },
-      hr_version = {
-        filename = "__bobpower__/graphics/burner-reactor/hr-reactor-pipes" .. suffix .. ".png",
-        width = 192,
-        height = 192,
-        scale = 0.5,
-        shift = { -0.03125, -0.1875 },
-      },
     }
   end
 
@@ -19,16 +13,10 @@ if settings.startup["bobmods-power-heatsources"].value == true then
     return {
       sheet = {
         filename = "__bobpower__/graphics/burner-reactor/reactor-connect-patches" .. suffix .. ".png",
-        width = 32,
-        height = 32,
+        width = 64,
+        height = 64,
         variation_count = 12,
-        hr_version = {
-          filename = "__bobpower__/graphics/burner-reactor/hr-reactor-connect-patches" .. suffix .. ".png",
-          width = 64,
-          height = 64,
-          variation_count = 12,
-          scale = 0.5,
-        },
+        scale = 0.5,
       },
     }
   end
@@ -37,18 +25,11 @@ if settings.startup["bobmods-power-heatsources"].value == true then
     return {
       sheet = {
         filename = "__bobpower__/graphics/burner-reactor/reactor-connect-patches" .. suffix .. ".png",
-        width = 32,
-        height = 32,
+        width = 64,
+        height = 64,
         variation_count = 12,
-        y = 32,
-        hr_version = {
-          filename = "__bobpower__/graphics/burner-reactor/hr-reactor-connect-patches" .. suffix .. ".png",
-          width = 64,
-          height = 64,
-          variation_count = 12,
-          y = 64,
-          scale = 0.5,
-        },
+        y = 64,
+        scale = 0.5,
       },
     }
   end
@@ -58,11 +39,22 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       type = "item",
       name = "burner-reactor",
       icon = "__bobpower__/graphics/icons/burner-reactor.png",
-      icon_size = 32,
       subgroup = "energy",
       order = "f[heat-energy]-a[burner-reactor-1]",
       place_result = "burner-reactor",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
     {
       type = "recipe",
@@ -80,8 +72,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       type = "reactor",
       name = "burner-reactor",
       icon = "__bobpower__/graphics/icons/burner-reactor.png",
-      icon_size = 32,
-      localised_description = { "entity-description.burner-reactor", 750 },
+      localised_description = { "entity-description.burner-reactor", "750" },
       max_health = 300,
       flags = { "placeable-neutral", "player-creation" },
       minable = { mining_time = 0.3, result = "burner-reactor" },
@@ -89,7 +80,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
       corpse = "medium-remnants",
       fast_replaceable_group = "burner-reactor",
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal-large",
       resistances = {
         {
           type = "fire",
@@ -103,7 +94,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then
         type = "burner",
         fuel_categories = { "chemical" },
         effectivity = 1,
-        emissions_per_minute = 15,
+        emissions_per_minute = { pollution = 15 },
         fuel_inventory_size = 1,
         smoke = {
           {
@@ -184,11 +175,22 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       type = "item",
       name = "burner-reactor-2",
       icon = "__bobpower__/graphics/icons/burner-reactor.png",
-      icon_size = 32,
       subgroup = "energy",
       order = "f[heat-energy]-a[burner-reactor-2]",
       place_result = "burner-reactor-2",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
     {
       type = "recipe",
@@ -207,7 +209,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       data.raw.reactor["burner-reactor"],
       {
         name = "burner-reactor-2",
-        localised_description = { "entity-description.burner-reactor", 1000 },
+        localised_description = { "entity-description.burner-reactor", "1000" },
         minable = { result = "burner-reactor-2" },
         max_health = 500,
         consumption = "9MW",
@@ -229,11 +231,22 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       type = "item",
       name = "fluid-reactor",
       icon = "__bobpower__/graphics/icons/burner-reactor.png",
-      icon_size = 32,
       subgroup = "energy",
       order = "f[heat-energy]-b[fluid-reactor-1]",
       place_result = "fluid-reactor",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
     {
       type = "recipe",
@@ -252,7 +265,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then
         name = "fluid-reactor",
         minable = { result = "fluid-reactor" },
         next_upgrade = "fluid-reactor-2",
-        localised_description = { "entity-description.fluid-reactor", 750 },
+        localised_description = { "entity-description.fluid-reactor", "750" },
       },
     }),
   })
@@ -262,11 +275,22 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       type = "item",
       name = "fluid-reactor-2",
       icon = "__bobpower__/graphics/icons/burner-reactor.png",
-      icon_size = 32,
       subgroup = "energy",
       order = "f[heat-energy]-b[fluid-reactor-2]",
       place_result = "fluid-reactor-2",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/metal-large-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
     {
       type = "recipe",
@@ -287,7 +311,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       {
         name = "fluid-reactor-2",
         minable = { result = "fluid-reactor-2" },
-        localised_description = { "entity-description.fluid-reactor", 1000 },
+        localised_description = { "entity-description.fluid-reactor", "1000" },
       },
     }),
   })
@@ -362,16 +386,14 @@ if settings.startup["bobmods-power-heatsources"].value == true then
   local fluid_reactor_energy_source = {
     type = "fluid",
     effectivity = 1,
-    emissions_per_minute = 10,
+    emissions_per_minute = { pollution = 10 },
     fluid_box = {
-      base_area = 1,
-      height = 2,
-      base_level = -1,
+      volume = 200,
       pipe_connections = {
-        { type = "input-output", position = { 0, 2 } },
-        { type = "input-output", position = { 0, -2 } },
-        { type = "input-output", position = { 2, 0 } },
-        { type = "input-output", position = { -2, 0 } },
+        { flow_direction = "input-output", position = { 0, 1 }, direction = defines.direction.south },
+        { flow_direction = "input-output", position = { 0, -1 }, direction = defines.direction.north },
+        { flow_direction = "input-output", position = { 1, 0 }, direction = defines.direction.east },
+        { flow_direction = "input-output", position = { -1, 0 }, direction = defines.direction.west },
       },
       pipe_covers = pipecoverspictures(),
       pipe_picture = assembler2pipepictures(),
@@ -402,6 +424,7 @@ if settings.startup["bobmods-power-heatsources"].value == true then
       {
         type = "recipe",
         name = "fluid-reactor-from-fluid-furnace",
+        localised_name = { "entity-name.fluid-reactor" },
         energy_required = 2,
         enabled = false,
         ingredients = {
diff --git a/bobpower/prototypes/entity/accumulators.lua b/bobpower/prototypes/entity/accumulators.lua
index a90359d95..c48a943ae 100644
--- a/bobpower/prototypes/entity/accumulators.lua
+++ b/bobpower/prototypes/entity/accumulators.lua
@@ -2,18 +2,6 @@ local sounds = require("__base__.prototypes.entity.sounds")
 --local hit_effects = require ("__base__.prototypes.entity.hit-effects")
 
 if settings.startup["bobmods-power-accumulators"].value == true then
-  local accumulator = data.raw["accumulator"]["accumulator"]
-  accumulator.fast_replaceable_group = "accumulator"
-  accumulator.next_upgrade = "large-accumulator-2"
-  accumulator.energy_source = {
-    type = "electric",
-    buffer_capacity = "10MJ",
-    usage_priority = "tertiary",
-    input_flow_limit = "600kW",
-    output_flow_limit = "600kW",
-  }
-  accumulator.localised_name = { "entity-name.large-accumulator" }
-  accumulator.localised_description = { "entity-description.large-accumulator" }
 
   function bobmods.power.large_accumulator_picture(tint, repeat_count)
     return {
@@ -21,42 +9,23 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         {
           filename = "__bobpower__/graphics/accumulator/large-accumulator.png",
           priority = "high",
-          width = 66,
-          height = 110,
+          width = 130,
+          height = 221,
           repeat_count = repeat_count,
-          shift = util.by_pixel(0, -18),
+          shift = util.by_pixel(0, -19),
           tint = tint,
           animation_speed = 0.5,
-          hr_version = {
-            filename = "__bobpower__/graphics/accumulator/hr-large-accumulator.png",
-            priority = "high",
-            width = 130,
-            height = 221,
-            repeat_count = repeat_count,
-            shift = util.by_pixel(0, -19),
-            tint = tint,
-            animation_speed = 0.5,
-            scale = 0.5,
-          },
+          scale = 0.5,
         },
         {
           filename = "__bobpower__/graphics/accumulator/large-accumulator-shadow.png",
           priority = "high",
-          width = 140,
-          height = 54,
+          width = 274,
+          height = 106,
           repeat_count = repeat_count,
-          shift = util.by_pixel(48, 6),
+          shift = util.by_pixel(49, 6),
           draw_as_shadow = true,
-          hr_version = {
-            filename = "__bobpower__/graphics/accumulator/hr-large-accumulator-shadow.png",
-            priority = "high",
-            width = 274,
-            height = 106,
-            repeat_count = repeat_count,
-            shift = util.by_pixel(49, 6),
-            draw_as_shadow = true,
-            scale = 0.5,
-          },
+          scale = 0.5,
         },
       },
     }
@@ -69,23 +38,13 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         {
           filename = "__base__/graphics/entity/accumulator/accumulator-charge.png",
           priority = "high",
-          width = 90,
-          height = 100,
+          width = 178,
+          height = 206,
           line_length = 6,
           frame_count = 24,
           blend_mode = "additive",
           shift = util.by_pixel(0, -38),
-          hr_version = {
-            filename = "__base__/graphics/entity/accumulator/hr-accumulator-charge.png",
-            priority = "high",
-            width = 178,
-            height = 206,
-            line_length = 6,
-            frame_count = 24,
-            blend_mode = "additive",
-            shift = util.by_pixel(0, -38),
-            scale = 0.5,
-          },
+          scale = 0.5,
         },
       },
     }
@@ -98,28 +57,37 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         {
           filename = "__base__/graphics/entity/accumulator/accumulator-discharge.png",
           priority = "high",
-          width = 88,
-          height = 104,
+          width = 170,
+          height = 210,
           line_length = 6,
           frame_count = 24,
           blend_mode = "additive",
-          shift = util.by_pixel(-2, -38),
-          hr_version = {
-            filename = "__base__/graphics/entity/accumulator/hr-accumulator-discharge.png",
-            priority = "high",
-            width = 170,
-            height = 210,
-            line_length = 6,
-            frame_count = 24,
-            blend_mode = "additive",
-            shift = util.by_pixel(-1, -38),
-            scale = 0.5,
-          },
+          shift = util.by_pixel(-1, -38),
+          scale = 0.5,
         },
       },
     }
   end
 
+  local accumulator = data.raw["accumulator"]["accumulator"]
+  accumulator.fast_replaceable_group = "accumulator"
+  accumulator.next_upgrade = "large-accumulator-2"
+  accumulator.energy_source = {
+    type = "electric",
+    buffer_capacity = "10MJ",
+    usage_priority = "tertiary",
+    input_flow_limit = "600kW",
+    output_flow_limit = "600kW",
+  }
+  accumulator.localised_name = { "entity-name.large-accumulator" }
+  accumulator.localised_description = { "entity-description.large-accumulator" }
+  accumulator.drawing_box_vertical_extension = 1
+  accumulator.chargable_graphics.picture = bobmods.power.large_accumulator_picture()
+  accumulator.chargable_graphics.charge_animation = bobmods.power.large_accumulator_charge()
+  accumulator.chargable_graphics.discharge_animation = bobmods.power.large_accumulator_discharge()
+  accumulator.chargable_graphics.charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } }
+  accumulator.chargable_graphics.discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } }
+
   data:extend({
     {
       type = "accumulator",
@@ -142,34 +110,60 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         input_flow_limit = "240kW",
         output_flow_limit = "960kW",
       },
-      picture = accumulator_picture(),
-      charge_animation = accumulator_charge(),
+      chargable_graphics = {
+        picture = accumulator_picture(),
+        charge_animation = accumulator_charge(),
+        charge_cooldown = 30,
+        discharge_animation = accumulator_discharge(),
+        discharge_cooldown = 60,
+        charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+        discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+      },
       water_reflection = accumulator_reflection(),
-      charge_cooldown = 30,
-      charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      discharge_animation = accumulator_discharge(),
-      discharge_cooldown = 60,
-      discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      vehicle_impact_sound = sounds.generic_impact,
+      impact_category = "metal",
       open_sound = sounds.machine_open,
       close_sound = sounds.machine_close,
       working_sound = {
-        sound = {
-          filename = "__base__/sound/accumulator-working.ogg",
-          volume = 1,
+        main_sounds = {
+          {
+            activity_to_volume_modifiers = { inverted = true, offset = 2 },
+            fade_in_ticks = 4,
+            fade_out_ticks = 20,
+            match_volume_to_activity = true,
+            sound = {
+              filename = "__base__/sound/accumulator-working.ogg",
+              modifiers = {
+                type = "main-menu",
+                volume_multiplier = 1.44
+              },
+              volume = 0.4
+            },
+          },
+          {
+            activity_to_volume_modifiers = { offset = 1 },
+            fade_in_ticks = 4,
+            fade_out_ticks = 20,
+            match_volume_to_activity = true,
+            sound = {
+              filename = "__base__/sound/accumulator-discharging.ogg",
+              modifiers = {
+                type = "main-menu",
+                volume_multiplier = 1.44
+              },
+              volume = 0.4
+            },
+          },
         },
         idle_sound = {
           filename = "__base__/sound/accumulator-idle.ogg",
           volume = 0.4,
         },
         max_sounds_per_type = 3,
-        fade_in_ticks = 10,
-        fade_out_ticks = 30,
+        audible_distance_modifier = 0.5,
       },
       fast_replaceable_group = "accumulator",
       next_upgrade = "fast-accumulator-2",
-      circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points,
-      circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites,
+      circuit_connector = circuit_connector_definitions["accumulator"],
       circuit_wire_max_distance = 9,
       default_output_signal = { type = "virtual", name = "signal-A" },
     },
@@ -195,15 +189,17 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         input_flow_limit = "240kW",
         output_flow_limit = "30kW",
       },
-      picture = accumulator_picture(),
-      charge_animation = accumulator_charge(),
+      chargable_graphics = {
+        picture = accumulator_picture(),
+        charge_animation = accumulator_charge(),
+        charge_cooldown = 30,
+        discharge_animation = accumulator_discharge(),
+        discharge_cooldown = 60,
+        charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+        discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+      },
       water_reflection = accumulator_reflection(),
-      charge_cooldown = 30,
-      charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      discharge_animation = accumulator_discharge(),
-      discharge_cooldown = 60,
-      discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      vehicle_impact_sound = sounds.generic_impact,
+      impact_category = "metal",
       open_sound = sounds.machine_open,
       close_sound = sounds.machine_close,
       working_sound = {
@@ -221,8 +217,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       },
       fast_replaceable_group = "accumulator",
       next_upgrade = "slow-accumulator-2",
-      circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points,
-      circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites,
+      circuit_connector = circuit_connector_definitions["accumulator"],
       circuit_wire_max_distance = 9,
       default_output_signal = { type = "virtual", name = "signal-A" },
     },
@@ -240,7 +235,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       collision_box = { { -0.9, -0.9 }, { 0.9, 0.9 } },
       selection_box = { { -1, -1 }, { 1, 1 } },
       --    damaged_trigger_effect = hit_effects.entity(),
-      drawing_box_vertical_extension = 0.5,
+      drawing_box_vertical_extension = 1,
       energy_source = {
         type = "electric",
         buffer_capacity = "15MJ",
@@ -248,15 +243,17 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         input_flow_limit = "900kW",
         output_flow_limit = "900kW",
       },
-      picture = bobmods.power.large_accumulator_picture(),
-      charge_animation = bobmods.power.large_accumulator_charge(),
+      chargable_graphics = {
+        picture = bobmods.power.large_accumulator_picture(),
+        charge_animation = bobmods.power.large_accumulator_charge(),
+        charge_cooldown = 30,
+        discharge_animation = bobmods.power.large_accumulator_discharge(),
+        discharge_cooldown = 60,
+        charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+        discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+      },
       water_reflection = accumulator_reflection(),
-      charge_cooldown = 30,
-      charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      discharge_animation = bobmods.power.large_accumulator_discharge(),
-      discharge_cooldown = 60,
-      discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      vehicle_impact_sound = sounds.generic_impact,
+      impact_category = "metal",
       open_sound = sounds.machine_open,
       close_sound = sounds.machine_close,
       working_sound = {
@@ -274,8 +271,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       },
       fast_replaceable_group = "accumulator",
       next_upgrade = "large-accumulator-3",
-      circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points,
-      circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites,
+      circuit_connector = circuit_connector_definitions["accumulator"],
       circuit_wire_max_distance = 10,
       default_output_signal = { type = "virtual", name = "signal-A" },
     },
@@ -301,15 +297,17 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         input_flow_limit = "360kW",
         output_flow_limit = "1440kW",
       },
-      picture = accumulator_picture(),
-      charge_animation = accumulator_charge(),
+      chargable_graphics = {
+        picture = accumulator_picture(),
+        charge_animation = accumulator_charge(),
+        charge_cooldown = 30,
+        discharge_animation = accumulator_discharge(),
+        discharge_cooldown = 60,
+        charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+        discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+      },
       water_reflection = accumulator_reflection(),
-      charge_cooldown = 30,
-      charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      discharge_animation = accumulator_discharge(),
-      discharge_cooldown = 60,
-      discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      vehicle_impact_sound = sounds.generic_impact,
+      impact_category = "metal",
       open_sound = sounds.machine_open,
       close_sound = sounds.machine_close,
       working_sound = {
@@ -327,8 +325,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       },
       fast_replaceable_group = "accumulator",
       next_upgrade = "fast-accumulator-3",
-      circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points,
-      circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites,
+      circuit_connector = circuit_connector_definitions["accumulator"],
       circuit_wire_max_distance = 10,
       default_output_signal = { type = "virtual", name = "signal-A" },
     },
@@ -354,15 +351,17 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         input_flow_limit = "360kW",
         output_flow_limit = "45kW",
       },
-      picture = accumulator_picture(),
-      charge_animation = accumulator_charge(),
+      chargable_graphics = {
+        picture = accumulator_picture(),
+        charge_animation = accumulator_charge(),
+        charge_cooldown = 30,
+        discharge_animation = accumulator_discharge(),
+        discharge_cooldown = 60,
+        charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+        discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+      },
       water_reflection = accumulator_reflection(),
-      charge_cooldown = 30,
-      charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      discharge_animation = accumulator_discharge(),
-      discharge_cooldown = 60,
-      discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      vehicle_impact_sound = sounds.generic_impact,
+      impact_category = "metal",
       open_sound = sounds.machine_open,
       close_sound = sounds.machine_close,
       working_sound = {
@@ -380,8 +379,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       },
       fast_replaceable_group = "accumulator",
       next_upgrade = "slow-accumulator-3",
-      circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points,
-      circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites,
+      circuit_connector = circuit_connector_definitions["accumulator"],
       circuit_wire_max_distance = 10,
       default_output_signal = { type = "virtual", name = "signal-A" },
     },
@@ -399,7 +397,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       collision_box = { { -0.9, -0.9 }, { 0.9, 0.9 } },
       selection_box = { { -1, -1 }, { 1, 1 } },
       --    damaged_trigger_effect = hit_effects.entity(),
-      drawing_box_vertical_extension = 0.5,
+      drawing_box_vertical_extension = 1,
       energy_source = {
         type = "electric",
         buffer_capacity = "22.5MJ",
@@ -407,15 +405,17 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         input_flow_limit = "1350kW",
         output_flow_limit = "1350kW",
       },
-      picture = bobmods.power.large_accumulator_picture(),
-      charge_animation = bobmods.power.large_accumulator_charge(),
+      chargable_graphics = {
+        picture = bobmods.power.large_accumulator_picture(),
+        charge_animation = bobmods.power.large_accumulator_charge(),
+        charge_cooldown = 30,
+        discharge_animation = bobmods.power.large_accumulator_discharge(),
+        discharge_cooldown = 60,
+        charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+        discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+      },
       water_reflection = accumulator_reflection(),
-      charge_cooldown = 30,
-      charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      discharge_animation = bobmods.power.large_accumulator_discharge(),
-      discharge_cooldown = 60,
-      discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      vehicle_impact_sound = sounds.generic_impact,
+      impact_category = "metal",
       open_sound = sounds.machine_open,
       close_sound = sounds.machine_close,
       working_sound = {
@@ -432,8 +432,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         fade_out_ticks = 30,
       },
       fast_replaceable_group = "accumulator",
-      circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points,
-      circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites,
+      circuit_connector = circuit_connector_definitions["accumulator"],
       circuit_wire_max_distance = 12.5,
       default_output_signal = { type = "virtual", name = "signal-A" },
     },
@@ -459,15 +458,17 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         input_flow_limit = "540kW",
         output_flow_limit = "2160kW",
       },
-      picture = accumulator_picture(),
-      charge_animation = accumulator_charge(),
+      chargable_graphics = {
+        picture = accumulator_picture(),
+        charge_animation = accumulator_charge(),
+        charge_cooldown = 30,
+        discharge_animation = accumulator_discharge(),
+        discharge_cooldown = 60,
+        charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+        discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+      },
       water_reflection = accumulator_reflection(),
-      charge_cooldown = 30,
-      charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      discharge_animation = accumulator_discharge(),
-      discharge_cooldown = 60,
-      discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      vehicle_impact_sound = sounds.generic_impact,
+      impact_category = "metal",
       open_sound = sounds.machine_open,
       close_sound = sounds.machine_close,
       working_sound = {
@@ -484,8 +485,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         fade_out_ticks = 30,
       },
       fast_replaceable_group = "accumulator",
-      circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points,
-      circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites,
+      circuit_connector = circuit_connector_definitions["accumulator"],
       circuit_wire_max_distance = 12.5,
       default_output_signal = { type = "virtual", name = "signal-A" },
     },
@@ -511,15 +511,17 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         input_flow_limit = "540kW",
         output_flow_limit = "65kW",
       },
-      picture = accumulator_picture(),
-      charge_animation = accumulator_charge(),
+      chargable_graphics = {
+        picture = accumulator_picture(),
+        charge_animation = accumulator_charge(),
+        charge_cooldown = 30,
+        discharge_animation = accumulator_discharge(),
+        discharge_cooldown = 60,
+        charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+        discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
+      },
       water_reflection = accumulator_reflection(),
-      charge_cooldown = 30,
-      charge_light = { intensity = 0.3, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      discharge_animation = accumulator_discharge(),
-      discharge_cooldown = 60,
-      discharge_light = { intensity = 0.7, size = 7, color = { r = 1.0, g = 1.0, b = 1.0 } },
-      vehicle_impact_sound = sounds.generic_impact,
+      impact_category = "metal",
       open_sound = sounds.machine_open,
       close_sound = sounds.machine_close,
       working_sound = {
@@ -536,8 +538,7 @@ if settings.startup["bobmods-power-accumulators"].value == true then
         fade_out_ticks = 30,
       },
       fast_replaceable_group = "accumulator",
-      circuit_wire_connection_point = circuit_connector_definitions["accumulator"].points,
-      circuit_connector_sprites = circuit_connector_definitions["accumulator"].sprites,
+      circuit_connector = circuit_connector_definitions["accumulator"],
       circuit_wire_max_distance = 12.5,
       default_output_signal = { type = "virtual", name = "signal-A" },
     },
diff --git a/bobpower/prototypes/entity/boilers.lua b/bobpower/prototypes/entity/boilers.lua
index ec5ad5809..8f66080e6 100644
--- a/bobpower/prototypes/entity/boilers.lua
+++ b/bobpower/prototypes/entity/boilers.lua
@@ -24,7 +24,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         target_temperature = 315,
         energy_consumption = "3.6MW",
         energy_source = {
-          emissions_per_minute = 30,
+          emissions_per_minute = { pollution = 30 },
         },
       },
     }),
@@ -42,7 +42,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         target_temperature = 465,
         energy_consumption = "5.4MW",
         energy_source = {
-          emissions_per_minute = 22.5,
+          emissions_per_minute = { pollution = 22.5 },
         },
       },
     }),
@@ -60,7 +60,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         target_temperature = 615,
         energy_consumption = "7.2MW",
         energy_source = {
-          emissions_per_minute = 15,
+          emissions_per_minute = { pollution = 15 },
         },
       },
     }),
@@ -77,7 +77,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         target_temperature = 765,
         energy_consumption = "9MW",
         energy_source = {
-          emissions_per_minute = 9.375,
+          emissions_per_minute = { pollution = 9.375 },
         },
       },
     }),
diff --git a/bobpower/prototypes/entity/fluid-generator.lua b/bobpower/prototypes/entity/fluid-generator.lua
index 4d0196a01..ddb5af4d4 100644
--- a/bobpower/prototypes/entity/fluid-generator.lua
+++ b/bobpower/prototypes/entity/fluid-generator.lua
@@ -3,14 +3,14 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
     return {
       layers = {
         { --bodge layer
-          filename = "__bobpower__/graphics/fluid-generator/hr-fluid-generator-fan-spin.png",
+          filename = "__bobpower__/graphics/fluid-generator/fluid-generator-fan-spin.png",
           priority = "extra-high",
           width = 1,
           height = 1,
           frame_count = 120,
         },
         {
-          filename = "__bobpower__/graphics/fluid-generator/hr-fluid-generator.png",
+          filename = "__bobpower__/graphics/fluid-generator/fluid-generator.png",
           priority = "extra-high",
           width = 264,
           height = 284,
@@ -20,7 +20,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
           scale = 0.5,
         },
         {
-          filename = "__bobpower__/graphics/fluid-generator/hr-fluid-generator-fan.png",
+          filename = "__bobpower__/graphics/fluid-generator/fluid-generator-fan.png",
           priority = "extra-high",
           width = 78,
           height = 70,
@@ -30,7 +30,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
           scale = 0.5,
         },
         {
-          filename = "__bobpower__/graphics/fluid-generator/hr-fluid-generator-fan-spin.png",
+          filename = "__bobpower__/graphics/fluid-generator/fluid-generator-fan-spin.png",
           priority = "extra-high",
           width = 60,
           height = 46,
@@ -40,7 +40,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
           scale = 0.5,
         },
         {
-          filename = "__bobpower__/graphics/fluid-generator/hr-fluid-generator-shadow.png",
+          filename = "__bobpower__/graphics/fluid-generator/fluid-generator-shadow.png",
           priority = "extra-high",
           width = 311,
           height = 194,
@@ -59,13 +59,12 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
       type = "generator",
       name = "fluid-generator",
       icon = "__bobpower__/graphics/icons/fluid-generator.png",
-      icon_size = 32,
       flags = { "placeable-neutral", "player-creation" },
       minable = { mining_time = 1, result = "fluid-generator" },
       max_health = 500,
       corpse = "big-remnants",
       dying_explosion = "medium-explosion",
-      effectivity = 1,
+      effectivity = 0.75,
       fluid_usage_per_tick = 1,
       maximum_temperature = 165,
       burns_fluid = true,
@@ -86,22 +85,20 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
       collision_box = { { -1.35, -1.35 }, { 1.35, 1.35 } },
       selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
       fluid_box = {
-        base_area = 1,
-        height = 2,
-        base_level = -1,
+        volume = 200,
         pipe_covers = pipecoverspictures(),
         pipe_connections = {
-          { type = "input-output", position = { 0, 2 } },
-          { type = "input-output", position = { 0, -2 } },
-          { type = "input-output", position = { 2, 0 } },
-          { type = "input-output", position = { -2, 0 } },
+          { flow_direction = "input-output", position = { 0, 1 }, direction = defines.direction.south },
+          { flow_direction = "input-output", position = { 0, -1 }, direction = defines.direction.north },
+          { flow_direction = "input-output", position = { 1, 0 }, direction = defines.direction.east },
+          { flow_direction = "input-output", position = { -1, 0 }, direction = defines.direction.west },
         },
         production_type = "input-output",
       },
       energy_source = {
         type = "electric",
         usage_priority = "secondary-output",
-        emissions_per_minute = 20,
+        emissions_per_minute = { pollution = 20 },
       },
       horizontal_animation = bobmods.power.fluid_generator_structure(),
       vertical_animation = bobmods.power.fluid_generator_structure(),
@@ -125,7 +122,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
           starting_frame_deviation = 60,
         },
       },
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal-large",
       working_sound = {
         sound = {
           filename = "__base__/sound/steam-engine-90bpm.ogg",
@@ -141,13 +138,12 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
       type = "generator",
       name = "fluid-generator-2",
       icon = "__bobpower__/graphics/icons/fluid-generator.png",
-      icon_size = 32,
       flags = { "placeable-neutral", "player-creation" },
       minable = { mining_time = 1, result = "fluid-generator-2" },
       max_health = 650,
       corpse = "big-remnants",
       dying_explosion = "medium-explosion",
-      effectivity = 1,
+      effectivity = 0.8,
       fluid_usage_per_tick = 1.5,
       maximum_temperature = 165,
       burns_fluid = true,
@@ -168,22 +164,20 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
       collision_box = { { -1.35, -1.35 }, { 1.35, 1.35 } },
       selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
       fluid_box = {
-        base_area = 1,
-        height = 2,
-        base_level = -1,
+        volume = 200,
         pipe_covers = pipecoverspictures(),
         pipe_connections = {
-          { type = "input-output", position = { 0, 2 } },
-          { type = "input-output", position = { 0, -2 } },
-          { type = "input-output", position = { 2, 0 } },
-          { type = "input-output", position = { -2, 0 } },
+          { flow_direction = "input-output", position = { 0, 1 }, direction = defines.direction.south },
+          { flow_direction = "input-output", position = { 0, -1 }, direction = defines.direction.north },
+          { flow_direction = "input-output", position = { 1, 0 }, direction = defines.direction.east },
+          { flow_direction = "input-output", position = { -1, 0 }, direction = defines.direction.west },
         },
         production_type = "input-output",
       },
       energy_source = {
         type = "electric",
         usage_priority = "secondary-output",
-        emissions_per_minute = 15,
+        emissions_per_minute = { pollution = 15 },
       },
       horizontal_animation = bobmods.power.fluid_generator_structure(),
       vertical_animation = bobmods.power.fluid_generator_structure(),
@@ -207,7 +201,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
           starting_frame_deviation = 60,
         },
       },
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal-large",
       working_sound = {
         sound = {
           filename = "__base__/sound/steam-engine-90bpm.ogg",
@@ -223,13 +217,12 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
       type = "generator",
       name = "fluid-generator-3",
       icon = "__bobpower__/graphics/icons/fluid-generator.png",
-      icon_size = 32,
       flags = { "placeable-neutral", "player-creation" },
       minable = { mining_time = 1, result = "fluid-generator-3" },
       max_health = 800,
       corpse = "big-remnants",
       dying_explosion = "medium-explosion",
-      effectivity = 1,
+      effectivity = 0.85,
       fluid_usage_per_tick = 2,
       maximum_temperature = 165,
       burns_fluid = true,
@@ -249,22 +242,20 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
       collision_box = { { -1.35, -1.35 }, { 1.35, 1.35 } },
       selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
       fluid_box = {
-        base_area = 1,
-        height = 2,
-        base_level = -1,
+        volume = 200,
         pipe_covers = pipecoverspictures(),
         pipe_connections = {
-          { type = "input-output", position = { 0, 2 } },
-          { type = "input-output", position = { 0, -2 } },
-          { type = "input-output", position = { 2, 0 } },
-          { type = "input-output", position = { -2, 0 } },
+          { flow_direction = "input-output", position = { 0, 1 }, direction = defines.direction.south },
+          { flow_direction = "input-output", position = { 0, -1 }, direction = defines.direction.north },
+          { flow_direction = "input-output", position = { 1, 0 }, direction = defines.direction.east },
+          { flow_direction = "input-output", position = { -1, 0 }, direction = defines.direction.west },
         },
         production_type = "input-output",
       },
       energy_source = {
         type = "electric",
         usage_priority = "secondary-output",
-        emissions_per_minute = 10,
+        emissions_per_minute = { pollution = 10 },
       },
       horizontal_animation = bobmods.power.fluid_generator_structure(),
       vertical_animation = bobmods.power.fluid_generator_structure(),
@@ -288,7 +279,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
           starting_frame_deviation = 60,
         },
       },
-      vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal-large",
       working_sound = {
         sound = {
           filename = "__base__/sound/steam-engine-90bpm.ogg",
@@ -307,7 +298,6 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         type = "generator",
         name = "hydrazine-generator",
         icon = "__bobpower__/graphics/icons/fluid-generator.png",
-        icon_size = 32,
         flags = { "placeable-neutral", "player-creation" },
         minable = { mining_time = 1, result = "hydrazine-generator" },
         max_health = 950,
@@ -331,15 +321,13 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         collision_box = { { -1.35, -1.35 }, { 1.35, 1.35 } },
         selection_box = { { -1.5, -1.5 }, { 1.5, 1.5 } },
         fluid_box = {
-          base_area = 1,
-          height = 2,
-          base_level = -1,
+          volume = 200,
           pipe_covers = pipecoverspictures(),
           pipe_connections = {
-            { type = "input-output", position = { 0, 2 } },
-            { type = "input-output", position = { 0, -2 } },
-            { type = "input-output", position = { 2, 0 } },
-            { type = "input-output", position = { -2, 0 } },
+            { flow_direction = "input-output", position = { 0, 1 }, direction = defines.direction.south },
+            { flow_direction = "input-output", position = { 0, -1 }, direction = defines.direction.north },
+            { flow_direction = "input-output", position = { 1, 0 }, direction = defines.direction.east },
+            { flow_direction = "input-output", position = { -1, 0 }, direction = defines.direction.west },
           },
           production_type = "input-output",
           filter = "hydrazine",
@@ -347,7 +335,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         energy_source = {
           type = "electric",
           usage_priority = "secondary-output",
-          emissions_per_minute = 1,
+          emissions_per_minute = { pollution = 1 },
         },
         horizontal_animation = bobmods.power.fluid_generator_structure(),
         vertical_animation = bobmods.power.fluid_generator_structure(),
@@ -373,7 +361,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
             starting_frame_deviation = 60,
           },
         },
-        vehicle_impact_sound = { filename = "__base__/sound/car-metal-impact.ogg", volume = 0.65 },
+      impact_category = "metal-large",
         working_sound = {
           sound = {
             filename = "__base__/sound/steam-engine-90bpm.ogg",
diff --git a/bobpower/prototypes/entity/nuclear.lua b/bobpower/prototypes/entity/nuclear.lua
index 30cdca619..59cd8051c 100644
--- a/bobpower/prototypes/entity/nuclear.lua
+++ b/bobpower/prototypes/entity/nuclear.lua
@@ -1,26 +1,45 @@
 if settings.startup["bobmods-power-nuclear"].value == true then
   data.raw.reactor["nuclear-reactor"].consumption = "54MW"
+  data.raw.reactor["nuclear-reactor"].heat_buffer.max_transfer = "20GW"
   data.raw.reactor["nuclear-reactor"].fast_replaceable_group = "nuclear-reactor"
   data.raw.reactor["nuclear-reactor"].use_fuel_glow_color = true
   data.raw.reactor["nuclear-reactor"].default_fuel_glow_color = { 0, 1, 0, 1 } -- color used as working_light_picture tint for fuels that don't have glow color defined
   data.raw.reactor["nuclear-reactor"].localised_description =
-    { "", { "entity-description.nuclear-reactor" }, { "entity-description.reactor-max-temperature", 1000 } }
+    { "", { "entity-description.nuclear-reactor" }, { "entity-description.reactor-max-temperature", "1000" } }
+  data.raw.reactor["nuclear-reactor"].lower_layer_picture = {
+    filename = "__bobpower__/graphics/nuclear-reactor/reactor-pipes.png",
+    width = 320,
+    height = 316,
+    scale = 0.5,
+    shift = { -0.03125, -0.15625 },
+  }
+  data.raw.reactor["nuclear-reactor"].connection_patches_connected = {
+    sheet = {
+      filename = "__bobpower__/graphics/nuclear-reactor/reactor-connect-patches.png",
+      width = 64,
+      height = 64,
+      variation_count = 12,
+      scale = 0.5,
+    },
+  }
+  data.raw.reactor["nuclear-reactor"].connection_patches_disconnected = {
+    sheet = {
+      filename = "__bobpower__/graphics/nuclear-reactor/reactor-connect-patches.png",
+      width = 64,
+      height = 64,
+      variation_count = 12,
+      y = 64,
+      scale = 0.5,
+    },
+  }
   data.raw.reactor["nuclear-reactor"].working_light_picture = {
     filename = "__bobpower__/graphics/nuclear-reactor/reactor-lights.png",
-    width = 160,
-    height = 160,
+    width = 320,
+    height = 320,
+    scale = 0.5,
     shift = { -0.03125, -0.1875 },
     blend_mode = "additive",
     draw_as_glow = true,
-    hr_version = {
-      filename = "__bobpower__/graphics/nuclear-reactor/hr-reactor-lights.png",
-      width = 320,
-      height = 320,
-      scale = 0.5,
-      shift = { -0.03125, -0.1875 },
-      blend_mode = "additive",
-      draw_as_glow = true,
-    },
   }
 
   data:extend({
@@ -31,7 +50,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then
         localised_description = {
           "",
           { "entity-description.nuclear-reactor" },
-          { "entity-description.reactor-max-temperature", 1250 },
+          { "entity-description.reactor-max-temperature", "1250" },
         },
         icon = "__base__/graphics/icons/nuclear-reactor.png",
         icon_size = 64,
@@ -39,52 +58,33 @@ if settings.startup["bobmods-power-nuclear"].value == true then
         max_health = 750,
         consumption = "72MW",
         heat_buffer = {
-          max_transfer = "20GW",
+          max_transfer = "40GW",
           max_temperature = 1250,
         },
         lower_layer_picture = {
           filename = "__bobpower__/graphics/nuclear-reactor/reactor-pipes-2.png",
-          width = 156,
-          height = 156,
-          shift = { -0.0625, -0.125 },
-          hr_version = {
-            filename = "__bobpower__/graphics/nuclear-reactor/hr-reactor-pipes-2.png",
-            width = 320,
-            height = 316,
-            scale = 0.5,
-            shift = { -0.03125, -0.15625 },
-          },
+          width = 320,
+          height = 316,
+          scale = 0.5,
+          shift = { -0.03125, -0.15625 },
         },
         connection_patches_connected = {
           sheet = {
             filename = "__bobpower__/graphics/nuclear-reactor/reactor-connect-patches-2.png",
-            width = 32,
-            height = 32,
+            width = 64,
+            height = 64,
             variation_count = 12,
-            hr_version = {
-              filename = "__bobpower__/graphics/nuclear-reactor/hr-reactor-connect-patches-2.png",
-              width = 64,
-              height = 64,
-              variation_count = 12,
-              scale = 0.5,
-            },
+            scale = 0.5,
           },
         },
         connection_patches_disconnected = {
           sheet = {
             filename = "__bobpower__/graphics/nuclear-reactor/reactor-connect-patches-2.png",
-            width = 32,
-            height = 32,
+            width = 64,
+            height = 64,
             variation_count = 12,
-            y = 32,
-            hr_version = {
-              filename = "__bobpower__/graphics/nuclear-reactor/hr-reactor-connect-patches-2.png",
-              width = 64,
-              height = 64,
-              variation_count = 12,
-              y = 64,
-              scale = 0.5,
-            },
+            y = 64,
+            scale = 0.5,
           },
         },
       },
@@ -99,7 +99,7 @@ if settings.startup["bobmods-power-nuclear"].value == true then
         localised_description = {
           "",
           { "entity-description.nuclear-reactor" },
-          { "entity-description.reactor-max-temperature", 1500 },
+          { "entity-description.reactor-max-temperature", "1500" },
         },
         icon = "__base__/graphics/icons/nuclear-reactor.png",
         icon_size = 64,
@@ -107,52 +107,33 @@ if settings.startup["bobmods-power-nuclear"].value == true then
         max_health = 1000,
         consumption = "90MW",
         heat_buffer = {
-          max_transfer = "30GW",
+          max_transfer = "80GW",
           max_temperature = 1500,
         },
         lower_layer_picture = {
           filename = "__bobpower__/graphics/nuclear-reactor/reactor-pipes-3.png",
-          width = 156,
-          height = 156,
-          shift = { -0.0625, -0.125 },
-          hr_version = {
-            filename = "__bobpower__/graphics/nuclear-reactor/hr-reactor-pipes-3.png",
-            width = 320,
-            height = 316,
-            scale = 0.5,
-            shift = { -0.03125, -0.15625 },
-          },
+          width = 320,
+          height = 316,
+          scale = 0.5,
+          shift = { -0.03125, -0.15625 },
         },
         connection_patches_connected = {
           sheet = {
             filename = "__bobpower__/graphics/nuclear-reactor/reactor-connect-patches-3.png",
-            width = 32,
-            height = 32,
+            width = 64,
+            height = 64,
             variation_count = 12,
-            hr_version = {
-              filename = "__bobpower__/graphics/nuclear-reactor/hr-reactor-connect-patches-3.png",
-              width = 64,
-              height = 64,
-              variation_count = 12,
-              scale = 0.5,
-            },
+            scale = 0.5,
           },
         },
         connection_patches_disconnected = {
           sheet = {
             filename = "__bobpower__/graphics/nuclear-reactor/reactor-connect-patches-3.png",
-            width = 32,
-            height = 32,
+            width = 64,
+            height = 64,
             variation_count = 12,
-            y = 32,
-            hr_version = {
-              filename = "__bobpower__/graphics/nuclear-reactor/hr-reactor-connect-patches-3.png",
-              width = 64,
-              height = 64,
-              variation_count = 12,
-              y = 64,
-              scale = 0.5,
-            },
+            y = 64,
+            scale = 0.5,
           },
         },
       },
diff --git a/bobpower/prototypes/entity/oil-boilers.lua b/bobpower/prototypes/entity/oil-boilers.lua
index 244b09c6c..39c064869 100644
--- a/bobpower/prototypes/entity/oil-boilers.lua
+++ b/bobpower/prototypes/entity/oil-boilers.lua
@@ -5,7 +5,6 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         name = "oil-boiler",
         icon = "__bobpower__/graphics/icons/oil-boiler.png",
-        icon_size = 32,
         minable = { mining_time = 0.5, result = "oil-boiler" },
         max_health = 300,
         target_temperature = 315,
@@ -17,13 +16,11 @@ if settings.startup["bobmods-power-steam"].value == true then
 
   data.raw.boiler["oil-boiler"].energy_source = {
     type = "fluid",
-    emissions_per_minute = 22.5,
+    emissions_per_minute = { pollution = 22.5 },
     fluid_box = {
-      base_area = 1,
-      height = 2,
-      base_level = -1,
+      volume = 200,
       pipe_connections = {
-        { type = "input", position = { 0, 1.5 } },
+        { flow_direction = "input", position = { 0, 0.5 }, direction = defines.direction.south },
       },
       pipe_covers = pipecoverspictures(),
       pipe_picture = assembler2pipepictures(),
@@ -52,14 +49,13 @@ if settings.startup["bobmods-power-steam"].value == true then
         name = "oil-boiler-2",
         icon = "__bobpower__/graphics/icons/oil-boiler.png",
         localised_description = { "entity-description.oil-boiler" },
-        icon_size = 32,
         minable = { mining_time = 0.5, result = "oil-boiler-2" },
         max_health = 375,
         target_temperature = 465,
         energy_consumption = "8.1MW",
         next_upgrade = "oil-boiler-3",
         energy_source = {
-          emissions_per_minute = 16.875,
+          emissions_per_minute = { pollution = 16.875 },
         },
       },
     }),
@@ -70,14 +66,13 @@ if settings.startup["bobmods-power-steam"].value == true then
         name = "oil-boiler-3",
         icon = "__bobpower__/graphics/icons/oil-boiler.png",
         localised_description = { "entity-description.oil-boiler" },
-        icon_size = 32,
         minable = { mining_time = 0.5, result = "oil-boiler-3" },
         max_health = 450,
         target_temperature = 615,
         energy_consumption = "10.8MW",
         next_upgrade = "oil-boiler-4",
         energy_source = {
-          emissions_per_minute = 11.25,
+          emissions_per_minute = { pollution = 11.25 },
         },
       },
     }),
@@ -88,13 +83,12 @@ if settings.startup["bobmods-power-steam"].value == true then
         name = "oil-boiler-4",
         icon = "__bobpower__/graphics/icons/oil-boiler.png",
         localised_description = { "entity-description.oil-boiler" },
-        icon_size = 32,
         minable = { mining_time = 0.5, result = "oil-boiler-4" },
         max_health = 525,
         target_temperature = 765,
         energy_consumption = "13.5MW",
         energy_source = {
-          emissions_per_minute = 7.03125,
+          emissions_per_minute = { pollution = 7.03125 },
         },
       },
     }),
diff --git a/bobpower/prototypes/entity/poles.lua b/bobpower/prototypes/entity/poles.lua
index bbd46eedf..79dd1a659 100644
--- a/bobpower/prototypes/entity/poles.lua
+++ b/bobpower/prototypes/entity/poles.lua
@@ -65,7 +65,7 @@ if settings.startup["bobmods-power-poles"].value == true then
         name = "big-electric-pole-4",
         minable = { result = "big-electric-pole-4" },
         max_health = 375,
-        maximum_wire_distance = 60,
+        maximum_wire_distance = 64,
         supply_area_distance = 2,
       },
     }),
diff --git a/bobpower/prototypes/entity/solar-panels.lua b/bobpower/prototypes/entity/solar-panels.lua
index 905c89c1d..9cd01f99f 100644
--- a/bobpower/prototypes/entity/solar-panels.lua
+++ b/bobpower/prototypes/entity/solar-panels.lua
@@ -28,6 +28,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       production = "26.67kW",
       fast_replaceable_group = "solar-panel",
       next_upgrade = "solar-panel-small-2",
+      impact_category = "glass",
     },
 
     {
@@ -55,6 +56,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       production = "106.67kW",
       fast_replaceable_group = "solar-panel",
       next_upgrade = "solar-panel-large-2",
+      impact_category = "glass",
     },
 
     {
@@ -82,6 +84,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       production = "40kW",
       fast_replaceable_group = "solar-panel",
       next_upgrade = "solar-panel-small-3",
+      impact_category = "glass",
     },
 
     {
@@ -109,6 +112,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       production = "90kW",
       fast_replaceable_group = "solar-panel",
       next_upgrade = "solar-panel-3",
+      impact_category = "glass",
     },
 
     {
@@ -136,6 +140,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       production = "160kW",
       fast_replaceable_group = "solar-panel",
       next_upgrade = "solar-panel-large-3",
+      impact_category = "glass",
     },
 
     {
@@ -188,6 +193,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       },
       production = "135kW",
       fast_replaceable_group = "solar-panel",
+      impact_category = "glass",
     },
 
     {
@@ -214,6 +220,7 @@ if settings.startup["bobmods-power-solar"].value == true then
       },
       production = "240kW",
       fast_replaceable_group = "solar-panel",
+      impact_category = "glass",
     },
   })
 end
diff --git a/bobpower/prototypes/heat-pipes.lua b/bobpower/prototypes/heat-pipes.lua
index ff76c2e98..d98df9057 100644
--- a/bobpower/prototypes/heat-pipes.lua
+++ b/bobpower/prototypes/heat-pipes.lua
@@ -6,9 +6,9 @@ then
   data.raw.item["heat-pipe"].order = "f[nuclear-energy]-c[heat-pipe-1]"
   data.raw["heat-pipe"]["heat-pipe"].fast_replaceable_group = "heat-pipe"
   data.raw["heat-pipe"]["heat-pipe"].heat_buffer.minimum_glow_temperature = 300
-  data.raw["heat-pipe"]["heat-pipe"].heat_buffer.max_transfer = "1GW"
+  data.raw["heat-pipe"]["heat-pipe"].heat_buffer.max_transfer = "2GW"
   data.raw["heat-pipe"]["heat-pipe"].heat_buffer.max_temperature = 750
-  data.raw["heat-pipe"]["heat-pipe"].localised_description = { "entity-description.heat-pipe", 750 }
+  data.raw["heat-pipe"]["heat-pipe"].localised_description = { "entity-description.heat-pipe", "750" }
   bobmods.lib.recipe.set_ingredients(
     "heat-pipe",
     { { type = "item", name = "steel-plate", amount = 5 }, { type = "item", name = "copper-plate", amount = 10 } }
@@ -19,31 +19,64 @@ then
       type = "item",
       name = "heat-pipe-2",
       icon = "__bobpower__/graphics/icons/heat-pipe-2.png",
-      icon_size = 32,
       subgroup = "energy",
       order = "f[nuclear-energy]-c[heat-pipe-2]",
       place_result = "heat-pipe-2",
       stack_size = 50,
+      drop_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-move.ogg",
+        volume = 0.8,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-move.ogg",
+        volume = 0.8,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
     {
       type = "item",
       name = "heat-pipe-3",
       icon = "__bobpower__/graphics/icons/heat-pipe-3.png",
-      icon_size = 32,
       subgroup = "energy",
       order = "f[nuclear-energy]-c[heat-pipe-3]",
       place_result = "heat-pipe-3",
       stack_size = 50,
+      drop_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-move.ogg",
+        volume = 0.8,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-move.ogg",
+        volume = 0.8,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
     {
       type = "item",
       name = "heat-pipe-4",
       icon = "__bobpower__/graphics/icons/heat-pipe-4.png",
-      icon_size = 32,
       subgroup = "energy",
       order = "f[nuclear-energy]-c[heat-pipe-4]",
       place_result = "heat-pipe-4",
       stack_size = 50,
+      drop_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-move.ogg",
+        volume = 0.8,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-move.ogg",
+        volume = 0.8,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/metal-small-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
 
     {
@@ -84,13 +117,12 @@ then
       data.raw["heat-pipe"]["heat-pipe"],
       {
         name = "heat-pipe-2",
-        localised_description = { "entity-description.heat-pipe", 1000 },
+        localised_description = { "entity-description.heat-pipe", "1000" },
         icon = "__bobpower__/graphics/icons/heat-pipe-2.png",
-        icon_size = 32,
         minable = { mining_time = 0.1, result = "heat-pipe-2" },
         max_health = 300,
         heat_buffer = {
-          max_transfer = "1.666GW",
+          max_transfer = "4GW",
           max_temperature = 1000,
           minimum_glow_temperature = 400,
         },
@@ -119,13 +151,12 @@ then
       data.raw["heat-pipe"]["heat-pipe"],
       {
         name = "heat-pipe-3",
-        localised_description = { "entity-description.heat-pipe", 1250 },
+        localised_description = { "entity-description.heat-pipe", "1250" },
         icon = "__bobpower__/graphics/icons/heat-pipe-3.png",
-        icon_size = 32,
         minable = { mining_time = 0.1, result = "heat-pipe-3" },
         max_health = 300,
         heat_buffer = {
-          max_transfer = "3GW",
+          max_transfer = "7GW",
           max_temperature = 1250,
           minimum_glow_temperature = 400,
         },
@@ -154,13 +185,12 @@ then
       data.raw["heat-pipe"]["heat-pipe"],
       {
         name = "heat-pipe-4",
-        localised_description = { "entity-description.heat-pipe", 1500 },
+        localised_description = { "entity-description.heat-pipe", "1500" },
         icon = "__bobpower__/graphics/icons/heat-pipe-4.png",
-        icon_size = 32,
         minable = { mining_time = 0.1, result = "heat-pipe-4" },
         max_health = 400,
         heat_buffer = {
-          max_transfer = "5GW",
+          max_transfer = "10GW",
           max_temperature = 1500,
           minimum_glow_temperature = 450,
         },
diff --git a/bobpower/prototypes/item/accumulators.lua b/bobpower/prototypes/item/accumulators.lua
index e00a2fd65..6bade997c 100644
--- a/bobpower/prototypes/item/accumulators.lua
+++ b/bobpower/prototypes/item/accumulators.lua
@@ -2,6 +2,15 @@ if settings.startup["bobmods-power-accumulators"].value == true then
   data.raw["item"]["accumulator"].order = "e[accumulator]-a[accumulator]-a-l"
   data.raw["item"]["accumulator"].subgroup = "bob-energy-accumulator"
 
+  local electric_large_drop_move = {
+    filename = "__base__/sound/item/electric-large-inventory-move.ogg",
+    volume = 0.7,
+  }
+  local electric_large_pick = {
+    filename = "__base__/sound/item/electric-large-inventory-pickup.ogg",
+    volume = 0.7,
+  }
+
   data:extend({
     {
       type = "item",
@@ -12,6 +21,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       order = "e[accumulator]-a[accumulator]-a-f",
       place_result = "fast-accumulator",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -23,6 +35,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       order = "e[accumulator]-a[accumulator]-a-s",
       place_result = "slow-accumulator",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -34,6 +49,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       order = "e[accumulator]-a[accumulator]-b-l",
       place_result = "large-accumulator-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -45,6 +63,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       order = "e[accumulator]-a[accumulator]-b-f",
       place_result = "fast-accumulator-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -56,6 +77,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       order = "e[accumulator]-a[accumulator]-b-s",
       place_result = "slow-accumulator-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -67,6 +91,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       order = "e[accumulator]-a[accumulator]-c-l",
       place_result = "large-accumulator-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -78,6 +105,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       order = "e[accumulator]-a[accumulator]-c-f",
       place_result = "fast-accumulator-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -89,6 +119,9 @@ if settings.startup["bobmods-power-accumulators"].value == true then
       order = "e[accumulator]-a[accumulator]-c-s",
       place_result = "slow-accumulator-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
   })
 end
diff --git a/bobpower/prototypes/item/boilers.lua b/bobpower/prototypes/item/boilers.lua
index 1c7e22289..4eadaf9de 100644
--- a/bobpower/prototypes/item/boilers.lua
+++ b/bobpower/prototypes/item/boilers.lua
@@ -2,6 +2,15 @@ if settings.startup["bobmods-power-steam"].value == true then
   data.raw.item["boiler"].order = "b[steam-power]-a[boiler-1]"
   data.raw.item["boiler"].subgroup = "bob-energy-boiler"
 
+  local steam_drop_move = {
+    filename = "__base__/sound/item/steam-inventory-move.ogg",
+    volume = 0.6,
+  }
+  local steam_pick = {
+    filename = "__base__/sound/item/steam-inventory-pickup.ogg",
+    volume = 0.4,
+  }
+
   data:extend({
     {
       type = "item",
@@ -12,6 +21,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-a[boiler-2]",
       place_result = "boiler-2",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
 
     {
@@ -23,6 +35,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-a[boiler-3]",
       place_result = "boiler-3",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
 
     {
@@ -34,6 +49,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-a[boiler-4]",
       place_result = "boiler-4",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
 
     {
@@ -45,6 +63,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-a[boiler-5]",
       place_result = "boiler-5",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
   })
 end
diff --git a/bobpower/prototypes/item/fluid-generator.lua b/bobpower/prototypes/item/fluid-generator.lua
index dcf93befe..5e4b9c813 100644
--- a/bobpower/prototypes/item/fluid-generator.lua
+++ b/bobpower/prototypes/item/fluid-generator.lua
@@ -4,33 +4,66 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
       type = "item",
       name = "fluid-generator",
       icon = "__bobpower__/graphics/icons/fluid-generator.png",
-      icon_size = 32,
       subgroup = "bob-energy-fluid-generator",
       order = "fluid-generator-1",
       place_result = "fluid-generator",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
 
     {
       type = "item",
       name = "fluid-generator-2",
       icon = "__bobpower__/graphics/icons/fluid-generator.png",
-      icon_size = 32,
       subgroup = "bob-energy-fluid-generator",
       order = "fluid-generator-1",
       place_result = "fluid-generator-2",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
 
     {
       type = "item",
       name = "fluid-generator-3",
       icon = "__bobpower__/graphics/icons/fluid-generator.png",
-      icon_size = 32,
       subgroup = "bob-energy-fluid-generator",
       order = "fluid-generator-1",
       place_result = "fluid-generator-3",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/mechanical-inventory-pickup.ogg",
+        volume = 0.8,
+      },
     },
   })
 
@@ -40,11 +73,22 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         type = "item",
         name = "hydrazine-generator",
         icon = "__bobpower__/graphics/icons/fluid-generator.png",
-        icon_size = 32,
         subgroup = "bob-energy-fluid-generator",
         order = "fluid-generator-1",
         place_result = "hydrazine-generator",
         stack_size = 10,
+        drop_sound = {
+          filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+          volume = 0.7,
+        },
+        inventory_move_sound = {
+          filename = "__base__/sound/item/mechanical-inventory-move.ogg",
+          volume = 0.7,
+        },
+        pick_sound = {
+          filename = "__base__/sound/item/mechanical-inventory-pickup.ogg",
+          volume = 0.8,
+        },
       },
     })
   end
diff --git a/bobpower/prototypes/item/heat-exchangers.lua b/bobpower/prototypes/item/heat-exchangers.lua
index b63e576b2..595045144 100644
--- a/bobpower/prototypes/item/heat-exchangers.lua
+++ b/bobpower/prototypes/item/heat-exchangers.lua
@@ -2,6 +2,15 @@ if settings.startup["bobmods-power-steam"].value == true then
   data.raw.item["heat-exchanger"].order = "f[nuclear-energy]-b[heat-exchanger-1]"
   data.raw.item["heat-exchanger"].subgroup = "bob-energy-heat-exchanger"
 
+  local steam_drop_move = {
+    filename = "__base__/sound/item/steam-inventory-move.ogg",
+    volume = 0.6,
+  }
+  local steam_pick = {
+    filename = "__base__/sound/item/steam-inventory-pickup.ogg",
+    volume = 0.4,
+  }
+
   data:extend({
     {
       type = "item",
@@ -12,6 +21,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "f[nuclear-energy]-b[heat-exchanger-2]",
       place_result = "heat-exchanger-2",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
 
     {
@@ -23,6 +35,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "f[nuclear-energy]-b[heat-exchanger-3]",
       place_result = "heat-exchanger-3",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
 
     {
@@ -34,6 +49,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "f[nuclear-energy]-b[heat-exchanger-4]",
       place_result = "heat-exchanger-4",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
   })
 end
diff --git a/bobpower/prototypes/item/nuclear.lua b/bobpower/prototypes/item/nuclear.lua
index d1392f482..ac934f27a 100644
--- a/bobpower/prototypes/item/nuclear.lua
+++ b/bobpower/prototypes/item/nuclear.lua
@@ -11,6 +11,18 @@ if settings.startup["bobmods-power-nuclear"].value == true then
       order = "f[nuclear-energy]-a[reactor-2]",
       place_result = "nuclear-reactor-2",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/reactor-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/reactor-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/reactor-inventory-pickup.ogg",
+        volume = 0.6,
+      },
     },
     {
       type = "item",
@@ -21,6 +33,18 @@ if settings.startup["bobmods-power-nuclear"].value == true then
       order = "f[nuclear-energy]-a[reactor-3]",
       place_result = "nuclear-reactor-3",
       stack_size = 10,
+      drop_sound = {
+        filename = "__base__/sound/item/reactor-inventory-move.ogg",
+        volume = 0.7,
+      },
+      inventory_move_sound = {
+        filename = "__base__/sound/item/reactor-inventory-move.ogg",
+        volume = 0.7,
+      },
+      pick_sound = {
+        filename = "__base__/sound/item/reactor-inventory-pickup.ogg",
+        volume = 0.6,
+      },
     },
   })
 end
diff --git a/bobpower/prototypes/item/oil-boilers.lua b/bobpower/prototypes/item/oil-boilers.lua
index 1c4207d5d..3b4cb808b 100644
--- a/bobpower/prototypes/item/oil-boilers.lua
+++ b/bobpower/prototypes/item/oil-boilers.lua
@@ -1,47 +1,65 @@
 if settings.startup["bobmods-power-steam"].value == true then
+
+  local steam_drop_move = {
+    filename = "__base__/sound/item/steam-inventory-move.ogg",
+    volume = 0.6,
+  }
+  local steam_pick = {
+    filename = "__base__/sound/item/steam-inventory-pickup.ogg",
+    volume = 0.4,
+  }
+
   data:extend({
     {
       type = "item",
       name = "oil-boiler",
       icon = "__bobpower__/graphics/icons/oil-boiler.png",
-      icon_size = 32,
       subgroup = "bob-energy-oil-boiler",
       order = "b[steam-power]-b[oil-boiler-1]",
       place_result = "oil-boiler",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
 
     {
       type = "item",
       name = "oil-boiler-2",
       icon = "__bobpower__/graphics/icons/oil-boiler.png",
-      icon_size = 32,
       subgroup = "bob-energy-oil-boiler",
       order = "b[steam-power]-b[oil-boiler-2]",
       place_result = "oil-boiler-2",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
 
     {
       type = "item",
       name = "oil-boiler-3",
       icon = "__bobpower__/graphics/icons/oil-boiler.png",
-      icon_size = 32,
       subgroup = "bob-energy-oil-boiler",
       order = "b[steam-power]-b[oil-boiler-3]",
       place_result = "oil-boiler-3",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
 
     {
       type = "item",
       name = "oil-boiler-4",
       icon = "__bobpower__/graphics/icons/oil-boiler.png",
-      icon_size = 32,
       subgroup = "bob-energy-oil-boiler",
       order = "b[steam-power]-b[oil-boiler-4]",
       place_result = "oil-boiler-4",
       stack_size = 50,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
   })
 end
diff --git a/bobpower/prototypes/item/poles.lua b/bobpower/prototypes/item/poles.lua
index 1aad6147a..f85c7aec8 100644
--- a/bobpower/prototypes/item/poles.lua
+++ b/bobpower/prototypes/item/poles.lua
@@ -3,6 +3,15 @@ if settings.startup["bobmods-power-poles"].value == true then
   data.raw.item["big-electric-pole"].order = "a[energy]-c[big-electric-pole-1]"
   data.raw.item["substation"].order = "a[energy]-d[substation-1]"
 
+  local electric_large_drop_move = {
+    filename = "__base__/sound/item/electric-large-inventory-move.ogg",
+    volume = 0.7,
+  }
+  local electric_large_pick = {
+    filename = "__base__/sound/item/electric-large-inventory-pickup.ogg",
+    volume = 0.7,
+  }
+
   data:extend({
     {
       type = "item",
@@ -13,6 +22,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-b[medium-electric-pole-2]",
       place_result = "medium-electric-pole-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -24,6 +36,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-b[medium-electric-pole-3]",
       place_result = "medium-electric-pole-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -35,6 +50,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-b[medium-electric-pole-4]",
       place_result = "medium-electric-pole-4",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -46,6 +64,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-c[big-electric-pole-2]",
       place_result = "big-electric-pole-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -57,6 +78,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-c[big-electric-pole-3]",
       place_result = "big-electric-pole-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -68,6 +92,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-c[big-electric-pole-4]",
       place_result = "big-electric-pole-4",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -79,6 +106,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-d[substation-2]",
       place_result = "substation-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -90,6 +120,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-d[substation-3]",
       place_result = "substation-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -101,6 +134,9 @@ if settings.startup["bobmods-power-poles"].value == true then
       order = "a[energy]-d[substation-4]",
       place_result = "substation-4",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
   })
 end
diff --git a/bobpower/prototypes/item/solar-panels.lua b/bobpower/prototypes/item/solar-panels.lua
index cb597ce37..101cdbce0 100644
--- a/bobpower/prototypes/item/solar-panels.lua
+++ b/bobpower/prototypes/item/solar-panels.lua
@@ -2,6 +2,15 @@ if settings.startup["bobmods-power-solar"].value == true then
   data.raw["item"]["solar-panel"].order = "d[solar-panel]-a[solar-panel-1-b]"
   data.raw["item"]["solar-panel"].subgroup = "bob-energy-solar-panel"
 
+  local electric_large_drop_move = {
+    filename = "__base__/sound/item/electric-large-inventory-move.ogg",
+    volume = 0.7,
+  }
+  local electric_large_pick = {
+    filename = "__base__/sound/item/electric-large-inventory-pickup.ogg",
+    volume = 0.7,
+  }
+
   data:extend({
     {
       type = "item",
@@ -12,6 +21,9 @@ if settings.startup["bobmods-power-solar"].value == true then
       order = "d[solar-panel]-a[solar-panel-1-a]",
       place_result = "solar-panel-small",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -23,6 +35,9 @@ if settings.startup["bobmods-power-solar"].value == true then
       order = "d[solar-panel]-a[solar-panel-1-c]",
       place_result = "solar-panel-large",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -34,6 +49,9 @@ if settings.startup["bobmods-power-solar"].value == true then
       order = "d[solar-panel]-a[solar-panel-2-a]",
       place_result = "solar-panel-small-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -45,6 +63,9 @@ if settings.startup["bobmods-power-solar"].value == true then
       order = "d[solar-panel]-a[solar-panel-2-b]",
       place_result = "solar-panel-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -56,6 +77,9 @@ if settings.startup["bobmods-power-solar"].value == true then
       order = "d[solar-panel]-a[solar-panel-2-c]",
       place_result = "solar-panel-large-2",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -67,6 +91,9 @@ if settings.startup["bobmods-power-solar"].value == true then
       order = "d[solar-panel]-a[solar-panel-3-a]",
       place_result = "solar-panel-small-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -78,6 +105,9 @@ if settings.startup["bobmods-power-solar"].value == true then
       order = "d[solar-panel]-a[solar-panel-3-b]",
       place_result = "solar-panel-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
 
     {
@@ -89,6 +119,9 @@ if settings.startup["bobmods-power-solar"].value == true then
       order = "d[solar-panel]-a[solar-panel-3-c]",
       place_result = "solar-panel-large-3",
       stack_size = 50,
+      drop_sound = electric_large_drop_move,
+      inventory_move_sound = electric_large_drop_move,
+      pick_sound = electric_large_pick,
     },
   })
 end
diff --git a/bobpower/prototypes/item/steam-engines.lua b/bobpower/prototypes/item/steam-engines.lua
index 10a324660..fb8217266 100644
--- a/bobpower/prototypes/item/steam-engines.lua
+++ b/bobpower/prototypes/item/steam-engines.lua
@@ -2,6 +2,15 @@ if settings.startup["bobmods-power-steam"].value == true then
   data.raw["item"]["steam-engine"].order = "b[steam-power]-b[steam-engine-1]"
   data.raw["item"]["steam-engine"].subgroup = "bob-energy-steam-engine"
 
+  local steam_drop_move = {
+    filename = "__base__/sound/item/steam-inventory-move.ogg",
+    volume = 0.6,
+  }
+  local steam_pick = {
+    filename = "__base__/sound/item/steam-inventory-pickup.ogg",
+    volume = 0.4,
+  }
+
   data:extend({
     {
       type = "item",
@@ -12,6 +21,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-b[steam-engine-2]",
       place_result = "steam-engine-2",
       stack_size = 10,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
     {
       type = "item",
@@ -22,6 +34,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-b[steam-engine-3]",
       place_result = "steam-engine-3",
       stack_size = 10,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
     {
       type = "item",
@@ -32,6 +47,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-b[steam-engine-4]",
       place_result = "steam-engine-4",
       stack_size = 10,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
     {
       type = "item",
@@ -42,6 +60,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-b[steam-engine-5]",
       place_result = "steam-engine-5",
       stack_size = 10,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
   })
 end
diff --git a/bobpower/prototypes/item/steam-turbines.lua b/bobpower/prototypes/item/steam-turbines.lua
index 58cce8935..a47b8fae0 100644
--- a/bobpower/prototypes/item/steam-turbines.lua
+++ b/bobpower/prototypes/item/steam-turbines.lua
@@ -2,6 +2,15 @@ if settings.startup["bobmods-power-steam"].value == true then
   data.raw["item"]["steam-turbine"].order = "b[steam-power]-c[steam-turbine-1]"
   data.raw["item"]["steam-turbine"].subgroup = "bob-energy-steam-engine"
 
+  local steam_drop_move = {
+    filename = "__base__/sound/item/steam-inventory-move.ogg",
+    volume = 0.6,
+  }
+  local steam_pick = {
+    filename = "__base__/sound/item/steam-inventory-pickup.ogg",
+    volume = 0.4,
+  }
+
   data:extend({
     {
       type = "item",
@@ -12,6 +21,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-c[steam-turbine-2]",
       place_result = "steam-turbine-2",
       stack_size = 10,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
     {
       type = "item",
@@ -22,6 +34,9 @@ if settings.startup["bobmods-power-steam"].value == true then
       order = "b[steam-power]-c[steam-turbine-3]",
       place_result = "steam-turbine-3",
       stack_size = 10,
+      drop_sound = steam_drop_move,
+      inventory_move_sound = steam_drop_move,
+      pick_sound = steam_pick,
     },
   })
 end
diff --git a/bobpower/prototypes/recipe/fluid-generator-updates.lua b/bobpower/prototypes/recipe/fluid-generator-updates.lua
index 878543e4d..f94080c53 100644
--- a/bobpower/prototypes/recipe/fluid-generator-updates.lua
+++ b/bobpower/prototypes/recipe/fluid-generator-updates.lua
@@ -20,7 +20,11 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
 
   if data.raw.item["advanced-processing-unit"] then
     bobmods.lib.recipe.add_ingredient("fluid-generator", { type = "item", name = "electronic-circuit", amount = 5 })
-    bobmods.lib.tech.add_prerequisite("fluid-generator-1", "electronics")
+    if data.raw.technology["bob-electronics"] then
+      bobmods.lib.tech.add_prerequisite("fluid-generator-1", "bob-electronics")
+    else
+      bobmods.lib.tech.add_prerequisite("fluid-generator-1", "electronics")
+    end
   end
 
   if data.raw.item["cobalt-steel-bearing"] then
diff --git a/bobpower/prototypes/recipe/heat-exchangers.lua b/bobpower/prototypes/recipe/heat-exchangers.lua
index f83557bf5..a6b40525d 100644
--- a/bobpower/prototypes/recipe/heat-exchangers.lua
+++ b/bobpower/prototypes/recipe/heat-exchangers.lua
@@ -56,6 +56,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "heat-exchanger-2-from-boiler-3",
+        localised_name = { "entity-name.heat-exchanger-2" },
         subgroup = "bob-energy-heat-exchanger-convert",
         enabled = false,
         ingredients = {
@@ -68,6 +69,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "heat-exchanger-3-from-boiler-4",
+        localised_name = { "entity-name.heat-exchanger-3" },
         subgroup = "bob-energy-heat-exchanger-convert",
         enabled = false,
         ingredients = {
@@ -81,6 +83,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "heat-exchanger-4-from-boiler-5",
+        localised_name = { "entity-name.heat-exchanger-4" },
         subgroup = "bob-energy-heat-exchanger-convert",
         enabled = false,
         ingredients = {
@@ -96,6 +99,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "boiler-2-from-heat-exchanger",
+        localised_name = { "entity-name.boiler-2" },
         subgroup = "bob-energy-boiler-convert",
         energy_required = 3,
         enabled = false,
@@ -113,6 +117,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "boiler-3-from-heat-exchanger-2",
+        localised_name = { "entity-name.boiler-3" },
         subgroup = "bob-energy-boiler-convert",
         enabled = false,
         ingredients = {
@@ -129,6 +134,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "boiler-4-from-heat-exchanger-3",
+        localised_name = { "entity-name.boiler-4" },
         subgroup = "bob-energy-boiler-convert",
         enabled = false,
         ingredients = {
@@ -145,6 +151,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "boiler-5-from-heat-exchanger-4",
+        localised_name = { "entity-name.boiler-5" },
         subgroup = "bob-energy-boiler-convert",
         enabled = false,
         ingredients = {
diff --git a/bobpower/prototypes/recipe/oil-boilers.lua b/bobpower/prototypes/recipe/oil-boilers.lua
index 89b427128..e99b17d22 100644
--- a/bobpower/prototypes/recipe/oil-boilers.lua
+++ b/bobpower/prototypes/recipe/oil-boilers.lua
@@ -53,6 +53,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "oil-boiler-2-from-boiler-3",
+        localised_name = { "entity-name.oil-boiler-2" },
         subgroup = "bob-energy-oil-boiler-convert",
         enabled = false,
         ingredients = {
@@ -66,6 +67,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "oil-boiler-3-from-boiler-4",
+        localised_name = { "entity-name.oil-boiler-3" },
         subgroup = "bob-energy-oil-boiler-convert",
         enabled = false,
         ingredients = {
@@ -79,6 +81,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "oil-boiler-4-from-boiler-5",
+        localised_name = { "entity-name.oil-boiler-4" },
         subgroup = "bob-energy-oil-boiler-convert",
         enabled = false,
         ingredients = {
@@ -93,6 +96,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "boiler-2-from-oil-boiler",
+        localised_name = { "entity-name.boiler-2" },
         subgroup = "bob-energy-boiler-convert",
         enabled = false,
         ingredients = {
@@ -109,6 +113,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "boiler-3-from-oil-boiler-2",
+        localised_name = { "entity-name.boiler-3" },
         subgroup = "bob-energy-boiler-convert",
         enabled = false,
         ingredients = {
@@ -125,6 +130,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "boiler-4-from-oil-boiler-3",
+        localised_name = { "entity-name.boiler-4" },
         subgroup = "bob-energy-boiler-convert",
         enabled = false,
         ingredients = {
@@ -141,6 +147,7 @@ if settings.startup["bobmods-power-steam"].value == true then
       {
         type = "recipe",
         name = "boiler-5-from-oil-boiler-4",
+        localised_name = { "entity-name.boiler-5" },
         subgroup = "bob-energy-boiler-convert",
         enabled = false,
         ingredients = {
diff --git a/bobpower/prototypes/technology/fluid-generator.lua b/bobpower/prototypes/technology/fluid-generator.lua
index 9e02e2668..7ee3451a9 100644
--- a/bobpower/prototypes/technology/fluid-generator.lua
+++ b/bobpower/prototypes/technology/fluid-generator.lua
@@ -9,7 +9,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         "logistic-science-pack",
       },
       icon = "__bobpower__/graphics/icons/technology/fluid-generator.png",
-      icon_size = 128,
+      icon_size = 256,
       effects = {
         {
           type = "unlock-recipe",
@@ -35,7 +35,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         "chemical-science-pack",
       },
       icon = "__bobpower__/graphics/icons/technology/fluid-generator.png",
-      icon_size = 128,
+      icon_size = 256,
       effects = {
         {
           type = "unlock-recipe",
@@ -62,7 +62,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
         "production-science-pack",
       },
       icon = "__bobpower__/graphics/icons/technology/fluid-generator.png",
-      icon_size = 128,
+      icon_size = 256,
       effects = {
         {
           type = "unlock-recipe",
@@ -95,7 +95,7 @@ if settings.startup["bobmods-power-fluidgenerator"].value == true then
           "utility-science-pack",
         },
         icon = "__bobpower__/graphics/icons/technology/fluid-generator.png",
-        icon_size = 128,
+        icon_size = 256,
         effects = {
           {
             type = "unlock-recipe",
diff --git a/bobpower/prototypes/technology/steam-engines.lua b/bobpower/prototypes/technology/steam-engines.lua
index d4a959857..9262fb585 100644
--- a/bobpower/prototypes/technology/steam-engines.lua
+++ b/bobpower/prototypes/technology/steam-engines.lua
@@ -8,7 +8,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         "logistic-science-pack",
       },
       icon = "__bobpower__/graphics/icons/technology/steam-engine.png",
-      icon_size = 128,
+      icon_size = 256,
       effects = {
         {
           type = "unlock-recipe",
@@ -23,7 +23,6 @@ if settings.startup["bobmods-power-steam"].value == true then
         },
         time = 30,
       },
-      order = "[steam-engine]-2",
     },
 
     {
@@ -34,7 +33,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         "chemical-science-pack",
       },
       icon = "__bobpower__/graphics/icons/technology/steam-engine.png",
-      icon_size = 128,
+      icon_size = 256,
       effects = {
         {
           type = "unlock-recipe",
@@ -50,7 +49,6 @@ if settings.startup["bobmods-power-steam"].value == true then
         },
         time = 30,
       },
-      order = "[steam-engine]-3",
     },
 
     {
@@ -61,7 +59,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         "production-science-pack",
       },
       icon = "__bobpower__/graphics/icons/technology/steam-engine.png",
-      icon_size = 128,
+      icon_size = 256,
       effects = {
         {
           type = "unlock-recipe",
@@ -78,7 +76,6 @@ if settings.startup["bobmods-power-steam"].value == true then
         },
         time = 30,
       },
-      order = "[steam-engine]-4",
     },
 
     {
@@ -89,7 +86,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         "utility-science-pack",
       },
       icon = "__bobpower__/graphics/icons/technology/steam-engine.png",
-      icon_size = 128,
+      icon_size = 256,
       effects = {
         {
           type = "unlock-recipe",
@@ -107,7 +104,6 @@ if settings.startup["bobmods-power-steam"].value == true then
         },
         time = 30,
       },
-      order = "[steam-engine]-5",
     },
   })
 end
diff --git a/bobpower/prototypes/technology/steam-turbines.lua b/bobpower/prototypes/technology/steam-turbines.lua
index 8afc4be89..f17b9c350 100644
--- a/bobpower/prototypes/technology/steam-turbines.lua
+++ b/bobpower/prototypes/technology/steam-turbines.lua
@@ -10,7 +10,7 @@ if settings.startup["bobmods-power-steam"].value == true then
         "chemical-science-pack",
       },
       icon = "__bobpower__/graphics/icons/technology/steam-turbine.png",
-      icon_size = 128,
+      icon_size = 256,
       effects = {
         {
           type = "unlock-recipe",
@@ -26,13 +26,12 @@ if settings.startup["bobmods-power-steam"].value == true then
         },
         time = 30,
       },
-      order = "[steam-turbine]-1",
     },
     {
       type = "technology",
       name = "bob-steam-turbine-2",
       icon = "__bobpower__/graphics/icons/technology/steam-turbine.png",
-      icon_size = 128,
+      icon_size = 256,
       prerequisites = {
         "bob-steam-turbine-1",
         "production-science-pack",
@@ -53,14 +52,13 @@ if settings.startup["bobmods-power-steam"].value == true then
           { "production-science-pack", 1 },
         },
       },
-      order = "[steam-turbine]-2",
     },
 
     {
       type = "technology",
       name = "bob-steam-turbine-3",
       icon = "__bobpower__/graphics/icons/technology/steam-turbine.png",
-      icon_size = 128,
+      icon_size = 256,
       prerequisites = {
         "bob-steam-turbine-2",
         "utility-science-pack",
@@ -82,7 +80,6 @@ if settings.startup["bobmods-power-steam"].value == true then
           { "utility-science-pack", 1 },
         },
       },
-      order = "[steam-turbine]-3",
     },
   })
 end