diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill.png b/core/assets-raw/sprites/blocks/drills/blast-drill.png
index 22ffe595a5..a9c0f5adad 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill.png and b/core/assets-raw/sprites/blocks/drills/blast-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png
index f58528f84f..fe87720d61 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-top.png b/core/assets-raw/sprites/blocks/drills/laser-drill-top.png
index 46d9519881..106df26337 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-top.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill.png b/core/assets-raw/sprites/blocks/drills/laser-drill.png
index 97e620dfb3..1cf4fb002b 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill.png and b/core/assets-raw/sprites/blocks/drills/laser-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png
index ba07cbb184..ab6dbb8f03 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor.png b/core/assets-raw/sprites/blocks/drills/oil-extractor.png
index 8d363c44cb..b67aa00eb5 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dunerocks-large.png b/core/assets-raw/sprites/blocks/environment/dunerocks-large.png
index 44f6a2f372..7139941920 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dunerocks-large.png and b/core/assets-raw/sprites/blocks/environment/dunerocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dunerocks1.png b/core/assets-raw/sprites/blocks/environment/dunerocks1.png
index 384904fa48..c13f3b73f2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dunerocks1.png and b/core/assets-raw/sprites/blocks/environment/dunerocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dunerocks2.png b/core/assets-raw/sprites/blocks/environment/dunerocks2.png
index 0409649b3f..11d9c15cba 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dunerocks2.png and b/core/assets-raw/sprites/blocks/environment/dunerocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/hotrock1.png b/core/assets-raw/sprites/blocks/environment/hotrock1.png
index f7c566bf06..5cb74267f6 100644
Binary files a/core/assets-raw/sprites/blocks/environment/hotrock1.png and b/core/assets-raw/sprites/blocks/environment/hotrock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/hotrock2.png b/core/assets-raw/sprites/blocks/environment/hotrock2.png
index 41586d523b..b26e6dddd7 100644
Binary files a/core/assets-raw/sprites/blocks/environment/hotrock2.png and b/core/assets-raw/sprites/blocks/environment/hotrock2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/hotrock3.png b/core/assets-raw/sprites/blocks/environment/hotrock3.png
index cc72227234..b2bb2e1a47 100644
Binary files a/core/assets-raw/sprites/blocks/environment/hotrock3.png and b/core/assets-raw/sprites/blocks/environment/hotrock3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ignarock1.png b/core/assets-raw/sprites/blocks/environment/ignarock1.png
index c329cb2f15..cde4186e52 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ignarock1.png and b/core/assets-raw/sprites/blocks/environment/ignarock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ignarock2.png b/core/assets-raw/sprites/blocks/environment/ignarock2.png
index 08834e87af..536e8d995b 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ignarock2.png and b/core/assets-raw/sprites/blocks/environment/ignarock2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ignarock3.png b/core/assets-raw/sprites/blocks/environment/ignarock3.png
index eb0af3a572..6ba51e5957 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ignarock3.png and b/core/assets-raw/sprites/blocks/environment/ignarock3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/magmarock1.png b/core/assets-raw/sprites/blocks/environment/magmarock1.png
index 05d62c8859..68ef3a28e7 100644
Binary files a/core/assets-raw/sprites/blocks/environment/magmarock1.png and b/core/assets-raw/sprites/blocks/environment/magmarock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/magmarock2.png b/core/assets-raw/sprites/blocks/environment/magmarock2.png
index 65640ff22c..dfab8e2f30 100644
Binary files a/core/assets-raw/sprites/blocks/environment/magmarock2.png and b/core/assets-raw/sprites/blocks/environment/magmarock2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/magmarock3.png b/core/assets-raw/sprites/blocks/environment/magmarock3.png
index 07dbf8366d..66f3080629 100644
Binary files a/core/assets-raw/sprites/blocks/environment/magmarock3.png and b/core/assets-raw/sprites/blocks/environment/magmarock3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-2.png b/core/assets-raw/sprites/blocks/environment/metal-floor-2.png
index 8d3b818096..d4930278d5 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-2.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-3.png b/core/assets-raw/sprites/blocks/environment/metal-floor-3.png
index eb6b15d03b..f16fde60bb 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-3.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-5.png b/core/assets-raw/sprites/blocks/environment/metal-floor-5.png
index e9d39b3db2..b2fe8c279d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-5.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-5.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png
index e4220e9adc..f4eb327e07 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png
index a74ac3897d..a8bcd4755d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png
index 2f07315bc5..3bf985f177 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged4.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged4.png
index 64027a66f1..2ce2d2786c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged4.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged5.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged5.png
index 9c9b48708b..c030a04fa1 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged5.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged5.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged6.png b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged6.png
index f2b7f15be5..8b9b4d3fe8 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor-damaged6.png and b/core/assets-raw/sprites/blocks/environment/metal-floor-damaged6.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metal-floor.png b/core/assets-raw/sprites/blocks/environment/metal-floor.png
index 049e13a3ae..c030a04fa1 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metal-floor.png and b/core/assets-raw/sprites/blocks/environment/metal-floor.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/moss1.png b/core/assets-raw/sprites/blocks/environment/moss1.png
index 8344698387..924b902506 100644
Binary files a/core/assets-raw/sprites/blocks/environment/moss1.png and b/core/assets-raw/sprites/blocks/environment/moss1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/moss2.png b/core/assets-raw/sprites/blocks/environment/moss2.png
index ed1a8981fb..3719205bea 100644
Binary files a/core/assets-raw/sprites/blocks/environment/moss2.png and b/core/assets-raw/sprites/blocks/environment/moss2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/moss3.png b/core/assets-raw/sprites/blocks/environment/moss3.png
index ea5072a8dd..65ca4ca767 100644
Binary files a/core/assets-raw/sprites/blocks/environment/moss3.png and b/core/assets-raw/sprites/blocks/environment/moss3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/pine.png b/core/assets-raw/sprites/blocks/environment/pine.png
index 13eee73aaa..643932c15b 100644
Binary files a/core/assets-raw/sprites/blocks/environment/pine.png and b/core/assets-raw/sprites/blocks/environment/pine.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand1.png b/core/assets-raw/sprites/blocks/environment/sand1.png
index 73e2c6d635..348aa527c2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sand1.png and b/core/assets-raw/sprites/blocks/environment/sand1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand2.png b/core/assets-raw/sprites/blocks/environment/sand2.png
index 4429bb584b..47a14cdb84 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sand2.png and b/core/assets-raw/sprites/blocks/environment/sand2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand3.png b/core/assets-raw/sprites/blocks/environment/sand3.png
index c358be019b..f66cb0f33d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sand3.png and b/core/assets-raw/sprites/blocks/environment/sand3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png b/core/assets-raw/sprites/blocks/environment/sandrocks-large.png
index d91729fb22..968b6ce405 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks-large.png and b/core/assets-raw/sprites/blocks/environment/sandrocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks1.png b/core/assets-raw/sprites/blocks/environment/sandrocks1.png
index 5df0ef7fe1..a9a76d7a83 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks1.png and b/core/assets-raw/sprites/blocks/environment/sandrocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sandrocks2.png b/core/assets-raw/sprites/blocks/environment/sandrocks2.png
index 70a4cea724..a795170808 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sandrocks2.png and b/core/assets-raw/sprites/blocks/environment/sandrocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shale1.png b/core/assets-raw/sprites/blocks/environment/shale1.png
index 5b44a22c0b..81110df96b 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shale1.png and b/core/assets-raw/sprites/blocks/environment/shale1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shale2.png b/core/assets-raw/sprites/blocks/environment/shale2.png
index bd6746d7a7..2ae6234529 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shale2.png and b/core/assets-raw/sprites/blocks/environment/shale2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shale3.png b/core/assets-raw/sprites/blocks/environment/shale3.png
index f8678bd05f..dde6687dea 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shale3.png and b/core/assets-raw/sprites/blocks/environment/shale3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrock1.png b/core/assets-raw/sprites/blocks/environment/snowrock1.png
index 2a4cc7fca6..4b588fd1ca 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrock1.png and b/core/assets-raw/sprites/blocks/environment/snowrock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrock2.png b/core/assets-raw/sprites/blocks/environment/snowrock2.png
index fe78b97576..ee3ec6ad9c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrock2.png and b/core/assets-raw/sprites/blocks/environment/snowrock2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png
index 75017dbee1..2e5047e702 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks-large.png and b/core/assets-raw/sprites/blocks/environment/snowrocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks1.png b/core/assets-raw/sprites/blocks/environment/snowrocks1.png
index 5a18216caa..0f91b13def 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks1.png and b/core/assets-raw/sprites/blocks/environment/snowrocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowrocks2.png b/core/assets-raw/sprites/blocks/environment/snowrocks2.png
index d3f14dc536..24a26a54fe 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowrocks2.png and b/core/assets-raw/sprites/blocks/environment/snowrocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss1.png b/core/assets-raw/sprites/blocks/environment/spore-moss1.png
index 270349168a..140e0023c6 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spore-moss1.png and b/core/assets-raw/sprites/blocks/environment/spore-moss1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss2.png b/core/assets-raw/sprites/blocks/environment/spore-moss2.png
index 0546666a22..03b6b94fef 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spore-moss2.png and b/core/assets-raw/sprites/blocks/environment/spore-moss2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/spore-moss3.png b/core/assets-raw/sprites/blocks/environment/spore-moss3.png
index 4cfbe3ed3c..d1349bebe6 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spore-moss3.png and b/core/assets-raw/sprites/blocks/environment/spore-moss3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png
index 9b0cf4712e..43f842fbca 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks-large.png and b/core/assets-raw/sprites/blocks/environment/sporerocks-large.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks1.png b/core/assets-raw/sprites/blocks/environment/sporerocks1.png
index 8d9fbecd7a..8567468ec4 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks1.png and b/core/assets-raw/sprites/blocks/environment/sporerocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sporerocks2.png b/core/assets-raw/sprites/blocks/environment/sporerocks2.png
index c50be4bb96..a3ce58c7ae 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sporerocks2.png and b/core/assets-raw/sprites/blocks/environment/sporerocks2.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/rubble-4-0.png b/core/assets-raw/sprites/blocks/extra/rubble-4-0.png
index 0a23d121b1..91c1fc9749 100644
Binary files a/core/assets-raw/sprites/blocks/extra/rubble-4-0.png and b/core/assets-raw/sprites/blocks/extra/rubble-4-0.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/rubble-4-1.png b/core/assets-raw/sprites/blocks/extra/rubble-4-1.png
index 0bc32c92a7..91c1fc9749 100644
Binary files a/core/assets-raw/sprites/blocks/extra/rubble-4-1.png and b/core/assets-raw/sprites/blocks/extra/rubble-4-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png b/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png
index b92420f1c3..f7d2ebe4cb 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png and b/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png
index c89ff8890d..a62d3d2418 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png and b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png differ
diff --git a/core/assets-raw/sprites/blocks/power/differential-generator-top.png b/core/assets-raw/sprites/blocks/power/differential-generator-top.png
index a540f2b93c..ae0c4cc026 100644
Binary files a/core/assets-raw/sprites/blocks/power/differential-generator-top.png and b/core/assets-raw/sprites/blocks/power/differential-generator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/power/differential-generator.png b/core/assets-raw/sprites/blocks/power/differential-generator.png
index adf332a1e9..95ff31b79b 100644
Binary files a/core/assets-raw/sprites/blocks/power/differential-generator.png and b/core/assets-raw/sprites/blocks/power/differential-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/impact-reactor-top.png b/core/assets-raw/sprites/blocks/power/impact-reactor-top.png
index b564994c56..05e799b15f 100644
Binary files a/core/assets-raw/sprites/blocks/power/impact-reactor-top.png and b/core/assets-raw/sprites/blocks/power/impact-reactor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/power/surge-tower.png b/core/assets-raw/sprites/blocks/power/surge-tower.png
index 50ad5a1852..dfb3ad5eaf 100644
Binary files a/core/assets-raw/sprites/blocks/power/surge-tower.png and b/core/assets-raw/sprites/blocks/power/surge-tower.png differ
diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png b/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png
index 52616bf864..bef438ec0e 100644
Binary files a/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png and b/core/assets-raw/sprites/blocks/production/alloy-smelter-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cultivator-top.png b/core/assets-raw/sprites/blocks/production/cultivator-top.png
index c665608609..dc29af6e09 100644
Binary files a/core/assets-raw/sprites/blocks/production/cultivator-top.png and b/core/assets-raw/sprites/blocks/production/cultivator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/multi-press.png b/core/assets-raw/sprites/blocks/production/multi-press.png
index 3adb9c84f1..effe30d689 100644
Binary files a/core/assets-raw/sprites/blocks/production/multi-press.png and b/core/assets-raw/sprites/blocks/production/multi-press.png differ
diff --git a/core/assets-raw/sprites/blocks/production/plastanium-compressor.png b/core/assets-raw/sprites/blocks/production/plastanium-compressor.png
index 8bcbc2c911..afdcb7006c 100644
Binary files a/core/assets-raw/sprites/blocks/production/plastanium-compressor.png and b/core/assets-raw/sprites/blocks/production/plastanium-compressor.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator-liquid.png b/core/assets-raw/sprites/blocks/production/separator-liquid.png
index 18897e6b0f..e5ff06ade7 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator-liquid.png and b/core/assets-raw/sprites/blocks/production/separator-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator.png b/core/assets-raw/sprites/blocks/production/separator.png
index 623bc76bba..6f628f9255 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator.png and b/core/assets-raw/sprites/blocks/production/separator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame0.png b/core/assets-raw/sprites/blocks/production/spore-press-frame0.png
index 58a7284a74..4b646157a2 100644
Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame0.png and b/core/assets-raw/sprites/blocks/production/spore-press-frame0.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame1.png b/core/assets-raw/sprites/blocks/production/spore-press-frame1.png
index 9d6b5fba03..1b8efd7534 100644
Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame1.png and b/core/assets-raw/sprites/blocks/production/spore-press-frame1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press-frame2.png b/core/assets-raw/sprites/blocks/production/spore-press-frame2.png
index 8899a23501..404487235d 100644
Binary files a/core/assets-raw/sprites/blocks/production/spore-press-frame2.png and b/core/assets-raw/sprites/blocks/production/spore-press-frame2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/spore-press.png b/core/assets-raw/sprites/blocks/production/spore-press.png
index def84f6512..4b06633f50 100644
Binary files a/core/assets-raw/sprites/blocks/production/spore-press.png and b/core/assets-raw/sprites/blocks/production/spore-press.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/duo.png
index 40d21d0fb0..68873f34e0 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/duo.png and b/core/assets-raw/sprites/blocks/turrets/duo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/fuse.png
index c03bad9cba..a8875a7664 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/fuse.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/hail.png
index e679043a66..7f74cc57d8 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/hail.png and b/core/assets-raw/sprites/blocks/turrets/hail.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/lancer.png
index 9864ac6ad9..cb4a837ebb 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/lancer.png and b/core/assets-raw/sprites/blocks/turrets/lancer.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/salvo.png
index bfa377509f..9527912c07 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/salvo.png and b/core/assets-raw/sprites/blocks/turrets/salvo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/scatter.png
index f6e1d7ff61..d1b98c75bc 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/scatter.png and b/core/assets-raw/sprites/blocks/turrets/scatter.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/wave.png b/core/assets-raw/sprites/blocks/turrets/wave.png
index ff132fbd74..05a115eb68 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/wave.png and b/core/assets-raw/sprites/blocks/turrets/wave.png differ
diff --git a/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png b/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png
index 290db9d373..8a41754b19 100644
Binary files a/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png and b/core/assets-raw/sprites/blocks/units/crawler-factory-top-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/crawler-factory-top.png b/core/assets-raw/sprites/blocks/units/crawler-factory-top.png
index f7cad4dbf6..79816238f7 100644
Binary files a/core/assets-raw/sprites/blocks/units/crawler-factory-top.png and b/core/assets-raw/sprites/blocks/units/crawler-factory-top.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-gigantic.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-gigantic.png
index ffdc63ffcc..3146c493f8 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-gigantic.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-gigantic.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge1.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge1.png
index c03322d55d..b2b3c57b51 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge1.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge1.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge2.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge2.png
index bdf6d1344c..982649f167 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge2.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge2.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge3.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge3.png
index fa12bc5e02..02e2cd0a7a 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-huge3.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-huge3.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-large2.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-large2.png
index 804d7749e4..0b0c955246 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-large2.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-large2.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-large3.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-large3.png
index d7279d6b32..e3ae01cb89 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-large3.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-large3.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall-large4.png b/core/assets-raw/sprites/blocks/walls/scrap-wall-large4.png
index 3ea4802427..59002328c8 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall-large4.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall-large4.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall4.png b/core/assets-raw/sprites/blocks/walls/scrap-wall4.png
index df86f16cc2..0c709a1049 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall4.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall4.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/scrap-wall5.png b/core/assets-raw/sprites/blocks/walls/scrap-wall5.png
index 1f75829f3a..0c709a1049 100644
Binary files a/core/assets-raw/sprites/blocks/walls/scrap-wall5.png and b/core/assets-raw/sprites/blocks/walls/scrap-wall5.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/thruster.png b/core/assets-raw/sprites/blocks/walls/thruster.png
index 82ec7622f6..8531ab06b7 100644
Binary files a/core/assets-raw/sprites/blocks/walls/thruster.png and b/core/assets-raw/sprites/blocks/walls/thruster.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png
index 943895deab..c2688c825e 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png differ
diff --git a/core/assets-raw/sprites/ui/button-disabled.9.png b/core/assets-raw/sprites/ui/button-disabled.9.png
index 2f57455034..b2e4d7eb25 100644
Binary files a/core/assets-raw/sprites/ui/button-disabled.9.png and b/core/assets-raw/sprites/ui/button-disabled.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right-down.9.png b/core/assets-raw/sprites/ui/button-right-down.9.png
index 475f255934..efbabad92d 100644
Binary files a/core/assets-raw/sprites/ui/button-right-down.9.png and b/core/assets-raw/sprites/ui/button-right-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right-over.9.png b/core/assets-raw/sprites/ui/button-right-over.9.png
index c764c18dab..1f6d0fa234 100644
Binary files a/core/assets-raw/sprites/ui/button-right-over.9.png and b/core/assets-raw/sprites/ui/button-right-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-right.9.png b/core/assets-raw/sprites/ui/button-right.9.png
index 2c8c4bb1e0..cd3d8d52e1 100644
Binary files a/core/assets-raw/sprites/ui/button-right.9.png and b/core/assets-raw/sprites/ui/button-right.9.png differ
diff --git a/core/assets-raw/sprites/ui/check-off.png b/core/assets-raw/sprites/ui/check-off.png
index 4ab1f7fae8..79b86aabc1 100644
Binary files a/core/assets-raw/sprites/ui/check-off.png and b/core/assets-raw/sprites/ui/check-off.png differ
diff --git a/core/assets-raw/sprites/ui/check-on-over.png b/core/assets-raw/sprites/ui/check-on-over.png
index 80f373a89f..716e6fffb7 100644
Binary files a/core/assets-raw/sprites/ui/check-on-over.png and b/core/assets-raw/sprites/ui/check-on-over.png differ
diff --git a/core/assets-raw/sprites/ui/check-on.png b/core/assets-raw/sprites/ui/check-on.png
index 57cc8a7484..e4a8d11538 100644
Binary files a/core/assets-raw/sprites/ui/check-on.png and b/core/assets-raw/sprites/ui/check-on.png differ
diff --git a/core/assets-raw/sprites/ui/check-over.png b/core/assets-raw/sprites/ui/check-over.png
index 2501a9daa9..5f618e5c86 100644
Binary files a/core/assets-raw/sprites/ui/check-over.png and b/core/assets-raw/sprites/ui/check-over.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-add.png b/core/assets-raw/sprites/ui/icons/icon-add.png
index 50c7a2c330..328c8ca469 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-add.png and b/core/assets-raw/sprites/ui/icons/icon-add.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-database-small.png b/core/assets-raw/sprites/ui/icons/icon-database-small.png
index dc105e3f67..059fd6f219 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-database-small.png and b/core/assets-raw/sprites/ui/icons/icon-database-small.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-database.png b/core/assets-raw/sprites/ui/icons/icon-database.png
index f5bc48c80d..41e4b672f2 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-database.png and b/core/assets-raw/sprites/ui/icons/icon-database.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-file-image.png b/core/assets-raw/sprites/ui/icons/icon-file-image.png
index 5b0d2adbe5..254ea95f3d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-file-image.png and b/core/assets-raw/sprites/ui/icons/icon-file-image.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-fill.png b/core/assets-raw/sprites/ui/icons/icon-fill.png
index 25d439a830..79bc8b2c39 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-fill.png and b/core/assets-raw/sprites/ui/icons/icon-fill.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-power-requirement.png b/core/assets-raw/sprites/ui/icons/icon-power-requirement.png
index dc82f5942e..a6deaa19bc 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-power-requirement.png and b/core/assets-raw/sprites/ui/icons/icon-power-requirement.png differ
diff --git a/core/assets-raw/sprites/ui/logotext.png b/core/assets-raw/sprites/ui/logotext.png
index 4305683321..64976a6c47 100644
Binary files a/core/assets-raw/sprites/ui/logotext.png and b/core/assets-raw/sprites/ui/logotext.png differ
diff --git a/core/assets-raw/sprites/units/chaos-array-base.png b/core/assets-raw/sprites/units/chaos-array-base.png
index b1174913d6..e80d4a1b53 100644
Binary files a/core/assets-raw/sprites/units/chaos-array-base.png and b/core/assets-raw/sprites/units/chaos-array-base.png differ
diff --git a/core/assets-raw/sprites/units/chaos-array-leg.png b/core/assets-raw/sprites/units/chaos-array-leg.png
index 7269601fcf..8d0aba139b 100644
Binary files a/core/assets-raw/sprites/units/chaos-array-leg.png and b/core/assets-raw/sprites/units/chaos-array-leg.png differ
diff --git a/core/assets-raw/sprites/units/chaos-array.png b/core/assets-raw/sprites/units/chaos-array.png
index afd96f43dc..9c0ff7d661 100644
Binary files a/core/assets-raw/sprites/units/chaos-array.png and b/core/assets-raw/sprites/units/chaos-array.png differ
diff --git a/core/assets-raw/sprites/units/eradicator-base.png b/core/assets-raw/sprites/units/eradicator-base.png
index 24b5cdb446..750e78bf41 100644
Binary files a/core/assets-raw/sprites/units/eradicator-base.png and b/core/assets-raw/sprites/units/eradicator-base.png differ
diff --git a/core/assets-raw/sprites/units/eradicator-leg.png b/core/assets-raw/sprites/units/eradicator-leg.png
index 3a503a2e6a..82ade466da 100644
Binary files a/core/assets-raw/sprites/units/eradicator-leg.png and b/core/assets-raw/sprites/units/eradicator-leg.png differ
diff --git a/core/assets-raw/sprites/units/eradicator.png b/core/assets-raw/sprites/units/eradicator.png
index c620aa3d0f..e4d3b0fe67 100644
Binary files a/core/assets-raw/sprites/units/eradicator.png and b/core/assets-raw/sprites/units/eradicator.png differ
diff --git a/core/assets-raw/sprites/units/eruptor-base.png b/core/assets-raw/sprites/units/eruptor-base.png
index 0b1e55dbb9..6efea6d508 100644
Binary files a/core/assets-raw/sprites/units/eruptor-base.png and b/core/assets-raw/sprites/units/eruptor-base.png differ
diff --git a/core/assets-raw/sprites/units/eruptor-leg.png b/core/assets-raw/sprites/units/eruptor-leg.png
index c3d622340a..9725454262 100644
Binary files a/core/assets-raw/sprites/units/eruptor-leg.png and b/core/assets-raw/sprites/units/eruptor-leg.png differ
diff --git a/core/assets-raw/sprites/units/eruptor.png b/core/assets-raw/sprites/units/eruptor.png
index 992fc9ea2d..ea76a8b29b 100644
Binary files a/core/assets-raw/sprites/units/eruptor.png and b/core/assets-raw/sprites/units/eruptor.png differ
diff --git a/core/assets-raw/sprites/units/lich.png b/core/assets-raw/sprites/units/lich.png
index 9f34958af8..ab440f96d8 100644
Binary files a/core/assets-raw/sprites/units/lich.png and b/core/assets-raw/sprites/units/lich.png differ
diff --git a/core/assets-raw/sprites/units/reaper.png b/core/assets-raw/sprites/units/reaper.png
index 2d70f5d179..5094cbae27 100644
Binary files a/core/assets-raw/sprites/units/reaper.png and b/core/assets-raw/sprites/units/reaper.png differ
diff --git a/core/assets-raw/sprites/units/revenant.png b/core/assets-raw/sprites/units/revenant.png
index 2c9616b93e..645ec6a995 100644
Binary files a/core/assets-raw/sprites/units/revenant.png and b/core/assets-raw/sprites/units/revenant.png differ
diff --git a/core/assets-raw/sprites/weapons/artillery-equip.png b/core/assets-raw/sprites/weapons/artillery-equip.png
index 843da3adbc..7572b98c95 100644
Binary files a/core/assets-raw/sprites/weapons/artillery-equip.png and b/core/assets-raw/sprites/weapons/artillery-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/chain-blaster-equip.png b/core/assets-raw/sprites/weapons/chain-blaster-equip.png
index d2bc4331f4..b3c37d50a2 100644
Binary files a/core/assets-raw/sprites/weapons/chain-blaster-equip.png and b/core/assets-raw/sprites/weapons/chain-blaster-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/chaos-equip.png b/core/assets-raw/sprites/weapons/chaos-equip.png
index 0a83fcc8a1..3254c70c88 100644
Binary files a/core/assets-raw/sprites/weapons/chaos-equip.png and b/core/assets-raw/sprites/weapons/chaos-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/eradication-equip.png b/core/assets-raw/sprites/weapons/eradication-equip.png
index 16befb33e1..c3fbf46416 100644
Binary files a/core/assets-raw/sprites/weapons/eradication-equip.png and b/core/assets-raw/sprites/weapons/eradication-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/eruption-equip.png b/core/assets-raw/sprites/weapons/eruption-equip.png
index 7758d622a5..11dc406fb0 100644
Binary files a/core/assets-raw/sprites/weapons/eruption-equip.png and b/core/assets-raw/sprites/weapons/eruption-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/flamethrower-equip.png b/core/assets-raw/sprites/weapons/flamethrower-equip.png
index 40b085ac43..6c11713a5e 100644
Binary files a/core/assets-raw/sprites/weapons/flamethrower-equip.png and b/core/assets-raw/sprites/weapons/flamethrower-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/lich-missiles-equip.png b/core/assets-raw/sprites/weapons/lich-missiles-equip.png
index 8deeb5416a..b5118bbf4e 100644
Binary files a/core/assets-raw/sprites/weapons/lich-missiles-equip.png and b/core/assets-raw/sprites/weapons/lich-missiles-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/reaper-gun-equip.png b/core/assets-raw/sprites/weapons/reaper-gun-equip.png
index 1eb3cb64ba..f4addc0634 100644
Binary files a/core/assets-raw/sprites/weapons/reaper-gun-equip.png and b/core/assets-raw/sprites/weapons/reaper-gun-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/revenant-missiles-equip.png b/core/assets-raw/sprites/weapons/revenant-missiles-equip.png
index e8ebc4be08..7e23b71b4e 100644
Binary files a/core/assets-raw/sprites/weapons/revenant-missiles-equip.png and b/core/assets-raw/sprites/weapons/revenant-missiles-equip.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/environment/darksand-water.png b/core/assets-raw/sprites_replacement/blocks/environment/darksand-water.png
new file mode 100644
index 0000000000..9074571f83
Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/darksand-water.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 80b94476fb..f06f8e2c8d 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -413,6 +413,7 @@ category.crafting = Input/Output
 category.shooting = Shooting
 category.optional = Optional Enhancements
 setting.animatedwater.name = Animated Water
+setting.antialias.name = Antialias[LIGHT_GRAY] (requires restart)[]
 setting.indicators.name = Enemy/Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -431,6 +432,7 @@ setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Autosave Interval
 setting.seconds = {0} Seconds
 setting.fullscreen.name = Fullscreen
+setting.borderless.name = Borderless Window
 setting.fps.name = Show FPS
 setting.vsync.name = VSync
 setting.lasers.name = Show Power Lasers
@@ -600,11 +602,13 @@ block.deepwater.name = Deep Water
 block.water.name = Water
 block.tar.name = Tar
 block.stone.name = Stone
-block.sand.name = Dark Sand
+block.sand.name = Sand
+block.darksand.name = Dark Sand
 block.ice.name = Ice
 block.snow.name = Snow
 block.craters.name = Craters
 block.sand-water.name = Sand water
+block.darksand-water.name = Dark Sand Water
 block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
@@ -636,6 +640,7 @@ block.thorium-wall-large.name = Large Thorium Wall
 block.door.name = Door
 block.door-large.name = Large Door
 block.duo.name = Duo
+block.scorch.name = Scorch
 block.scatter.name = Scatter
 block.hail.name = Hail
 block.lancer.name = Lancer
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 7d7e362293..0100b700fa 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -21,8 +21,10 @@ stat.destroyed = Строений уничтожено:[accent] {0}
 stat.deconstructed = Строений деконструировано:[accent] {0}
 stat.delivered = Ресурсов добыто:
 stat.rank = Финальный Счёт: [accent]{0}
-placeline = You have selected a block.\nYou can[accent] place in a line[] by[accent] holding down your finger for a few seconds[] and dragging in a direction.\nTry it.
-removearea = You have selected removal mode.\nYou can[accent] remove blocks in a rectangle[] by[accent] holding down your finger for a few seconds[] and dragging.\nTry it.
+
+placeline = Вы выбрали блок.\nВы можете[accent] строить в линию[], сначало[accent] удерживая палец в течение нескольких секунд[] и потом перетаскивая его.\n\nПопробуйте.
+removearea = Вы выбрали режим удаления.\nВы можете[accent] удалать блоки по прямоугольнику[], [accent]удерживая палец несколько секунд[] и потом перетаскивая его.\n\nПопробуйте.
+
 map.delete = Вы действительно хотите удалить карту "[accent]{0}[]"?
 level.highscore = Рекорд: [accent]{0}
 level.select = Выбор карты
@@ -628,6 +630,7 @@ block.thorium-wall-large.name = Большая ториевая стена
 block.door.name = Дверь
 block.door-large.name = Большая дверь
 block.duo.name = Двойная турель
+block.scorch.name = Обжигатель
 block.scatter.name = Scatter
 block.hail.name = Град
 block.lancer.name = Копейщик
diff --git a/core/assets/maps/desolateRift.mmap b/core/assets/maps/desolateRift.mmap
index 694353537d..a9cf705f2b 100644
Binary files a/core/assets/maps/desolateRift.mmap and b/core/assets/maps/desolateRift.mmap differ
diff --git a/core/assets/maps/nuclearProductionComplex.mmap b/core/assets/maps/nuclearProductionComplex.mmap
index 0fe2013949..9ed6f320e3 100644
Binary files a/core/assets/maps/nuclearProductionComplex.mmap and b/core/assets/maps/nuclearProductionComplex.mmap differ
diff --git a/core/assets/maps/stainedMountains.mmap b/core/assets/maps/stainedMountains.mmap
index cbf23b9239..288ff1978a 100644
Binary files a/core/assets/maps/stainedMountains.mmap and b/core/assets/maps/stainedMountains.mmap differ
diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png
index dba87393f8..7fd0fdb355 100644
Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 23e75fd37a..af91968d0c 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -48,308 +48,308 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 563, 152
+  xy: 1523, 893
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1117, 847
+  xy: 1717, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1117, 813
+  xy: 1751, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1117, 779
+  xy: 1785, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1451, 1121
+  xy: 1075, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1485, 1121
+  xy: 1074, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1519, 1121
+  xy: 1375, 1105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1553, 1121
+  xy: 1409, 1105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1587, 1121
+  xy: 1443, 1105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1621, 1105
+  xy: 1117, 797
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1655, 1105
+  xy: 1151, 791
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1689, 1096
+  xy: 1185, 791
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1723, 1096
+  xy: 1219, 791
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1185, 863
+  xy: 1117, 763
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1185, 829
+  xy: 1151, 757
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1185, 795
+  xy: 1185, 757
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1151, 753
+  xy: 1219, 757
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1185, 761
+  xy: 1217, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1235, 913
+  xy: 1217, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1285, 963
+  xy: 1217, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1335, 1013
+  xy: 1267, 963
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1375, 1105
+  xy: 1251, 929
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1385, 1071
+  xy: 1251, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1419, 1087
+  xy: 1285, 929
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1693, 960
+  xy: 1965, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1693, 926
+  xy: 1999, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1727, 1028
+  xy: 1625, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1727, 994
+  xy: 1659, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1727, 960
+  xy: 1693, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1727, 926
+  xy: 1727, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1659, 892
+  xy: 1761, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1693, 892
+  xy: 1795, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1727, 892
+  xy: 1829, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1350, 581
+  xy: 1863, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 567, 687
+  xy: 1897, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 567, 653
+  xy: 1931, 845
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 567, 619
+  xy: 1965, 845
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 567, 585
+  xy: 1999, 845
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 567, 551
+  xy: 1931, 811
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1321, 883
+  xy: 1965, 811
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1321, 849
+  xy: 1999, 811
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1321, 815
+  xy: 1491, 799
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1321, 781
+  xy: 1491, 765
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1321, 747
+  xy: 1503, 1097
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -363,7 +363,7 @@ distributor
   index: -1
 junction
   rotate: false
-  xy: 1253, 743
+  xy: 1573, 1049
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -377,49 +377,49 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 1181, 693
+  xy: 1675, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1961, 1049
+  xy: 1879, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1995, 1049
+  xy: 1913, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1215, 667
+  xy: 1947, 981
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1214, 633
+  xy: 1981, 981
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 529, 118
+  xy: 1489, 901
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1623, 1071
+  xy: 1625, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -580,35 +580,35 @@ water-extractor-top
   index: -1
 block-border
   rotate: false
-  xy: 1787, 1139
+  xy: 1853, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1821, 1139
+  xy: 1887, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1821, 1139
+  xy: 1887, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1855, 1134
+  xy: 1921, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1731, 1130
+  xy: 1811, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -678,175 +678,175 @@ rubble-4-1
   index: -1
 spawn
   rotate: false
-  xy: 1623, 1037
+  xy: 1659, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1889, 1134
+  xy: 1573, 1117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1923, 1129
+  xy: 1607, 1117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1923, 1129
+  xy: 1607, 1117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1957, 1117
+  xy: 1649, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1991, 1117
+  xy: 1683, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1425, 1155
+  xy: 1955, 1117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1459, 1155
+  xy: 1989, 1117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1493, 1155
+  xy: 1167, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1527, 1155
+  xy: 1201, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1561, 1155
+  xy: 1641, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1595, 1155
+  xy: 1675, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1629, 1139
+  xy: 1709, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1663, 1139
+  xy: 1743, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1151, 855
+  xy: 1845, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1151, 821
+  xy: 1879, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1151, 787
+  xy: 1913, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1201, 905
+  xy: 1947, 1083
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1251, 955
+  xy: 1981, 1083
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1301, 1005
+  xy: 2015, 1083
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1351, 1055
+  xy: 1267, 997
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1287, 751
+  xy: 1675, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1253, 675
+  xy: 1743, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1287, 649
+  xy: 1811, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 495, 488
+  xy: 1845, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -874,84 +874,84 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 495, 250
+  xy: 1675, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1927, 1083
+  xy: 1743, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1961, 1083
+  xy: 1777, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1995, 1083
+  xy: 1811, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1927, 1049
+  xy: 1845, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 499, 526
+  xy: 1947, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 533, 696
+  xy: 1981, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 533, 662
+  xy: 2015, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 533, 628
+  xy: 1319, 935
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 533, 594
+  xy: 1353, 935
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 533, 560
+  xy: 1319, 901
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 533, 526
+  xy: 1387, 935
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1021,7 +1021,7 @@ trident-ship-pad
   index: -1
 battery
   rotate: false
-  xy: 1863, 1168
+  xy: 1683, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1035,14 +1035,14 @@ battery-large
   index: -1
 combustion-generator
   rotate: false
-  xy: 1267, 997
+  xy: 1955, 1151
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1317, 1047
+  xy: 1989, 1151
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1119,7 +1119,7 @@ impact-reactor-top
   index: -1
 power-node
   rotate: false
-  xy: 485, 730
+  xy: 1811, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1133,28 +1133,28 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 499, 696
+  xy: 1879, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 499, 662
+  xy: 1913, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 499, 628
+  xy: 1947, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 499, 594
+  xy: 1981, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1168,14 +1168,14 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 529, 50
+  xy: 1489, 867
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 87, 3
+  xy: 1591, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1308,21 +1308,21 @@ graphite-press
   index: -1
 incinerator
   rotate: false
-  xy: 1455, 985
+  xy: 1471, 1003
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1489, 917
+  xy: 1845, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1253, 811
+  xy: 2015, 1049
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1350,21 +1350,21 @@ silicon-smelter-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 1287, 819
+  xy: 1607, 1015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 495, 420
+  xy: 1913, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 495, 182
+  xy: 1743, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1413,14 +1413,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 529, 492
+  xy: 1319, 867
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 529, 424
+  xy: 1421, 935
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1455,7 +1455,7 @@ silicon-smelter
   index: -1
 smelter
   rotate: false
-  xy: 563, 50
+  xy: 1557, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1546,14 +1546,14 @@ launch-pad
   index: -1
 sortedunloader
   rotate: false
-  xy: 1589, 1037
+  xy: 1591, 845
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1355, 799
+  xy: 495, 488
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1574,7 +1574,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 1999, 1151
+  xy: 1819, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1649,6 +1649,13 @@ salvo-panel-right
   orig: 64, 64
   offset: 0, 0
   index: -1
+scorch-heat
+  rotate: false
+  xy: 1439, 833
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 wave-liquid
   rotate: false
   xy: 385, 838
@@ -1791,7 +1798,7 @@ phantom-factory-top-open
   index: -1
 repair-point-base
   rotate: false
-  xy: 529, 322
+  xy: 1455, 935
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1854,7 +1861,7 @@ wraith-factory-top-open
   index: -1
 copper-wall
   rotate: false
-  xy: 1453, 1087
+  xy: 1285, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1868,7 +1875,7 @@ copper-wall-large
   index: -1
 door
   rotate: false
-  xy: 1521, 1019
+  xy: 1401, 1071
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1889,14 +1896,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1757, 1096
+  xy: 1301, 1005
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1249, 641
+  xy: 2015, 981
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1966,42 +1973,42 @@ scrap-wall-large4
   index: -1
 scrap-wall1
   rotate: false
-  xy: 563, 458
+  xy: 1355, 799
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall2
   rotate: false
-  xy: 563, 424
+  xy: 1355, 765
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 563, 390
+  xy: 1389, 799
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 563, 356
+  xy: 1389, 765
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 563, 356
+  xy: 1389, 765
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1591, 901
+  xy: 1727, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2015,7 +2022,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1693, 1028
+  xy: 1897, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2036,7 +2043,7 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1321, 713
+  xy: 1355, 731
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2071,14 +2078,14 @@ casing
   index: -1
 error
   rotate: false
-  xy: 575, 1028
+  xy: 575, 928
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 laser
   rotate: false
-  xy: 2043, 1103
+  xy: 2041, 1399
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2092,7 +2099,7 @@ laser-end
   index: -1
 minelaser
   rotate: false
-  xy: 2041, 1399
+  xy: 529, 22
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2106,14 +2113,14 @@ minelaser-end
   index: -1
 missile
   rotate: false
-  xy: 1075, 759
+  xy: 1175, 859
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 1074, 721
+  xy: 1459, 1143
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
@@ -2127,70 +2134,70 @@ scale_marker
   index: -1
 scorch1
   rotate: false
-  xy: 1389, 753
+  xy: 495, 142
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 1761, 994
+  xy: 499, 631
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 1761, 892
+  xy: 499, 529
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 1791, 969
+  xy: 1525, 757
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 1821, 964
+  xy: 1555, 743
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 shell
   rotate: false
-  xy: 1711, 1164
+  xy: 1573, 1151
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 1749, 1164
+  xy: 1611, 1151
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 563, 118
+  xy: 1523, 859
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 2041, 1349
+  xy: 711, 640
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1355, 901
+  xy: 1423, 731
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2218,7 +2225,7 @@ alloy-smelter-icon-medium
   index: -1
 alloy-smelter-icon-small
   rotate: false
-  xy: 1091, 1255
+  xy: 1477, 1105
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2239,7 +2246,7 @@ alpha-dart-mech-pad-icon-medium
   index: -1
 alpha-dart-mech-pad-icon-small
   rotate: false
-  xy: 583, 1633
+  xy: 1091, 1255
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2253,7 +2260,7 @@ arc
   index: -1
 arc-icon-full
   rotate: false
-  xy: 1939, 1197
+  xy: 1649, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2267,7 +2274,7 @@ arc-icon-large
   index: -1
 arc-icon-small
   rotate: false
-  xy: 1956, 1819
+  xy: 2023, 1159
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2281,7 +2288,7 @@ battery-icon-large
   index: -1
 battery-icon-small
   rotate: false
-  xy: 891, 1363
+  xy: 2023, 1133
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2295,14 +2302,14 @@ battery-large-icon-large
   index: -1
 battery-large-icon-medium
   rotate: false
-  xy: 1897, 1168
+  xy: 1717, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-large-icon-small
   rotate: false
-  xy: 1321, 653
+  xy: 1503, 1071
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2323,14 +2330,14 @@ blast-drill-icon-large
   index: -1
 blast-drill-icon-medium
   rotate: false
-  xy: 1931, 1163
+  xy: 1751, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blast-drill-icon-small
   rotate: false
-  xy: 1389, 689
+  xy: 583, 1633
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2344,14 +2351,14 @@ blast-mixer-icon-large
   index: -1
 blast-mixer-icon-medium
   rotate: false
-  xy: 1965, 1151
+  xy: 1785, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blast-mixer-icon-small
   rotate: false
-  xy: 1389, 663
+  xy: 1956, 1819
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2365,7 +2372,7 @@ bridge-conduit-icon-large
   index: -1
 bridge-conduit-icon-small
   rotate: false
-  xy: 1851, 1002
+  xy: 891, 1363
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2379,7 +2386,7 @@ bridge-conveyor-icon-large
   index: -1
 bridge-conveyor-icon-small
   rotate: false
-  xy: 1956, 1793
+  xy: 1947, 1205
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2393,7 +2400,7 @@ char-icon-large
   index: -1
 char-icon-small
   rotate: false
-  xy: 1851, 976
+  xy: 1525, 731
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2407,7 +2414,7 @@ cliffs-icon-large
   index: -1
 cliffs-icon-small
   rotate: false
-  xy: 1420, 891
+  xy: 495, 78
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2421,14 +2428,14 @@ combustion-generator-icon-large
   index: -1
 combustion-generator-icon-small
   rotate: false
-  xy: 1446, 891
+  xy: 1956, 1793
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 conduit-icon-full
   rotate: false
-  xy: 1697, 1130
+  xy: 1777, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2442,7 +2449,7 @@ conduit-icon-large
   index: -1
 conduit-icon-small
   rotate: false
-  xy: 1420, 865
+  xy: 891, 1337
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2456,14 +2463,14 @@ container-icon-large
   index: -1
 container-icon-medium
   rotate: false
-  xy: 1417, 1121
+  xy: 1317, 1047
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 container-icon-small
   rotate: false
-  xy: 1472, 891
+  xy: 542, 738
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2477,7 +2484,7 @@ conveyor-icon-large
   index: -1
 conveyor-icon-small
   rotate: false
-  xy: 1446, 865
+  xy: 529, 712
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2491,7 +2498,7 @@ copper-wall-icon-large
   index: -1
 copper-wall-icon-small
   rotate: false
-  xy: 1498, 891
+  xy: 529, 686
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2505,14 +2512,14 @@ copper-wall-large-icon-large
   index: -1
 copper-wall-large-icon-medium
   rotate: false
-  xy: 1487, 1087
+  xy: 1251, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-large-icon-small
   rotate: false
-  xy: 1472, 865
+  xy: 529, 660
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2526,14 +2533,14 @@ core-foundation-icon-large
   index: -1
 core-foundation-icon-medium
   rotate: false
-  xy: 1521, 1087
+  xy: 1285, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-foundation-icon-small
   rotate: false
-  xy: 1524, 891
+  xy: 529, 634
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2547,14 +2554,14 @@ core-nucleus-icon-large
   index: -1
 core-nucleus-icon-medium
   rotate: false
-  xy: 1555, 1087
+  xy: 1235, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-nucleus-icon-small
   rotate: false
-  xy: 1498, 865
+  xy: 529, 608
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2568,14 +2575,14 @@ core-shard-icon-large
   index: -1
 core-shard-icon-medium
   rotate: false
-  xy: 1385, 1037
+  xy: 1269, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-shard-icon-small
   rotate: false
-  xy: 1550, 891
+  xy: 529, 582
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2589,7 +2596,7 @@ craters-icon-large
   index: -1
 craters-icon-small
   rotate: false
-  xy: 1524, 865
+  xy: 529, 556
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2610,14 +2617,14 @@ crawler-factory-icon-large
   index: -1
 crawler-factory-icon-medium
   rotate: false
-  xy: 1419, 1053
+  xy: 1253, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 crawler-factory-icon-small
   rotate: false
-  xy: 1550, 865
+  xy: 529, 530
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2638,14 +2645,14 @@ cryofluidmixer-icon-large
   index: -1
 cryofluidmixer-icon-medium
   rotate: false
-  xy: 1453, 1053
+  xy: 1253, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cryofluidmixer-icon-small
   rotate: false
-  xy: 1820, 938
+  xy: 529, 504
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2666,14 +2673,14 @@ cultivator-icon-large
   index: -1
 cultivator-icon-medium
   rotate: false
-  xy: 1487, 1053
+  xy: 1303, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cultivator-icon-small
   rotate: false
-  xy: 1820, 912
+  xy: 529, 478
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2701,14 +2708,14 @@ cyclone-icon-large
   index: -1
 cyclone-icon-medium
   rotate: false
-  xy: 1521, 1053
+  xy: 1287, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cyclone-icon-small
   rotate: false
-  xy: 1791, 880
+  xy: 529, 452
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2729,189 +2736,217 @@ dagger-factory-icon-large
   index: -1
 dagger-factory-icon-medium
   rotate: false
-  xy: 1555, 1053
+  xy: 1287, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dagger-factory-icon-small
   rotate: false
-  xy: 1880, 1035
+  xy: 529, 426
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-deepwater-icon-large
+darksand-icon-large
+  rotate: false
+  xy: 395, 214
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+darksand-icon-small
+  rotate: false
+  xy: 529, 400
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+darksand-water-icon-large
   rotate: false
   xy: 345, 114
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+darksand-water-icon-small
+  rotate: false
+  xy: 529, 374
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+deepwater-icon-large
+  rotate: false
+  xy: 395, 114
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 deepwater-icon-small
   rotate: false
-  xy: 1384, 603
+  xy: 529, 348
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 delta-mech-pad-icon-large
   rotate: false
-  xy: 395, 64
+  xy: 379, 14
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-pad-icon-medium
   rotate: false
-  xy: 1419, 1019
+  xy: 1321, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 delta-mech-pad-icon-small
   rotate: false
-  xy: 1384, 577
+  xy: 529, 322
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 differential-generator-icon-large
   rotate: false
-  xy: 329, 14
+  xy: 429, 14
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 differential-generator-icon-medium
   rotate: false
-  xy: 1453, 1019
+  xy: 1321, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 differential-generator-icon-small
   rotate: false
-  xy: 1851, 950
+  xy: 529, 296
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 distributor-icon-large
   rotate: false
-  xy: 379, 14
+  xy: 575, 1178
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 distributor-icon-medium
   rotate: false
-  xy: 1487, 1019
+  xy: 1367, 1071
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 distributor-icon-small
   rotate: false
-  xy: 1846, 924
+  xy: 568, 736
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 door-icon-large
   rotate: false
-  xy: 429, 14
+  xy: 575, 1128
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 door-icon-small
   rotate: false
-  xy: 1846, 898
+  xy: 594, 736
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 door-large-icon-large
   rotate: false
-  xy: 575, 1178
+  xy: 575, 1078
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 door-large-icon-medium
   rotate: false
-  xy: 1555, 1019
+  xy: 1435, 1071
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-large-icon-small
   rotate: false
-  xy: 1820, 886
+  xy: 1614, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 dunerocks-icon-large
   rotate: false
-  xy: 575, 1128
+  xy: 575, 1028
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dunerocks-icon-small
   rotate: false
-  xy: 1846, 872
+  xy: 1614, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 duo
   rotate: false
-  xy: 1791, 1105
+  xy: 1301, 971
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-full
   rotate: false
-  xy: 1791, 1071
+  xy: 1351, 1037
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-large
   rotate: false
-  xy: 575, 1078
+  xy: 575, 978
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 duo-icon-small
   rotate: false
-  xy: 1576, 875
+  xy: 1640, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 force-projector-icon-large
   rotate: false
-  xy: 575, 812
+  xy: 625, 1150
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 force-projector-icon-medium
   rotate: false
-  xy: 1219, 837
+  xy: 1419, 1037
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 force-projector-icon-small
   rotate: false
-  xy: 1602, 875
+  xy: 1614, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2925,21 +2960,21 @@ fortress-factory-icon-full
   index: -1
 fortress-factory-icon-large
   rotate: false
-  xy: 574, 762
+  xy: 625, 1100
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 fortress-factory-icon-medium
   rotate: false
-  xy: 1219, 803
+  xy: 1335, 1003
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 fortress-factory-icon-small
   rotate: false
-  xy: 1628, 875
+  xy: 1640, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2960,21 +2995,21 @@ fuse-icon-full
   index: -1
 fuse-icon-large
   rotate: false
-  xy: 625, 1150
+  xy: 625, 1050
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 fuse-icon-medium
   rotate: false
-  xy: 1219, 769
+  xy: 1369, 1003
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 fuse-icon-small
   rotate: false
-  xy: 1654, 866
+  xy: 1666, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2988,189 +3023,189 @@ ghoul-factory-icon-full
   index: -1
 ghoul-factory-icon-large
   rotate: false
-  xy: 625, 1100
+  xy: 625, 1000
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ghoul-factory-icon-medium
   rotate: false
-  xy: 1185, 727
+  xy: 1403, 1003
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ghoul-factory-icon-small
   rotate: false
-  xy: 1680, 866
+  xy: 1640, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 glaive-ship-pad-icon-large
   rotate: false
-  xy: 625, 1050
+  xy: 625, 950
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 glaive-ship-pad-icon-medium
   rotate: false
-  xy: 1219, 735
+  xy: 1335, 969
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 glaive-ship-pad-icon-small
   rotate: false
-  xy: 1706, 866
+  xy: 1666, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 graphite-press-icon-large
   rotate: false
-  xy: 625, 1000
+  xy: 625, 900
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 graphite-press-icon-medium
   rotate: false
-  xy: 1269, 921
+  xy: 1369, 969
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 graphite-press-icon-small
   rotate: false
-  xy: 1732, 866
+  xy: 1692, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 grass-icon-large
   rotate: false
-  xy: 625, 950
+  xy: 625, 850
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 grass-icon-small
   rotate: false
-  xy: 1758, 866
+  xy: 1666, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 hail
   rotate: false
-  xy: 1319, 971
+  xy: 1403, 969
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail-icon-full
   rotate: false
-  xy: 1369, 1003
+  xy: 1453, 1037
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail-icon-large
   rotate: false
-  xy: 625, 900
+  xy: 625, 800
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 hail-icon-small
   rotate: false
-  xy: 1420, 839
+  xy: 1692, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 holostone-icon-large
   rotate: false
-  xy: 625, 800
+  xy: 675, 1150
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 holostone-icon-small
   rotate: false
-  xy: 1446, 839
+  xy: 1718, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 hotrock-icon-large
   rotate: false
-  xy: 624, 750
+  xy: 675, 1100
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 hotrock-icon-small
   rotate: false
-  xy: 1472, 839
+  xy: 1692, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ice-icon-large
   rotate: false
-  xy: 675, 1150
+  xy: 675, 1050
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ice-icon-small
   rotate: false
-  xy: 1498, 839
+  xy: 1718, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ice-snow-icon-large
   rotate: false
-  xy: 675, 1100
+  xy: 675, 1000
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ice-snow-icon-small
   rotate: false
-  xy: 1524, 839
+  xy: 1744, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icerocks-icon-large
   rotate: false
-  xy: 675, 1050
+  xy: 675, 950
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 icerocks-icon-small
   rotate: false
-  xy: 1550, 839
+  xy: 1718, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ignarock-icon-large
   rotate: false
-  xy: 675, 950
+  xy: 675, 850
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ignarock-icon-small
   rotate: false
-  xy: 1419, 813
+  xy: 1770, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3184,49 +3219,49 @@ impact-reactor-icon-full
   index: -1
 impact-reactor-icon-large
   rotate: false
-  xy: 675, 900
+  xy: 675, 800
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 impact-reactor-icon-medium
   rotate: false
-  xy: 1421, 985
+  xy: 1469, 1071
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 impact-reactor-icon-small
   rotate: false
-  xy: 1419, 787
+  xy: 1796, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 incinerator-icon-large
   rotate: false
-  xy: 675, 850
+  xy: 674, 750
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 incinerator-icon-small
   rotate: false
-  xy: 1445, 813
+  xy: 1770, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1445, 787
+  xy: 1822, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-small
   rotate: false
-  xy: 1810, 844
+  xy: 651, 434
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3240,14 +3275,14 @@ item-blast-compound-xlarge
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1471, 813
+  xy: 1822, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-small
   rotate: false
-  xy: 1828, 850
+  xy: 651, 416
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3261,14 +3296,14 @@ item-coal-xlarge
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1445, 761
+  xy: 1848, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 1846, 854
+  xy: 651, 398
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3282,357 +3317,357 @@ item-copper-xlarge
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1471, 787
+  xy: 1848, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 1810, 826
+  xy: 651, 380
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 1425, 1189
+  xy: 1175, 939
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1497, 813
+  xy: 1874, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 1828, 832
+  xy: 651, 362
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1075, 839
+  xy: 1225, 989
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1471, 761
+  xy: 1874, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 1846, 836
+  xy: 651, 344
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1125, 889
+  xy: 1275, 1039
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1497, 787
+  xy: 1900, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 1810, 808
+  xy: 651, 326
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1175, 939
+  xy: 1325, 1089
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1523, 813
+  xy: 1900, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 1828, 814
+  xy: 651, 308
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1225, 989
+  xy: 1375, 1139
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1497, 761
+  xy: 1926, 785
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1846, 818
+  xy: 651, 290
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1275, 1039
+  xy: 1475, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1523, 787
+  xy: 1952, 785
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1864, 854
+  xy: 651, 272
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1325, 1089
+  xy: 1075, 789
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1549, 813
+  xy: 1978, 785
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 1864, 836
+  xy: 1926, 715
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1375, 1139
+  xy: 1125, 839
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1523, 761
+  xy: 2004, 785
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 1864, 818
+  xy: 1944, 715
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1467, 1189
+  xy: 1175, 897
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-source-icon-large
   rotate: false
-  xy: 675, 800
+  xy: 449, 522
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-source-icon-small
   rotate: false
-  xy: 1549, 787
+  xy: 1822, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1549, 761
+  xy: 1848, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1880, 1017
+  xy: 1962, 715
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 1075, 797
+  xy: 1417, 1139
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1418, 719
+  xy: 1874, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1877, 999
+  xy: 1980, 715
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 1509, 1189
+  xy: 1517, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1654, 840
+  xy: 1900, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1877, 981
+  xy: 1998, 715
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 1551, 1189
+  xy: 1559, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1680, 840
+  xy: 1926, 759
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1877, 963
+  xy: 2016, 715
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 1593, 1189
+  xy: 1601, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-void-icon-large
   rotate: false
-  xy: 674, 750
+  xy: 445, 472
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-void-icon-small
   rotate: false
-  xy: 1706, 840
+  xy: 1952, 759
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 javelin-ship-pad-icon-large
   rotate: false
-  xy: 445, 472
+  xy: 445, 372
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-ship-pad-icon-medium
   rotate: false
-  xy: 1253, 777
+  xy: 1539, 1063
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 javelin-ship-pad-icon-small
   rotate: false
-  xy: 1732, 840
+  xy: 1978, 759
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 junction-icon-large
   rotate: false
-  xy: 445, 372
+  xy: 445, 272
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 junction-icon-small
   rotate: false
-  xy: 1758, 840
+  xy: 2004, 759
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 kiln-icon-large
   rotate: false
-  xy: 445, 322
+  xy: 445, 222
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 kiln-icon-medium
   rotate: false
-  xy: 1219, 701
+  xy: 1607, 1049
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 kiln-icon-small
   rotate: false
-  xy: 1784, 854
+  xy: 1796, 734
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3653,21 +3688,21 @@ lancer-icon-full
   index: -1
 lancer-icon-large
   rotate: false
-  xy: 445, 272
+  xy: 445, 172
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lancer-icon-medium
   rotate: false
-  xy: 1253, 709
+  xy: 1539, 1029
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lancer-icon-small
   rotate: false
-  xy: 1445, 735
+  xy: 1822, 724
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3681,91 +3716,91 @@ laser-drill-icon-full
   index: -1
 laser-drill-icon-large
   rotate: false
-  xy: 445, 222
+  xy: 445, 122
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 laser-drill-icon-medium
   rotate: false
-  xy: 1287, 887
+  xy: 1539, 995
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 laser-drill-icon-small
   rotate: false
-  xy: 1471, 735
+  xy: 1848, 724
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 launch-pad-icon-large
   rotate: false
-  xy: 445, 172
+  xy: 445, 72
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 launch-pad-icon-medium
   rotate: false
-  xy: 1287, 853
+  xy: 1573, 1015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 launch-pad-icon-small
   rotate: false
-  xy: 1497, 735
+  xy: 1874, 724
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-junction-icon-large
   rotate: false
-  xy: 445, 72
+  xy: 691, 1339
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-junction-icon-small
   rotate: false
-  xy: 1523, 735
+  xy: 1900, 724
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-router-icon-full
   rotate: false
-  xy: 1287, 683
+  xy: 1777, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-large
   rotate: false
-  xy: 479, 22
+  xy: 691, 1289
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-router-icon-small
   rotate: false
-  xy: 1549, 735
+  xy: 1926, 733
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-source-icon-large
   rotate: false
-  xy: 691, 1339
+  xy: 741, 1339
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-source-icon-small
   rotate: false
-  xy: 1444, 709
+  xy: 1952, 733
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3779,35 +3814,35 @@ liquid-tank-icon-full
   index: -1
 liquid-tank-icon-large
   rotate: false
-  xy: 691, 1289
+  xy: 691, 1239
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-tank-icon-medium
   rotate: false
-  xy: 495, 386
+  xy: 1539, 961
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-tank-icon-small
   rotate: false
-  xy: 1470, 709
+  xy: 1978, 733
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 magmarock-icon-large
   rotate: false
-  xy: 741, 1339
+  xy: 741, 1289
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 magmarock-icon-small
   rotate: false
-  xy: 1496, 709
+  xy: 2004, 733
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3828,42 +3863,42 @@ mass-driver-icon-full
   index: -1
 mass-driver-icon-large
   rotate: false
-  xy: 691, 1239
+  xy: 791, 1339
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mass-driver-icon-medium
   rotate: false
-  xy: 495, 318
+  xy: 1607, 981
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mass-driver-icon-small
   rotate: false
-  xy: 1522, 709
+  xy: 555, 710
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 741, 1289
+  xy: 741, 1239
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 791, 1339
+  xy: 791, 1289
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 741, 1239
+  xy: 841, 1339
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -3877,7 +3912,7 @@ mech-icon-glaive-ship
   index: -1
 mech-icon-javelin-ship
   rotate: false
-  xy: 791, 1289
+  xy: 791, 1239
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -3912,35 +3947,35 @@ mechanical-drill-icon-full
   index: -1
 mechanical-drill-icon-large
   rotate: false
-  xy: 841, 1339
+  xy: 841, 1289
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mechanical-drill-icon-medium
   rotate: false
-  xy: 495, 284
+  xy: 1641, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-drill-icon-small
   rotate: false
-  xy: 1548, 709
+  xy: 555, 684
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 mechanical-pump-icon-large
   rotate: false
-  xy: 791, 1239
+  xy: 841, 1239
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mechanical-pump-icon-small
   rotate: false
-  xy: 1784, 828
+  xy: 581, 710
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3961,161 +3996,161 @@ meltdown-icon-full
   index: -1
 meltdown-icon-large
   rotate: false
-  xy: 841, 1289
+  xy: 891, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 meltdown-icon-medium
   rotate: false
-  xy: 495, 216
+  xy: 1709, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 meltdown-icon-small
   rotate: false
-  xy: 1418, 693
+  xy: 555, 658
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 melter-icon-large
   rotate: false
-  xy: 841, 1239
+  xy: 941, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 melter-icon-small
   rotate: false
-  xy: 1415, 667
+  xy: 581, 684
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 mend-projector-icon-large
   rotate: false
-  xy: 891, 1281
+  xy: 991, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mend-projector-icon-medium
   rotate: false
-  xy: 495, 148
+  xy: 1777, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mend-projector-icon-small
   rotate: false
-  xy: 1419, 641
+  xy: 555, 632
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-2-icon-large
   rotate: false
-  xy: 941, 1281
+  xy: 891, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-2-icon-small
   rotate: false
-  xy: 1444, 683
+  xy: 581, 658
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-3-icon-large
   rotate: false
-  xy: 991, 1281
+  xy: 941, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-3-icon-small
   rotate: false
-  xy: 1470, 683
+  xy: 555, 606
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-5-icon-large
   rotate: false
-  xy: 891, 1231
+  xy: 991, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-5-icon-small
   rotate: false
-  xy: 1496, 683
+  xy: 581, 632
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-large
   rotate: false
-  xy: 941, 1231
+  xy: 1041, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-small
   rotate: false
-  xy: 1522, 683
+  xy: 555, 580
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-icon-large
   rotate: false
-  xy: 991, 1231
+  xy: 725, 1189
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-icon-small
   rotate: false
-  xy: 1548, 683
+  xy: 581, 606
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 moss-icon-large
   rotate: false
-  xy: 1041, 1231
+  xy: 725, 1139
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 moss-icon-small
   rotate: false
-  xy: 1419, 615
+  xy: 555, 554
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 multi-press-icon-large
   rotate: false
-  xy: 725, 1189
+  xy: 775, 1189
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 multi-press-icon-medium
   rotate: false
-  xy: 495, 114
+  xy: 1811, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 multi-press-icon-small
   rotate: false
-  xy: 1410, 589
+  xy: 581, 580
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4129,245 +4164,245 @@ oil-extractor-icon-full
   index: -1
 oil-extractor-icon-large
   rotate: false
-  xy: 725, 1139
+  xy: 725, 1089
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 oil-extractor-icon-medium
   rotate: false
-  xy: 495, 80
+  xy: 1845, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oil-extractor-icon-small
   rotate: false
-  xy: 1410, 563
+  xy: 555, 528
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 omega-mech-pad-icon-large
   rotate: false
-  xy: 775, 1189
+  xy: 775, 1139
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 omega-mech-pad-icon-medium
   rotate: false
-  xy: 1825, 1100
+  xy: 1879, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 omega-mech-pad-icon-small
   rotate: false
-  xy: 1576, 823
+  xy: 581, 554
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-coal-icon-full
   rotate: false
-  xy: 1859, 1100
+  xy: 1913, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-icon-medium
   rotate: false
-  xy: 1859, 1100
+  xy: 1913, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-icon-large
   rotate: false
-  xy: 725, 1089
+  xy: 825, 1189
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-coal-icon-small
   rotate: false
-  xy: 1602, 823
+  xy: 555, 502
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-copper-icon-full
   rotate: false
-  xy: 1825, 1066
+  xy: 1947, 1015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-icon-medium
   rotate: false
-  xy: 1825, 1066
+  xy: 1947, 1015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-icon-large
   rotate: false
-  xy: 775, 1139
+  xy: 725, 1039
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-copper-icon-small
   rotate: false
-  xy: 1628, 823
+  xy: 581, 528
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-lead-icon-full
   rotate: false
-  xy: 1859, 1066
+  xy: 1981, 1015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-icon-medium
   rotate: false
-  xy: 1859, 1066
+  xy: 1981, 1015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-icon-large
   rotate: false
-  xy: 825, 1189
+  xy: 775, 1089
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-lead-icon-small
   rotate: false
-  xy: 1575, 797
+  xy: 555, 476
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-scrap-icon-full
   rotate: false
-  xy: 1147, 719
+  xy: 2015, 1015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-icon-medium
   rotate: false
-  xy: 1147, 719
+  xy: 2015, 1015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-icon-large
   rotate: false
-  xy: 725, 1039
+  xy: 825, 1139
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-scrap-icon-small
   rotate: false
-  xy: 1575, 771
+  xy: 581, 502
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-thorium-icon-full
   rotate: false
-  xy: 1146, 685
+  xy: 1573, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-icon-medium
   rotate: false
-  xy: 1146, 685
+  xy: 1573, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-icon-large
   rotate: false
-  xy: 775, 1089
+  xy: 725, 989
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-thorium-icon-small
   rotate: false
-  xy: 1601, 797
+  xy: 555, 450
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-titanium-icon-full
   rotate: false
-  xy: 1893, 1095
+  xy: 1607, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-icon-medium
   rotate: false
-  xy: 1893, 1095
+  xy: 1607, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-icon-large
   rotate: false
-  xy: 825, 1139
+  xy: 775, 1039
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-titanium-icon-small
   rotate: false
-  xy: 1575, 745
+  xy: 581, 476
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 overdrive-projector-icon-large
   rotate: false
-  xy: 725, 989
+  xy: 825, 1089
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 overdrive-projector-icon-medium
   rotate: false
-  xy: 1893, 1061
+  xy: 1641, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overdrive-projector-icon-small
   rotate: false
-  xy: 1601, 771
+  xy: 555, 424
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 overflow-gate-icon-large
   rotate: false
-  xy: 775, 1039
+  xy: 725, 939
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 overflow-gate-icon-small
   rotate: false
-  xy: 1627, 797
+  xy: 581, 450
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4381,84 +4416,84 @@ phantom-factory-icon-full
   index: -1
 phantom-factory-icon-large
   rotate: false
-  xy: 825, 1089
+  xy: 775, 989
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phantom-factory-icon-medium
   rotate: false
-  xy: 1180, 659
+  xy: 1709, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phantom-factory-icon-small
   rotate: false
-  xy: 1601, 745
+  xy: 555, 398
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-conduit-icon-large
   rotate: false
-  xy: 725, 939
+  xy: 825, 1039
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-conduit-icon-small
   rotate: false
-  xy: 1627, 771
+  xy: 581, 424
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-conveyor-icon-large
   rotate: false
-  xy: 775, 989
+  xy: 725, 889
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-conveyor-icon-small
   rotate: false
-  xy: 1627, 745
+  xy: 555, 372
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-wall-icon-large
   rotate: false
-  xy: 825, 1039
+  xy: 775, 939
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-wall-icon-small
   rotate: false
-  xy: 1654, 814
+  xy: 581, 398
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-wall-large-icon-large
   rotate: false
-  xy: 725, 889
+  xy: 825, 989
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-wall-large-icon-medium
   rotate: false
-  xy: 1248, 607
+  xy: 1641, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-large-icon-small
   rotate: false
-  xy: 1680, 814
+  xy: 555, 346
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4472,56 +4507,56 @@ phase-weaver-icon-full
   index: -1
 phase-weaver-icon-large
   rotate: false
-  xy: 775, 939
+  xy: 725, 839
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-weaver-icon-medium
   rotate: false
-  xy: 1283, 615
+  xy: 1675, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-weaver-icon-small
   rotate: false
-  xy: 1706, 814
+  xy: 581, 372
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pine-icon-medium
   rotate: false
-  xy: 1282, 581
+  xy: 1709, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pine-icon-small
   rotate: false
-  xy: 1732, 814
+  xy: 555, 320
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-large
   rotate: false
-  xy: 825, 989
+  xy: 775, 889
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-medium
   rotate: false
-  xy: 1317, 615
+  xy: 1743, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-small
   rotate: false
-  xy: 1758, 814
+  xy: 581, 346
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4535,175 +4570,175 @@ pneumatic-drill-icon-full
   index: -1
 pneumatic-drill-icon-large
   rotate: false
-  xy: 725, 839
+  xy: 825, 939
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pneumatic-drill-icon-medium
   rotate: false
-  xy: 1316, 581
+  xy: 1777, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pneumatic-drill-icon-small
   rotate: false
-  xy: 1653, 788
+  xy: 581, 320
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 power-node-icon-large
   rotate: false
-  xy: 775, 889
+  xy: 775, 839
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 power-node-icon-small
   rotate: false
-  xy: 1653, 762
+  xy: 555, 294
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 power-node-large-icon-large
   rotate: false
-  xy: 825, 939
+  xy: 825, 889
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 power-node-large-icon-medium
   rotate: false
-  xy: 519, 730
+  xy: 1845, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large-icon-small
   rotate: false
-  xy: 1679, 788
+  xy: 581, 294
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 power-source-icon-large
   rotate: false
-  xy: 775, 839
+  xy: 825, 839
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 power-source-icon-small
   rotate: false
-  xy: 1679, 762
+  xy: 529, 270
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 power-void-icon-large
   rotate: false
-  xy: 825, 889
+  xy: 725, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 power-void-icon-small
   rotate: false
-  xy: 1705, 788
+  xy: 555, 268
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pulse-conduit-icon-full
   rotate: false
-  xy: 499, 560
+  xy: 2015, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-large
   rotate: false
-  xy: 825, 839
+  xy: 775, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pulse-conduit-icon-small
   rotate: false
-  xy: 1705, 762
+  xy: 581, 268
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pulverizer-icon-full
   rotate: false
-  xy: 529, 458
+  xy: 1353, 901
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-large
   rotate: false
-  xy: 725, 789
+  xy: 825, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pulverizer-icon-small
   rotate: false
-  xy: 1731, 788
+  xy: 526, 244
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-large
   rotate: false
-  xy: 775, 789
+  xy: 724, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-medium
   rotate: false
-  xy: 529, 390
+  xy: 1387, 901
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-small
   rotate: false
-  xy: 1731, 762
+  xy: 525, 218
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 529, 356
+  xy: 1353, 867
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-icon-full
   rotate: false
-  xy: 529, 288
+  xy: 1421, 901
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-icon-large
   rotate: false
-  xy: 724, 739
+  xy: 824, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 repair-point-icon-small
   rotate: false
-  xy: 1757, 788
+  xy: 525, 192
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4717,21 +4752,21 @@ revenant-factory-icon-full
   index: -1
 revenant-factory-icon-large
   rotate: false
-  xy: 774, 739
+  xy: 875, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-factory-icon-medium
   rotate: false
-  xy: 529, 254
+  xy: 1387, 867
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 revenant-factory-icon-small
   rotate: false
-  xy: 1757, 762
+  xy: 525, 166
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4752,119 +4787,119 @@ ripple-icon-full
   index: -1
 ripple-icon-large
   rotate: false
-  xy: 875, 1181
+  xy: 875, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ripple-icon-medium
   rotate: false
-  xy: 529, 220
+  xy: 1489, 935
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ripple-icon-small
   rotate: false
-  xy: 1653, 736
+  xy: 525, 140
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rock-icon-medium
   rotate: false
-  xy: 529, 186
+  xy: 1455, 901
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rock-icon-small
   rotate: false
-  xy: 1679, 736
+  xy: 524, 114
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rocks-icon-large
   rotate: false
-  xy: 925, 1181
+  xy: 975, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rocks-icon-small
   rotate: false
-  xy: 1705, 736
+  xy: 552, 242
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rotary-pump-icon-large
   rotate: false
-  xy: 875, 1131
+  xy: 875, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rotary-pump-icon-medium
   rotate: false
-  xy: 529, 152
+  xy: 1421, 867
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-icon-small
   rotate: false
-  xy: 1731, 736
+  xy: 578, 242
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 router-icon-large
   rotate: false
-  xy: 975, 1181
+  xy: 925, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 router-icon-small
   rotate: false
-  xy: 1757, 736
+  xy: 551, 216
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rtg-generator-icon-large
   rotate: false
-  xy: 875, 1081
+  xy: 1025, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rtg-generator-icon-medium
   rotate: false
-  xy: 529, 84
+  xy: 1455, 867
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-icon-small
   rotate: false
-  xy: 1784, 802
+  xy: 551, 190
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 salt-icon-large
   rotate: false
-  xy: 925, 1131
+  xy: 875, 1031
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 salt-icon-small
   rotate: false
-  xy: 1783, 776
+  xy: 577, 216
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4885,63 +4920,63 @@ salvo-icon-full
   index: -1
 salvo-icon-large
   rotate: false
-  xy: 1025, 1181
+  xy: 925, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 salvo-icon-medium
   rotate: false
-  xy: 529, 16
+  xy: 1337, 833
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salvo-icon-small
   rotate: false
-  xy: 1783, 750
+  xy: 551, 164
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 sand-icon-large
   rotate: false
-  xy: 875, 1031
+  xy: 975, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-icon-small
   rotate: false
-  xy: 1783, 724
+  xy: 577, 190
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 sand-water-icon-large
   rotate: false
-  xy: 925, 1081
+  xy: 875, 981
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-water-icon-small
   rotate: false
-  xy: 1445, 657
+  xy: 577, 164
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 sandrocks-icon-large
   rotate: false
-  xy: 975, 1131
+  xy: 925, 1031
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sandrocks-icon-small
   rotate: false
-  xy: 1445, 631
+  xy: 551, 138
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4962,301 +4997,329 @@ scatter-icon-full
   index: -1
 scatter-icon-large
   rotate: false
-  xy: 875, 981
+  xy: 975, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 scatter-icon-medium
   rotate: false
-  xy: 563, 492
+  xy: 1371, 833
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scatter-icon-small
   rotate: false
-  xy: 1471, 657
+  xy: 577, 138
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-scrap-wall-gigantic-icon-large
+scorch
   rotate: false
-  xy: 925, 1031
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-scrap-wall-gigantic-icon-medium
-  rotate: false
-  xy: 563, 322
+  xy: 1405, 833
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-scrap-wall-gigantic-icon-small
+scorch-icon-full
   rotate: false
-  xy: 1471, 631
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-scrap-wall-huge-icon-large
-  rotate: false
-  xy: 975, 1081
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-scrap-wall-huge-icon-medium
-  rotate: false
-  xy: 563, 288
+  xy: 1473, 833
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-scrap-wall-huge-icon-small
-  rotate: false
-  xy: 1497, 657
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-scrap-wall-icon-large
+scorch-icon-large
   rotate: false
   xy: 1025, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-scrap-wall-icon-small
+scorch-icon-small
   rotate: false
-  xy: 1497, 631
+  xy: 550, 112
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-scrap-wall-large-icon-large
+scrap-wall-gigantic-icon-large
   rotate: false
   xy: 875, 931
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-scrap-wall-large-icon-medium
+scrap-wall-gigantic-icon-medium
   rotate: false
-  xy: 563, 254
+  xy: 1423, 799
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-scrap-wall-large-icon-small
+scrap-wall-gigantic-icon-small
   rotate: false
-  xy: 1523, 657
+  xy: 576, 112
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-separator-icon-large
+scrap-wall-huge-icon-large
   rotate: false
   xy: 925, 981
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-separator-icon-medium
+scrap-wall-huge-icon-medium
   rotate: false
-  xy: 563, 186
+  xy: 1423, 765
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-separator-icon-small
+scrap-wall-huge-icon-small
   rotate: false
-  xy: 1549, 620
+  xy: 607, 710
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-shale-boulder-icon-large
+scrap-wall-icon-large
   rotate: false
   xy: 975, 1031
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-shale-boulder-icon-small
+scrap-wall-icon-small
   rotate: false
-  xy: 1445, 605
+  xy: 607, 684
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-shale-icon-large
+scrap-wall-large-icon-large
   rotate: false
   xy: 1025, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-shale-icon-small
+scrap-wall-large-icon-medium
   rotate: false
-  xy: 1471, 605
+  xy: 1457, 799
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap-wall-large-icon-small
+  rotate: false
+  xy: 607, 658
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-shalerocks-icon-large
+separator-icon-large
   rotate: false
   xy: 875, 881
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-shalerocks-icon-small
+separator-icon-medium
   rotate: false
-  xy: 1497, 605
+  xy: 1523, 927
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+separator-icon-small
+  rotate: false
+  xy: 607, 553
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-shock-mine-icon-large
+shale-boulder-icon-large
   rotate: false
   xy: 925, 931
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-shock-mine-icon-small
+shale-boulder-icon-small
   rotate: false
-  xy: 1436, 579
+  xy: 607, 527
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-silicon-smelter-icon-large
+shale-icon-large
+  rotate: false
+  xy: 975, 981
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+shale-icon-small
+  rotate: false
+  xy: 607, 501
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+shalerocks-icon-large
   rotate: false
   xy: 1025, 1031
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-silicon-smelter-icon-medium
+shalerocks-icon-small
   rotate: false
-  xy: 563, 84
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-silicon-smelter-icon-small
-  rotate: false
-  xy: 1462, 579
+  xy: 607, 475
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-snow-icon-large
+shock-mine-icon-large
   rotate: false
   xy: 875, 831
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-snow-icon-small
+shock-mine-icon-small
   rotate: false
-  xy: 1488, 579
+  xy: 607, 449
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-snowrock-icon-medium
-  rotate: false
-  xy: 563, 16
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snowrock-icon-small
-  rotate: false
-  xy: 1436, 553
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-snowrocks-icon-large
-  rotate: false
-  xy: 925, 881
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-snowrocks-icon-small
-  rotate: false
-  xy: 1462, 553
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-solar-panel-icon-large
+silicon-smelter-icon-large
   rotate: false
   xy: 975, 931
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-solar-panel-icon-small
+silicon-smelter-icon-medium
   rotate: false
-  xy: 1488, 553
+  xy: 1557, 913
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+silicon-smelter-icon-small
+  rotate: false
+  xy: 607, 423
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-solar-panel-large-icon-large
+snow-icon-large
   rotate: false
   xy: 1025, 981
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-solar-panel-large-icon-medium
+snow-icon-small
   rotate: false
-  xy: 1589, 1071
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-solar-panel-large-icon-small
-  rotate: false
-  xy: 1575, 719
+  xy: 607, 397
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-sorter-icon-large
+snowrock-icon-medium
+  rotate: false
+  xy: 1591, 913
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+snowrock-icon-small
+  rotate: false
+  xy: 607, 371
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+snowrocks-icon-large
   rotate: false
   xy: 925, 831
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-sorter-icon-small
+snowrocks-icon-small
   rotate: false
-  xy: 1601, 719
+  xy: 607, 345
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-spawn-icon-large
+solar-panel-icon-large
   rotate: false
   xy: 975, 881
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
+solar-panel-icon-small
+  rotate: false
+  xy: 607, 319
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+solar-panel-large-icon-large
+  rotate: false
+  xy: 1025, 931
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+solar-panel-large-icon-medium
+  rotate: false
+  xy: 1557, 845
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-large-icon-small
+  rotate: false
+  xy: 607, 293
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+sorter-icon-large
+  rotate: false
+  xy: 975, 831
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+sorter-icon-small
+  rotate: false
+  xy: 607, 267
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+spawn-icon-large
+  rotate: false
+  xy: 1025, 881
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 spawn-icon-small
   rotate: false
-  xy: 1627, 719
+  xy: 604, 241
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5277,21 +5340,21 @@ spectre-icon-full
   index: -1
 spectre-icon-large
   rotate: false
-  xy: 1025, 931
+  xy: 1025, 831
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spectre-icon-medium
   rotate: false
-  xy: 1591, 1003
+  xy: 1625, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spectre-icon-small
   rotate: false
-  xy: 1574, 693
+  xy: 603, 215
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5305,70 +5368,70 @@ spirit-factory-icon-full
   index: -1
 spirit-factory-icon-large
   rotate: false
-  xy: 1025, 881
+  xy: 925, 781
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spirit-factory-icon-medium
   rotate: false
-  xy: 1591, 969
+  xy: 1693, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spirit-factory-icon-small
   rotate: false
-  xy: 1600, 693
+  xy: 603, 189
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 spore-cluster-icon-large
   rotate: false
-  xy: 1025, 831
+  xy: 975, 781
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster-icon-medium
   rotate: false
-  xy: 1591, 935
+  xy: 1659, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-cluster-icon-small
   rotate: false
-  xy: 1626, 693
+  xy: 603, 163
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 spore-moss-icon-large
   rotate: false
-  xy: 875, 781
+  xy: 1025, 781
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-moss-icon-small
   rotate: false
-  xy: 1653, 710
+  xy: 603, 137
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 spore-pine-icon-medium
   rotate: false
-  xy: 1625, 1003
+  xy: 1727, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pine-icon-small
   rotate: false
-  xy: 1679, 710
+  xy: 602, 111
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5382,105 +5445,105 @@ spore-press-icon-full
   index: -1
 spore-press-icon-large
   rotate: false
-  xy: 925, 781
+  xy: 874, 731
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-press-icon-medium
   rotate: false
-  xy: 1625, 969
+  xy: 1693, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-press-icon-small
   rotate: false
-  xy: 1705, 710
+  xy: 524, 88
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 sporerocks-icon-large
   rotate: false
-  xy: 975, 781
+  xy: 924, 731
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sporerocks-icon-small
   rotate: false
-  xy: 1731, 710
+  xy: 550, 86
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 stone-icon-large
   rotate: false
-  xy: 1025, 781
+  xy: 974, 731
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stone-icon-small
   rotate: false
-  xy: 1757, 710
+  xy: 576, 86
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 surge-tower-icon-large
   rotate: false
-  xy: 874, 731
+  xy: 1024, 731
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 surge-tower-icon-medium
   rotate: false
-  xy: 1625, 935
+  xy: 1761, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-tower-icon-small
   rotate: false
-  xy: 1575, 667
+  xy: 602, 85
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 surge-wall-icon-large
   rotate: false
-  xy: 924, 731
+  xy: 1075, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 surge-wall-icon-small
   rotate: false
-  xy: 1575, 641
+  xy: 633, 724
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 surge-wall-large-icon-large
   rotate: false
-  xy: 974, 731
+  xy: 1125, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 surge-wall-large-icon-medium
   rotate: false
-  xy: 1625, 901
+  xy: 1795, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large-icon-small
   rotate: false
-  xy: 1601, 667
+  xy: 659, 724
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5501,175 +5564,175 @@ swarmer-icon-full
   index: -1
 swarmer-icon-large
   rotate: false
-  xy: 1075, 1181
+  xy: 1175, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-icon-medium
   rotate: false
-  xy: 1657, 1062
+  xy: 1761, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 swarmer-icon-small
   rotate: false
-  xy: 1601, 641
+  xy: 633, 698
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 tar-icon-large
   rotate: false
-  xy: 1125, 1181
+  xy: 1075, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tar-icon-small
   rotate: false
-  xy: 1627, 667
+  xy: 685, 724
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-large
   rotate: false
-  xy: 1075, 1081
+  xy: 1075, 1031
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-medium
   rotate: false
-  xy: 1691, 1062
+  xy: 1829, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-small
   rotate: false
-  xy: 1627, 641
+  xy: 633, 672
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thermal-generator-icon-large
   rotate: false
-  xy: 1125, 1131
+  xy: 1125, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thermal-generator-icon-medium
   rotate: false
-  xy: 1725, 1062
+  xy: 1795, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-generator-icon-small
   rotate: false
-  xy: 1575, 615
+  xy: 659, 698
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thermal-pump-icon-large
   rotate: false
-  xy: 1225, 1181
+  xy: 1175, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thermal-pump-icon-medium
   rotate: false
-  xy: 1659, 1028
+  xy: 1863, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-icon-small
   rotate: false
-  xy: 1601, 615
+  xy: 633, 646
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thorium-reactor-icon-large
   rotate: false
-  xy: 1075, 1031
+  xy: 1275, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thorium-reactor-icon-medium
   rotate: false
-  xy: 1659, 994
+  xy: 1829, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-reactor-icon-small
   rotate: false
-  xy: 1627, 615
+  xy: 659, 672
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thorium-wall-icon-large
   rotate: false
-  xy: 1125, 1081
+  xy: 1075, 981
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thorium-wall-icon-small
   rotate: false
-  xy: 1783, 698
+  xy: 685, 698
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-large
   rotate: false
-  xy: 1175, 1131
+  xy: 1125, 1031
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-medium
   rotate: false
-  xy: 1659, 960
+  xy: 1863, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-small
   rotate: false
-  xy: 1523, 589
+  xy: 633, 620
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thruster-icon-large
   rotate: false
-  xy: 1275, 1181
+  xy: 1175, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thruster-icon-medium
   rotate: false
-  xy: 1693, 994
+  xy: 1897, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thruster-icon-small
   rotate: false
-  xy: 1549, 594
+  xy: 659, 646
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5683,112 +5746,112 @@ titan-factory-icon-full
   index: -1
 titan-factory-icon-large
   rotate: false
-  xy: 1075, 981
+  xy: 1225, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titan-factory-icon-medium
   rotate: false
-  xy: 1659, 926
+  xy: 1931, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titan-factory-icon-small
   rotate: false
-  xy: 1575, 589
+  xy: 685, 672
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-large
   rotate: false
-  xy: 1125, 1031
+  xy: 1325, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-small
   rotate: false
-  xy: 1601, 589
+  xy: 633, 594
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 titanium-wall-icon-large
   rotate: false
-  xy: 1175, 1081
+  xy: 1075, 931
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titanium-wall-icon-small
   rotate: false
-  xy: 1627, 589
+  xy: 659, 620
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-large
   rotate: false
-  xy: 1225, 1131
+  xy: 1125, 981
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-medium
   rotate: false
-  xy: 1321, 679
+  xy: 1389, 731
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-small
   rotate: false
-  xy: 1514, 563
+  xy: 685, 646
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-large
   rotate: false
-  xy: 1325, 1181
+  xy: 1175, 1031
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-medium
   rotate: false
-  xy: 1355, 867
+  xy: 1457, 731
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-small
   rotate: false
-  xy: 1549, 568
+  xy: 633, 568
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 turbine-generator-icon-large
   rotate: false
-  xy: 1075, 931
+  xy: 1225, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 turbine-generator-icon-medium
   rotate: false
-  xy: 1355, 833
+  xy: 1491, 731
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 turbine-generator-icon-small
   rotate: false
-  xy: 1575, 563
+  xy: 659, 594
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5802,14 +5865,14 @@ unit-icon-chaos-array
   index: -1
 unit-icon-crawler
   rotate: false
-  xy: 1125, 981
+  xy: 1275, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-icon-dagger
   rotate: false
-  xy: 1175, 1031
+  xy: 1375, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5844,35 +5907,35 @@ unit-icon-titan
   index: -1
 unloader-icon-large
   rotate: false
-  xy: 1225, 1081
+  xy: 1075, 881
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unloader-icon-small
   rotate: false
-  xy: 1601, 563
+  xy: 685, 620
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 vault-icon-large
   rotate: false
-  xy: 1275, 1131
+  xy: 1125, 931
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vault-icon-medium
   rotate: false
-  xy: 1355, 765
+  xy: 495, 454
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault-icon-small
   rotate: false
-  xy: 1627, 563
+  xy: 633, 542
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5886,35 +5949,35 @@ water-extractor-icon-full
   index: -1
 water-extractor-icon-large
   rotate: false
-  xy: 1375, 1181
+  xy: 1175, 981
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 water-extractor-icon-medium
   rotate: false
-  xy: 1355, 731
+  xy: 495, 420
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-extractor-icon-small
   rotate: false
-  xy: 1514, 537
+  xy: 659, 568
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 water-icon-large
   rotate: false
-  xy: 1075, 881
+  xy: 1225, 1031
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 water-icon-small
   rotate: false
-  xy: 1540, 542
+  xy: 685, 594
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5935,63 +5998,63 @@ wave-icon-full
   index: -1
 wave-icon-large
   rotate: false
-  xy: 1125, 931
+  xy: 1275, 1081
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wave-icon-medium
   rotate: false
-  xy: 1355, 697
+  xy: 495, 386
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-icon-small
   rotate: false
-  xy: 1566, 537
+  xy: 633, 516
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 white-tree-dead-icon-large
   rotate: false
-  xy: 1175, 981
+  xy: 1325, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 white-tree-dead-icon-medium
   rotate: false
-  xy: 1355, 663
+  xy: 495, 352
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-dead-icon-small
   rotate: false
-  xy: 1592, 537
+  xy: 659, 542
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 white-tree-icon-large
   rotate: false
-  xy: 1225, 1031
+  xy: 1425, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 white-tree-icon-medium
   rotate: false
-  xy: 1351, 629
+  xy: 495, 318
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-icon-small
   rotate: false
-  xy: 1618, 537
+  xy: 685, 568
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6005,168 +6068,168 @@ wraith-factory-icon-full
   index: -1
 wraith-factory-icon-large
   rotate: false
-  xy: 1325, 1131
+  xy: 1125, 881
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wraith-factory-icon-medium
   rotate: false
-  xy: 1385, 629
+  xy: 495, 284
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wraith-factory-icon-small
   rotate: false
-  xy: 1540, 516
+  xy: 633, 490
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 1489, 985
+  xy: 1471, 969
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1523, 985
+  xy: 1487, 1037
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1557, 985
+  xy: 1505, 1003
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1421, 951
+  xy: 1505, 969
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1455, 951
+  xy: 1539, 1097
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1489, 951
+  xy: 1573, 1083
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1523, 951
+  xy: 1607, 1083
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1557, 951
+  xy: 1641, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1319, 937
+  xy: 1675, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1353, 935
+  xy: 1709, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1387, 935
+  xy: 1743, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1421, 917
+  xy: 1777, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1455, 917
+  xy: 1811, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1523, 917
+  xy: 1879, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1557, 917
+  xy: 1913, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1253, 879
+  xy: 1947, 1049
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1253, 845
+  xy: 1981, 1049
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1287, 785
+  xy: 1641, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1287, 717
+  xy: 1709, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 495, 454
+  xy: 1879, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 495, 352
+  xy: 1573, 981
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6194,21 +6257,21 @@ alpha-mech-leg
   index: -1
 delta-mech
   rotate: false
-  xy: 395, 164
+  xy: 345, 64
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-base
   rotate: false
-  xy: 395, 114
+  xy: 395, 64
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 345, 64
+  xy: 329, 14
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -6250,21 +6313,21 @@ tau-mech
   index: -1
 tau-mech-base
   rotate: false
-  xy: 1075, 1131
+  xy: 1125, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-mech-leg
   rotate: false
-  xy: 1175, 1181
+  xy: 1225, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 395, 214
+  xy: 395, 164
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -6278,14 +6341,14 @@ glaive-ship
   index: -1
 javelin-ship
   rotate: false
-  xy: 449, 522
+  xy: 445, 422
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-ship-shield
   rotate: false
-  xy: 445, 422
+  xy: 445, 322
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -6299,7 +6362,7 @@ trident-ship
   index: -1
 blank
   rotate: false
-  xy: 1415, 712
+  xy: 526, 281
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -6313,7 +6376,7 @@ circle
   index: -1
 clear
   rotate: false
-  xy: 1441, 690
+  xy: 1947, 1202
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -6327,7 +6390,7 @@ shape-3
   index: -1
 bar
   rotate: false
-  xy: 1851, 1028
+  xy: 1585, 807
   size: 27, 36
   split: 9, 9, 9, 9
   orig: 27, 36
@@ -6335,7 +6398,7 @@ bar
   index: -1
 bar-top
   rotate: false
-  xy: 1389, 715
+  xy: 495, 104
   size: 27, 36
   split: 9, 10, 9, 10
   orig: 27, 36
@@ -6343,7 +6406,7 @@ bar-top
   index: -1
 button
   rotate: false
-  xy: 1825, 1202
+  xy: 1833, 1202
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6383,7 +6446,7 @@ button-edge-2
   index: -1
 button-edge-3
   rotate: false
-  xy: 1635, 1202
+  xy: 1643, 1202
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6399,7 +6462,7 @@ button-edge-4
   index: -1
 button-over
   rotate: false
-  xy: 1673, 1202
+  xy: 1681, 1202
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6407,7 +6470,7 @@ button-over
   index: -1
 button-right
   rotate: false
-  xy: 1787, 1202
+  xy: 1795, 1202
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6415,7 +6478,7 @@ button-right
   index: -1
 button-right-down
   rotate: false
-  xy: 1711, 1202
+  xy: 1719, 1202
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6423,7 +6486,7 @@ button-right-down
   index: -1
 button-right-over
   rotate: false
-  xy: 1749, 1202
+  xy: 1757, 1202
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6431,7 +6494,7 @@ button-right-over
   index: -1
 button-select
   rotate: false
-  xy: 891, 1337
+  xy: 516, 738
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -6439,28 +6502,28 @@ button-select
   index: -1
 check-off
   rotate: false
-  xy: 1113, 745
+  xy: 1819, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on
   rotate: false
-  xy: 1112, 711
+  xy: 1853, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 1167, 897
+  xy: 1887, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 1217, 947
+  xy: 1921, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6482,7 +6545,7 @@ content-background
   index: -1
 content-background-locked
   rotate: false
-  xy: 1863, 1202
+  xy: 1871, 1202
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6490,7 +6553,7 @@ content-background-locked
   index: -1
 content-background-over
   rotate: false
-  xy: 1901, 1202
+  xy: 1909, 1202
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6512,77 +6575,77 @@ discord-banner
   index: -1
 empty-sector
   rotate: false
-  xy: 1219, 871
+  xy: 1385, 1037
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 1091, 1237
+  xy: 299, 1218
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 1906, 1043
+  xy: 1091, 1237
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 567, 533
+  xy: 659, 524
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-effect
   rotate: false
-  xy: 1566, 519
+  xy: 685, 550
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 2030, 1849
+  xy: 633, 364
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 121, 7
+  xy: 2030, 1867
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 139, 7
+  xy: 2030, 1849
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 1978, 1031
+  xy: 149, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 2014, 1031
+  xy: 185, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 1810, 862
+  xy: 651, 470
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6624,56 +6687,56 @@ icon-admin-small
   index: -1
 icon-areaDelete
   rotate: false
-  xy: 1927, 1117
+  xy: 599, 1420
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow
   rotate: false
-  xy: 649, 1356
+  xy: 1521, 1053
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 649, 1356
+  xy: 1521, 1053
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-down
   rotate: false
-  xy: 599, 1420
+  xy: 333, 74
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 333, 74
+  xy: 1477, 1131
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 1939, 1117
+  xy: 1087, 1679
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 1087, 1679
+  xy: 568, 1949
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-back
   rotate: false
-  xy: 295, 721
+  xy: 1507, 841
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6687,679 +6750,679 @@ icon-ban
   index: -1
 icon-break
   rotate: false
-  xy: 564, 1771
+  xy: 131, 713
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 299, 1218
+  xy: 649, 1356
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel-2
   rotate: false
-  xy: 1576, 849
+  xy: 1744, 776
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 568, 1949
+  xy: 1557, 949
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-check
   rotate: false
-  xy: 1765, 1146
+  xy: 295, 721
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-check-2
   rotate: false
-  xy: 1602, 849
+  xy: 1770, 802
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icon-copy
   rotate: false
-  xy: 553, 746
+  xy: 564, 1771
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 1351, 617
+  xy: 989, 1663
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-database
   rotate: false
-  xy: 1403, 1021
+  xy: 1625, 931
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-database-small
   rotate: false
-  xy: 1576, 905
+  xy: 537, 76
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 1589, 1105
+  xy: 1931, 914
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 1605, 1105
+  xy: 2023, 1117
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 1765, 1130
+  xy: 1521, 1037
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 1019, 1463
+  xy: 2033, 897
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 1035, 1463
+  xy: 1019, 1463
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 313, 53
+  xy: 1035, 1463
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-elevation
   rotate: false
-  xy: 667, 1356
+  xy: 633, 472
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-eraser
   rotate: false
-  xy: 1584, 519
+  xy: 667, 1356
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-exit
   rotate: false
-  xy: 625, 1218
+  xy: 2033, 881
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 1602, 519
+  xy: 659, 506
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 1620, 519
+  xy: 633, 454
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 625, 1202
+  xy: 2033, 865
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 585, 533
+  xy: 633, 436
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-floppy
   rotate: false
-  xy: 1367, 1089
+  xy: 2033, 849
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 2030, 1903
+  xy: 633, 418
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 1369, 1039
+  xy: 2033, 833
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 1303, 947
+  xy: 2033, 817
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-generated
   rotate: false
-  xy: 675, 1000
+  xy: 675, 900
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 icon-github
   rotate: false
-  xy: 1303, 931
+  xy: 313, 53
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 2033, 1169
+  xy: 625, 1218
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-grid
   rotate: false
-  xy: 2030, 1885
+  xy: 633, 400
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-hold
   rotate: false
-  xy: 553, 734
+  xy: 329, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 329, 2
+  xy: 711, 738
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 2033, 1153
+  xy: 625, 1202
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 2025, 1117
+  xy: 1251, 973
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 303, 1418
+  xy: 1351, 1073
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 303, 1402
+  xy: 2033, 801
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 515, 10
+  xy: 669, 444
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 77, 24
+  xy: 2039, 1123
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 2030, 1867
+  xy: 633, 382
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-link
   rotate: false
-  xy: 1403, 1005
+  xy: 303, 1418
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 1877, 951
+  xy: 568, 1937
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 303, 1386
+  xy: 303, 1402
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 571, 744
+  xy: 633, 346
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 589, 744
+  xy: 633, 328
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 567, 721
+  xy: 633, 310
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 585, 721
+  xy: 633, 292
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 989, 1663
+  xy: 341, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 607, 746
+  xy: 303, 1386
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 2029, 1105
+  xy: 711, 726
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 1644, 545
+  xy: 633, 274
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-missing
   rotate: false
-  xy: 1653, 618
+  xy: 669, 432
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-background
   rotate: false
-  xy: 131, 711
+  xy: 1955, 1185
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 icon-mission-battle
   rotate: false
-  xy: 1669, 634
+  xy: 568, 1925
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-defense
   rotate: false
-  xy: 1685, 650
+  xy: 353, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-done
   rotate: false
-  xy: 1701, 666
+  xy: 711, 714
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 1717, 682
+  xy: 669, 420
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-paste
   rotate: false
-  xy: 2025, 1133
+  xy: 659, 488
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 568, 1937
+  xy: 365, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 479, 4
+  xy: 2030, 1903
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 1652, 694
+  xy: 521, 72
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 497, 4
+  xy: 2030, 1885
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 1363, 617
+  xy: 711, 702
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 1668, 694
+  xy: 2030, 785
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-play-custom
   rotate: false
-  xy: 1684, 694
+  xy: 2030, 769
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 341, 2
+  xy: 669, 408
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power-requirement
   rotate: false
-  xy: 1353, 969
+  xy: 1437, 1003
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 2029, 1093
+  xy: 377, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 1700, 694
+  xy: 2030, 753
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 157, 7
+  xy: 1213, 861
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 1716, 694
+  xy: 2030, 737
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 1732, 694
+  xy: 299, 1202
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 175, 7
+  xy: 1231, 861
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 1748, 694
+  xy: 299, 1370
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 1764, 694
+  xy: 479, 6
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 1653, 678
+  xy: 495, 6
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 1653, 662
+  xy: 511, 6
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 1669, 678
+  xy: 1551, 727
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 193, 7
+  xy: 77, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 211, 7
+  xy: 95, 19
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 1653, 606
+  xy: 711, 690
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-spray
   rotate: false
-  xy: 1906, 1025
+  xy: 113, 19
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 1924, 1031
+  xy: 95, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 1653, 646
+  xy: 1567, 727
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 1729, 682
+  xy: 669, 396
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 568, 1925
+  xy: 389, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 1669, 662
+  xy: 677, 526
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 1942, 1031
+  xy: 113, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tree
   rotate: false
-  xy: 1960, 1031
+  xy: 131, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tree-locked
   rotate: false
-  xy: 1387, 969
+  xy: 1437, 969
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-trello
   rotate: false
-  xy: 1685, 678
+  xy: 677, 510
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 1653, 630
+  xy: 677, 494
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 1996, 1031
+  xy: 167, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocked
   rotate: false
-  xy: 1644, 527
+  xy: 203, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 1669, 646
+  xy: 703, 552
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 1685, 662
+  xy: 669, 472
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zone
   rotate: false
-  xy: 1628, 849
+  xy: 1744, 750
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7373,14 +7436,14 @@ icon-zone-locked
   index: -1
 icon-zoom
   rotate: false
-  xy: 1828, 868
+  xy: 651, 452
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 1701, 678
+  xy: 669, 456
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -7394,7 +7457,7 @@ info-banner
   index: -1
 inventory
   rotate: false
-  xy: 1419, 745
+  xy: 1796, 760
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -7409,7 +7472,7 @@ logotext
   index: -1
 pane
   rotate: false
-  xy: 1673, 1173
+  xy: 1535, 1160
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -7417,7 +7480,7 @@ pane
   index: -1
 pane-2
   rotate: false
-  xy: 1635, 1173
+  xy: 1497, 1160
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -7425,7 +7488,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 1549, 646
+  xy: 607, 579
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -7449,7 +7512,7 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 1523, 615
+  xy: 607, 616
   size: 24, 40
   split: 10, 10, 6, 10
   orig: 24, 40
@@ -7457,7 +7520,7 @@ scroll-knob-vertical-black
   index: -1
 sector-select
   rotate: false
-  xy: 563, 220
+  xy: 1457, 765
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7471,42 +7534,42 @@ selection
   index: -1
 slider
   rotate: false
-  xy: 1924, 1051
+  xy: 2030, 801
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 1389, 895
+  xy: 485, 733
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 1389, 855
+  xy: 495, 244
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 1389, 855
+  xy: 495, 244
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-vertical
   rotate: false
-  xy: 121, 34
+  xy: 1041, 1310
   size: 8, 1
   orig: 8, 1
   offset: 0, 0
   index: -1
 underline
   rotate: false
-  xy: 1825, 1173
+  xy: 1535, 1131
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -7514,7 +7577,7 @@ underline
   index: -1
 underline-2
   rotate: false
-  xy: 1787, 1173
+  xy: 1497, 1131
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -7529,7 +7592,7 @@ white
   index: -1
 window-empty
   rotate: false
-  xy: 1791, 906
+  xy: 1585, 744
   size: 27, 61
   split: 8, 8, 44, 11
   orig: 27, 61
@@ -7712,7 +7775,7 @@ revenant
   index: -1
 spirit
   rotate: false
-  xy: 975, 831
+  xy: 875, 781
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7733,7 +7796,7 @@ titan-leg
   index: -1
 wraith
   rotate: false
-  xy: 1275, 1081
+  xy: 1075, 831
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7789,63 +7852,63 @@ eradication-equip
   index: -1
 eruption-equip
   rotate: false
-  xy: 575, 970
+  xy: 575, 870
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 575, 920
+  xy: 575, 820
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 575, 862
+  xy: 574, 762
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 625, 850
+  xy: 624, 750
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles-equip
   rotate: false
-  xy: 445, 122
+  xy: 479, 22
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun-equip
   rotate: false
-  xy: 825, 789
+  xy: 774, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles-equip
   rotate: false
-  xy: 824, 739
+  xy: 925, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 975, 981
+  xy: 925, 881
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 1024, 731
+  xy: 1075, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8066,20 +8129,48 @@ dagger-factory-icon-editor
   orig: 64, 64
   offset: 0, 0
   index: -1
-deepwater-icon-editor
+darksand-icon-editor
   rotate: false
   xy: 1245, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-deepwater
+editor-darksand1
   rotate: false
   xy: 1245, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+darksand-water-icon-editor
+  rotate: false
+  xy: 1279, 71
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-darksand-water
+  rotate: false
+  xy: 1279, 71
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+deepwater-icon-editor
+  rotate: false
+  xy: 1313, 71
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-deepwater
+  rotate: false
+  xy: 1313, 71
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 delta-mech-pad-icon-editor
   rotate: false
   xy: 1923, 335
@@ -8103,7 +8194,7 @@ distributor-icon-editor
   index: -1
 door-icon-editor
   rotate: false
-  xy: 1279, 71
+  xy: 163, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8117,28 +8208,28 @@ door-large-icon-editor
   index: -1
 dunerocks-icon-editor
   rotate: false
-  xy: 1313, 71
+  xy: 197, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-editor
   rotate: false
-  xy: 163, 13
+  xy: 231, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char2
   rotate: false
-  xy: 197, 13
+  xy: 265, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char3
   rotate: false
-  xy: 231, 13
+  xy: 299, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8152,686 +8243,700 @@ editor-clear
   index: -1
 editor-craters2
   rotate: false
-  xy: 265, 13
+  xy: 333, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters3
   rotate: false
-  xy: 299, 13
+  xy: 367, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters4
   rotate: false
-  xy: 333, 13
+  xy: 401, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters5
   rotate: false
-  xy: 367, 13
+  xy: 435, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone1
   rotate: false
-  xy: 367, 13
+  xy: 435, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-icon-editor
   rotate: false
-  xy: 367, 13
+  xy: 435, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters6
   rotate: false
-  xy: 401, 13
+  xy: 469, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone2
-  rotate: false
-  xy: 401, 13
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-grass1
-  rotate: false
-  xy: 435, 13
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-grass-icon-editor
-  rotate: false
-  xy: 435, 13
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-grass2
   rotate: false
   xy: 469, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-grass3
+editor-darksand2
   rotate: false
   xy: 503, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-holostone1
+editor-darksand3
   rotate: false
   xy: 1373, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-holostone-icon-editor
-  rotate: false
-  xy: 1373, 103
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-holostone2
+editor-grass1
   rotate: false
   xy: 1407, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-holostone3
+grass-icon-editor
+  rotate: false
+  xy: 1407, 103
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-grass2
   rotate: false
   xy: 1441, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-hotrock1
+editor-grass3
   rotate: false
   xy: 1475, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-hotrock-icon-editor
-  rotate: false
-  xy: 1475, 103
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-hotrock2
+editor-holostone1
   rotate: false
   xy: 1509, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-hotrock3
+holostone-icon-editor
+  rotate: false
+  xy: 1509, 103
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-holostone2
   rotate: false
   xy: 1543, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-ice-snow1
-  rotate: false
-  xy: 1679, 103
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ice-snow-icon-editor
-  rotate: false
-  xy: 1679, 103
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ice-snow2
-  rotate: false
-  xy: 1713, 103
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ice-snow3
-  rotate: false
-  xy: 1769, 135
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ice1
+editor-holostone3
   rotate: false
   xy: 1577, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ice-icon-editor
-  rotate: false
-  xy: 1577, 103
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ice2
+editor-hotrock1
   rotate: false
   xy: 1611, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-ice3
+hotrock-icon-editor
+  rotate: false
+  xy: 1611, 103
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-hotrock2
   rotate: false
   xy: 1645, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-ignarock1
+editor-hotrock3
   rotate: false
-  xy: 1803, 135
+  xy: 1679, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ignarock-icon-editor
-  rotate: false
-  xy: 1803, 135
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-editor-ignarock2
+editor-ice-snow1
   rotate: false
   xy: 1837, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-ignarock3
+ice-snow-icon-editor
+  rotate: false
+  xy: 1837, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-ice-snow2
   rotate: false
   xy: 1979, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-magmarock1
+editor-ice-snow3
   rotate: false
   xy: 1747, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-magmarock-icon-editor
+editor-ice1
   rotate: false
-  xy: 1747, 101
+  xy: 1713, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-magmarock2
+ice-icon-editor
+  rotate: false
+  xy: 1713, 103
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-ice2
+  rotate: false
+  xy: 1769, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-ice3
+  rotate: false
+  xy: 1803, 135
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-ignarock1
   rotate: false
   xy: 1781, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-magmarock3
+ignarock-icon-editor
+  rotate: false
+  xy: 1781, 101
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-ignarock2
   rotate: false
   xy: 1815, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-editor-metal-floor
+editor-ignarock3
   rotate: false
   xy: 1849, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+editor-magmarock1
+  rotate: false
+  xy: 1903, 193
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+magmarock-icon-editor
+  rotate: false
+  xy: 1903, 193
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-magmarock2
+  rotate: false
+  xy: 1937, 201
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-magmarock3
+  rotate: false
+  xy: 1971, 201
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+editor-metal-floor
+  rotate: false
+  xy: 1871, 159
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 editor-metal-floor-damaged5
   rotate: false
-  xy: 1849, 101
+  xy: 1871, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-icon-editor
   rotate: false
-  xy: 1849, 101
+  xy: 1871, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-2
   rotate: false
-  xy: 1903, 193
+  xy: 1905, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2-icon-editor
   rotate: false
-  xy: 1903, 193
+  xy: 1905, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-3
   rotate: false
-  xy: 1937, 201
+  xy: 1939, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3-icon-editor
   rotate: false
-  xy: 1937, 201
+  xy: 1939, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-5
   rotate: false
-  xy: 1971, 201
+  xy: 1973, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5-icon-editor
   rotate: false
-  xy: 1971, 201
+  xy: 1973, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged1
   rotate: false
-  xy: 1871, 159
+  xy: 1883, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-editor
   rotate: false
-  xy: 1871, 159
+  xy: 1883, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged2
   rotate: false
-  xy: 1905, 159
+  xy: 1883, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged3
   rotate: false
-  xy: 1939, 167
+  xy: 1917, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged4
   rotate: false
-  xy: 1973, 167
+  xy: 1917, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged6
   rotate: false
-  xy: 1883, 125
+  xy: 1951, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss1
   rotate: false
-  xy: 1883, 91
+  xy: 1951, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss-icon-editor
   rotate: false
-  xy: 1883, 91
+  xy: 1951, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss2
   rotate: false
-  xy: 1917, 125
+  xy: 1985, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss3
   rotate: false
-  xy: 1917, 91
+  xy: 1985, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal1
   rotate: false
-  xy: 1951, 133
+  xy: 2005, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal2
   rotate: false
-  xy: 1951, 99
+  xy: 2007, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal3
   rotate: false
-  xy: 1985, 133
+  xy: 1989, 363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper1
   rotate: false
-  xy: 1985, 99
+  xy: 1989, 329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper2
   rotate: false
-  xy: 2005, 201
+  xy: 1989, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper3
   rotate: false
-  xy: 2007, 167
+  xy: 1951, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead1
   rotate: false
-  xy: 1989, 363
+  xy: 1985, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead2
   rotate: false
-  xy: 1989, 329
+  xy: 1347, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead3
   rotate: false
-  xy: 1989, 295
+  xy: 1381, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap1
   rotate: false
-  xy: 1951, 65
+  xy: 1415, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap2
   rotate: false
-  xy: 1985, 65
+  xy: 1449, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap3
   rotate: false
-  xy: 1347, 69
+  xy: 1483, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium1
   rotate: false
-  xy: 1381, 69
+  xy: 1517, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium2
   rotate: false
-  xy: 1415, 69
+  xy: 1551, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium3
   rotate: false
-  xy: 1449, 69
+  xy: 1585, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium1
   rotate: false
-  xy: 1483, 69
+  xy: 1619, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium2
   rotate: false
-  xy: 1517, 69
+  xy: 1653, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium3
   rotate: false
-  xy: 1551, 69
+  xy: 1687, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-salt
   rotate: false
-  xy: 1585, 69
+  xy: 1721, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt-icon-editor
   rotate: false
-  xy: 1585, 69
+  xy: 1721, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand-water
   rotate: false
-  xy: 1721, 67
+  xy: 1013, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-icon-editor
   rotate: false
-  xy: 1721, 67
+  xy: 1013, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand1
   rotate: false
-  xy: 1619, 69
+  xy: 1755, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-icon-editor
   rotate: false
-  xy: 1619, 69
+  xy: 1755, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand2
   rotate: false
-  xy: 1653, 69
+  xy: 1789, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand3
   rotate: false
-  xy: 1687, 69
+  xy: 1823, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale1
   rotate: false
-  xy: 1755, 67
+  xy: 1047, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-icon-editor
   rotate: false
-  xy: 1755, 67
+  xy: 1047, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale2
   rotate: false
-  xy: 1789, 67
+  xy: 1081, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-shale3
   rotate: false
-  xy: 1823, 67
+  xy: 1115, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow1
   rotate: false
-  xy: 1013, 39
+  xy: 1149, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-icon-editor
   rotate: false
-  xy: 1013, 39
+  xy: 1149, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow2
   rotate: false
-  xy: 1047, 39
+  xy: 1183, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow3
   rotate: false
-  xy: 1081, 37
+  xy: 1217, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss1
   rotate: false
-  xy: 1115, 37
+  xy: 1251, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss-icon-editor
   rotate: false
-  xy: 1115, 37
+  xy: 1251, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss2
   rotate: false
-  xy: 1149, 37
+  xy: 1285, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-spore-moss3
   rotate: false
-  xy: 1183, 37
+  xy: 1319, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone3
   rotate: false
-  xy: 1217, 37
+  xy: 1353, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tar
   rotate: false
-  xy: 1251, 37
+  xy: 1387, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-icon-editor
   rotate: false
-  xy: 1251, 37
+  xy: 1387, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-water
   rotate: false
-  xy: 1285, 37
+  xy: 1421, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-icon-editor
   rotate: false
-  xy: 1285, 37
+  xy: 1421, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8880,14 +8985,14 @@ graphite-press-icon-editor
   index: -1
 hail-icon-editor
   rotate: false
-  xy: 1319, 35
+  xy: 1455, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks-icon-editor
   rotate: false
-  xy: 1353, 35
+  xy: 1489, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8901,21 +9006,21 @@ impact-reactor-icon-editor
   index: -1
 incinerator-icon-editor
   rotate: false
-  xy: 1387, 35
+  xy: 1523, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source-icon-editor
   rotate: false
-  xy: 1421, 35
+  xy: 1557, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void-icon-editor
   rotate: false
-  xy: 1455, 35
+  xy: 1591, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8929,7 +9034,7 @@ javelin-ship-pad-icon-editor
   index: -1
 junction-icon-editor
   rotate: false
-  xy: 1489, 35
+  xy: 1625, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8964,21 +9069,21 @@ launch-pad-icon-editor
   index: -1
 liquid-junction-icon-editor
   rotate: false
-  xy: 1523, 35
+  xy: 1659, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-editor
   rotate: false
-  xy: 1557, 35
+  xy: 1693, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source-icon-editor
   rotate: false
-  xy: 1591, 35
+  xy: 1727, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9006,7 +9111,7 @@ mechanical-drill-icon-editor
   index: -1
 mechanical-pump-icon-editor
   rotate: false
-  xy: 1625, 35
+  xy: 1761, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9020,7 +9125,7 @@ meltdown-icon-editor
   index: -1
 melter-icon-editor
   rotate: false
-  xy: 1659, 35
+  xy: 1795, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9062,7 +9167,7 @@ overdrive-projector-icon-editor
   index: -1
 overflow-gate-icon-editor
   rotate: false
-  xy: 1693, 33
+  xy: 1829, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9076,21 +9181,21 @@ phantom-factory-icon-editor
   index: -1
 phase-conduit-icon-editor
   rotate: false
-  xy: 1727, 33
+  xy: 619, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-icon-editor
   rotate: false
-  xy: 1761, 33
+  xy: 653, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-icon-editor
   rotate: false
-  xy: 1795, 33
+  xy: 687, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9132,7 +9237,7 @@ pneumatic-drill-icon-editor
   index: -1
 power-node-icon-editor
   rotate: false
-  xy: 1829, 33
+  xy: 721, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9146,28 +9251,28 @@ power-node-large-icon-editor
   index: -1
 power-source-icon-editor
   rotate: false
-  xy: 619, 9
+  xy: 755, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void-icon-editor
   rotate: false
-  xy: 653, 9
+  xy: 789, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-editor
   rotate: false
-  xy: 687, 9
+  xy: 823, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-editor
   rotate: false
-  xy: 721, 9
+  xy: 857, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9181,7 +9286,7 @@ pyratite-mixer-icon-editor
   index: -1
 repair-point-icon-editor
   rotate: false
-  xy: 755, 9
+  xy: 891, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9209,7 +9314,7 @@ rock-icon-editor
   index: -1
 rocks-icon-editor
   rotate: false
-  xy: 789, 9
+  xy: 925, 7
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9223,7 +9328,7 @@ rotary-pump-icon-editor
   index: -1
 router-icon-editor
   rotate: false
-  xy: 823, 9
+  xy: 959, 7
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9244,7 +9349,7 @@ salvo-icon-editor
   index: -1
 sandrocks-icon-editor
   rotate: false
-  xy: 857, 9
+  xy: 993, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9256,6 +9361,13 @@ scatter-icon-editor
   orig: 64, 64
   offset: 0, 0
   index: -1
+scorch-icon-editor
+  rotate: false
+  xy: 1027, 5
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 scrap-wall-gigantic-icon-editor
   rotate: false
   xy: 775, 239
@@ -9272,7 +9384,7 @@ scrap-wall-huge-icon-editor
   index: -1
 scrap-wall-icon-editor
   rotate: false
-  xy: 891, 9
+  xy: 1061, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9293,21 +9405,21 @@ separator-icon-editor
   index: -1
 shale-boulder-icon-editor
   rotate: false
-  xy: 925, 7
+  xy: 1095, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks-icon-editor
   rotate: false
-  xy: 959, 7
+  xy: 1129, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shock-mine-icon-editor
   rotate: false
-  xy: 993, 5
+  xy: 1163, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9328,14 +9440,14 @@ snowrock-icon-editor
   index: -1
 snowrocks-icon-editor
   rotate: false
-  xy: 1027, 5
+  xy: 1197, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-icon-editor
   rotate: false
-  xy: 1061, 3
+  xy: 1231, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9349,14 +9461,14 @@ solar-panel-large-icon-editor
   index: -1
 sorter-icon-editor
   rotate: false
-  xy: 1095, 3
+  xy: 1265, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn-icon-editor
   rotate: false
-  xy: 1129, 3
+  xy: 1299, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9398,7 +9510,7 @@ spore-press-icon-editor
   index: -1
 sporerocks-icon-editor
   rotate: false
-  xy: 1163, 3
+  xy: 1333, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9412,7 +9524,7 @@ surge-tower-icon-editor
   index: -1
 surge-wall-icon-editor
   rotate: false
-  xy: 1197, 3
+  xy: 1367, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9461,7 +9573,7 @@ thorium-reactor-icon-editor
   index: -1
 thorium-wall-icon-editor
   rotate: false
-  xy: 1231, 3
+  xy: 1401, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9489,14 +9601,14 @@ titan-factory-icon-editor
   index: -1
 titanium-conveyor-icon-editor
   rotate: false
-  xy: 1265, 3
+  xy: 1435, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-icon-editor
   rotate: false
-  xy: 1299, 1
+  xy: 1469, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9524,7 +9636,7 @@ turbine-generator-icon-editor
   index: -1
 unloader-icon-editor
   rotate: false
-  xy: 1333, 1
+  xy: 1503, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9579,7 +9691,7 @@ filter: Nearest,Nearest
 repeat: none
 char1
   rotate: false
-  xy: 1773, 865
+  xy: 1839, 931
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9593,28 +9705,28 @@ char2
   index: -1
 char3
   rotate: false
-  xy: 729, 491
+  xy: 1193, 571
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs1
   rotate: false
-  xy: 1019, 589
+  xy: 1309, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 1309, 687
+  xy: 1599, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 1591, 785
+  xy: 1019, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9635,7 +9747,7 @@ copper1
   index: -1
 copper2
   rotate: false
-  xy: 1773, 831
+  xy: 1839, 897
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9649,28 +9761,28 @@ copper3
   index: -1
 craters1
   rotate: false
-  xy: 763, 491
+  xy: 1193, 537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters2
   rotate: false
-  xy: 1053, 589
+  xy: 1343, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters3
   rotate: false
-  xy: 1343, 687
+  xy: 1633, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters4
   rotate: false
-  xy: 1625, 785
+  xy: 1053, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9703,16 +9815,58 @@ stone2
   orig: 32, 32
   offset: 0, 0
   index: -1
-deepwater
+darksand-edge
+  rotate: false
+  xy: 323, 917
+  size: 288, 96
+  orig: 288, 96
+  offset: 0, 0
+  index: -1
+darksand-water
+  rotate: false
+  xy: 1087, 491
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand-water-edge
+  rotate: false
+  xy: 1, 273
+  size: 288, 96
+  orig: 288, 96
+  offset: 0, 0
+  index: -1
+darksand1
   rotate: false
   xy: 1957, 981
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+darksand2
+  rotate: false
+  xy: 1377, 687
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+darksand3
+  rotate: false
+  xy: 1667, 785
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+deepwater
+  rotate: false
+  xy: 243, 43
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 deepwater-edge
   rotate: false
-  xy: 323, 917
+  xy: 323, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -9726,161 +9880,161 @@ dunerocks-large
   index: -1
 dunerocks1
   rotate: false
-  xy: 797, 491
+  xy: 483, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dunerocks2
   rotate: false
-  xy: 1087, 589
+  xy: 1991, 981
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 edge-stencil-blocky
   rotate: false
-  xy: 1, 273
+  xy: 613, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 edge-stencil-smooth
   rotate: false
-  xy: 323, 819
+  xy: 1, 175
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 grass-edge
   rotate: false
-  xy: 613, 917
+  xy: 323, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 1377, 687
+  xy: 1411, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 1659, 785
+  xy: 1701, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 243, 43
+  xy: 1121, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone-edge
   rotate: false
-  xy: 1, 175
+  xy: 613, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 holostone1
   rotate: false
-  xy: 483, 393
+  xy: 517, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone2
   rotate: false
-  xy: 1991, 981
+  xy: 1445, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone3
   rotate: false
-  xy: 831, 491
+  xy: 1735, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock1
   rotate: false
-  xy: 1121, 589
+  xy: 1155, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock2
   rotate: false
-  xy: 1411, 687
+  xy: 551, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock3
   rotate: false
-  xy: 1693, 785
+  xy: 585, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-edge
   rotate: false
-  xy: 323, 721
+  xy: 903, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 ice-snow-edge
   rotate: false
-  xy: 613, 819
+  xy: 1, 77
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 ice-snow1
   rotate: false
-  xy: 1445, 687
+  xy: 721, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow2
   rotate: false
-  xy: 1727, 785
+  xy: 755, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow3
   rotate: false
-  xy: 551, 393
+  xy: 789, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 517, 393
+  xy: 619, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 865, 491
+  xy: 653, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 1155, 589
+  xy: 687, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9894,343 +10048,343 @@ icerocks-large
   index: -1
 icerocks1
   rotate: false
-  xy: 291, 337
+  xy: 823, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks2
   rotate: false
-  xy: 291, 303
+  xy: 857, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock-edge
   rotate: false
-  xy: 903, 917
+  xy: 323, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 ignarock1
   rotate: false
-  xy: 291, 269
+  xy: 291, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock2
   rotate: false
-  xy: 291, 235
+  xy: 291, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock3
   rotate: false
-  xy: 291, 201
+  xy: 291, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 291, 167
+  xy: 291, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 291, 133
+  xy: 291, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 291, 99
+  xy: 291, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock1
   rotate: false
-  xy: 613, 425
+  xy: 291, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock2
   rotate: false
-  xy: 903, 523
+  xy: 291, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock3
   rotate: false
-  xy: 1193, 621
+  xy: 1483, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor
   rotate: false
-  xy: 1483, 719
+  xy: 903, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged5
   rotate: false
-  xy: 1483, 719
+  xy: 903, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2
   rotate: false
-  xy: 647, 425
+  xy: 1517, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2-edge
   rotate: false
-  xy: 1, 77
+  xy: 613, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-3
   rotate: false
-  xy: 937, 523
+  xy: 937, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3-edge
   rotate: false
-  xy: 323, 623
+  xy: 903, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-5
   rotate: false
-  xy: 1227, 621
+  xy: 325, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5-edge
   rotate: false
-  xy: 613, 721
+  xy: 1193, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-damaged-edge
   rotate: false
-  xy: 903, 819
+  xy: 323, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-damaged1
   rotate: false
-  xy: 1517, 719
+  xy: 325, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged2
   rotate: false
-  xy: 325, 343
+  xy: 325, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged3
   rotate: false
-  xy: 325, 309
+  xy: 325, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged4
   rotate: false
-  xy: 325, 275
+  xy: 325, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged6
   rotate: false
-  xy: 325, 241
+  xy: 325, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-edge
   rotate: false
-  xy: 1193, 917
+  xy: 613, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 moss-edge
   rotate: false
-  xy: 323, 525
+  xy: 903, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 moss1
   rotate: false
-  xy: 325, 207
+  xy: 325, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss2
   rotate: false
-  xy: 325, 173
+  xy: 325, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss3
   rotate: false
-  xy: 325, 139
+  xy: 1479, 685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal1
   rotate: false
-  xy: 325, 105
+  xy: 1513, 685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal2
   rotate: false
-  xy: 899, 489
+  xy: 133, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal3
   rotate: false
-  xy: 933, 489
+  xy: 1815, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper1
   rotate: false
-  xy: 1189, 587
+  xy: 1773, 807
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper2
   rotate: false
-  xy: 1223, 587
+  xy: 291, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper3
   rotate: false
-  xy: 1479, 685
+  xy: 325, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead1
   rotate: false
-  xy: 1513, 685
+  xy: 891, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead2
   rotate: false
-  xy: 133, 1
+  xy: 925, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead3
   rotate: false
-  xy: 291, 65
+  xy: 1551, 735
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap1
   rotate: false
-  xy: 325, 71
+  xy: 971, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap2
   rotate: false
-  xy: 681, 441
+  xy: 1769, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap3
   rotate: false
-  xy: 971, 539
+  xy: 1243, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium1
   rotate: false
-  xy: 1261, 637
+  xy: 1873, 931
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium2
   rotate: false
-  xy: 1823, 915
+  xy: 1873, 897
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium3
   rotate: false
-  xy: 1807, 865
+  xy: 1849, 863
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium1
   rotate: false
-  xy: 1807, 831
+  xy: 1883, 863
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium2
   rotate: false
-  xy: 1889, 947
+  xy: 1907, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium3
   rotate: false
-  xy: 1923, 947
+  xy: 1907, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10244,273 +10398,273 @@ pine
   index: -1
 rock1
   rotate: false
-  xy: 1773, 899
+  xy: 1839, 965
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 1839, 965
+  xy: 1193, 605
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rocks-large
   rotate: false
-  xy: 613, 459
+  xy: 1193, 655
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rocks1
   rotate: false
-  xy: 1957, 947
+  xy: 1941, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 1991, 947
+  xy: 1941, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt
   rotate: false
-  xy: 729, 457
+  xy: 1975, 947
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt-edge
   rotate: false
-  xy: 613, 623
+  xy: 1193, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand-edge
   rotate: false
-  xy: 903, 721
+  xy: 1483, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand-water
   rotate: false
-  xy: 865, 457
+  xy: 1985, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-edge
   rotate: false
-  xy: 1193, 819
+  xy: 323, 427
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 763, 457
+  xy: 1975, 913
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 797, 457
+  xy: 1917, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 831, 457
+  xy: 1951, 879
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks-large
   rotate: false
-  xy: 903, 557
+  xy: 1483, 753
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sandrocks1
   rotate: false
-  xy: 899, 455
+  xy: 1227, 571
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks2
   rotate: false
-  xy: 933, 455
+  xy: 1227, 537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 1019, 555
+  xy: 1019, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 1053, 555
+  xy: 1053, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 1087, 555
+  xy: 1087, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 1223, 553
+  xy: 1343, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1309, 653
+  xy: 1377, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-edge
   rotate: false
-  xy: 1483, 917
+  xy: 613, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 shale1
   rotate: false
-  xy: 1121, 555
+  xy: 1121, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale2
   rotate: false
-  xy: 1155, 555
+  xy: 1155, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale3
   rotate: false
-  xy: 1189, 553
+  xy: 1309, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks-large
   rotate: false
-  xy: 1193, 655
+  xy: 903, 459
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shalerocks1
   rotate: false
-  xy: 1343, 653
+  xy: 1411, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks2
   rotate: false
-  xy: 1377, 653
+  xy: 1445, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-edge
   rotate: false
-  xy: 323, 427
+  xy: 903, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 1411, 653
+  xy: 1479, 651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1445, 653
+  xy: 1513, 651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1479, 651
+  xy: 1551, 701
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock1
   rotate: false
-  xy: 679, 475
+  xy: 1259, 671
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrock2
   rotate: false
-  xy: 969, 573
+  xy: 1549, 769
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrocks-large
   rotate: false
-  xy: 1483, 753
+  xy: 67, 11
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 snowrocks1
   rotate: false
-  xy: 1513, 651
+  xy: 1547, 667
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 681, 407
+  xy: 971, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 1549, 777
+  xy: 133, 35
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 133, 35
+  xy: 1773, 841
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -10524,140 +10678,140 @@ spore-cluster3
   index: -1
 spore-moss-edge
   rotate: false
-  xy: 613, 525
+  xy: 1193, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 spore-moss1
   rotate: false
-  xy: 715, 423
+  xy: 1005, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss2
   rotate: false
-  xy: 749, 423
+  xy: 1039, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss3
   rotate: false
-  xy: 783, 423
+  xy: 1073, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pine
   rotate: false
-  xy: 1259, 671
+  xy: 969, 475
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sporerocks-large
   rotate: false
-  xy: 67, 11
+  xy: 1773, 883
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sporerocks1
   rotate: false
-  xy: 817, 423
+  xy: 1107, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sporerocks2
   rotate: false
-  xy: 851, 423
+  xy: 1141, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-edge
   rotate: false
-  xy: 903, 623
+  xy: 1483, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 885, 421
+  xy: 1599, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 919, 421
+  xy: 1633, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-edge
   rotate: false
-  xy: 1193, 721
+  xy: 613, 427
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 971, 505
+  xy: 1667, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 967, 471
+  xy: 1701, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1005, 521
+  xy: 1735, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1039, 521
+  xy: 1769, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1073, 521
+  xy: 1585, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1107, 521
+  xy: 1619, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 1141, 521
+  xy: 1653, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-edge
   rotate: false
-  xy: 1483, 819
+  xy: 903, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 8baf88c126..8ebda1d4ea 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png
index 9ae2f80be2..ed8ba296a8 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png
index 85dcc5d4b7..c24d5ccf03 100644
Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ
diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 62fee69f2c..8cf7c8c696 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -35,9 +35,9 @@ public class Blocks implements ContentList{
     public static Block
 
     //environment
-    air, part, spawn, deepwater, water, tar, stone, craters, charr, sand, ice, snow,
+    air, part, spawn, deepwater, water, tar, stone, craters, charr, sand, darksand, ice, snow,
     holostone, rocks, sporerocks, icerocks, cliffs, sporePine, pine, whiteTree, whiteTreeDead, sporeCluster,
-    iceSnow, sandWater, duneRocks, sandRocks, moss, sporeMoss, shale, shaleRocks, shaleBoulder, grass, salt,
+    iceSnow, sandWater, darksandWater, duneRocks, sandRocks, moss, sporeMoss, shale, shaleRocks, shaleBoulder, grass, salt,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks, rock, snowrock,
 
     //ores
@@ -72,7 +72,7 @@ public class Blocks implements ContentList{
     coreShard, coreFoundation, coreNucleus, vault, container, unloader, launchPad,
 
     //turrets
-    duo, scatter, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown,
+    duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown,
 
     //units
     spiritFactory, phantomFactory, wraithFactory, ghoulFactory, revenantFactory, daggerFactory, crawlerFactory, titanFactory,
@@ -172,11 +172,27 @@ public class Blocks implements ContentList{
             cacheLayer = CacheLayer.water;
         }};
 
+        darksandWater = new Floor("darksand-water"){{
+            liquidColor = Color.valueOf("596ab8");
+            speedMultiplier = 0.8f;
+            variants = 0;
+            status = StatusEffects.wet;
+            statusDuration = 50f;
+            liquidDrop = Liquids.water;
+            isLiquid = true;
+            cacheLayer = CacheLayer.water;
+        }};
+
         sand = new Floor("sand"){{
             itemDrop = Items.sand;
             playerUnmineable = true;
         }};
 
+        darksand = new Floor("darksand"){{
+            itemDrop = Items.sand;
+            playerUnmineable = true;
+        }};
+
         holostone = new Floor("holostone"){{
             edgeStyle = "blocky";
         }};
@@ -1101,8 +1117,23 @@ public class Blocks implements ContentList{
             health = 260*size*size;
         }};
 
+        scorch = new ItemTurret("scorch"){{
+            requirements(Category.turret, ItemStack.with(Items.copper, 50, Items.graphite, 45));
+            ammo(
+                Items.coal, Bullets.basicFlame,
+                Items.pyratite, Bullets.pyraFlame
+            );
+            recoil = 0f;
+            reload = 4f;
+            range = 53f;
+            shootCone = 50f;
+            targetAir = false;
+            ammoUseEffect = Fx.none;
+            health = 400;
+        }};
+
         hail = new ArtilleryTurret("hail"){{
-            requirements(Category.turret, ItemStack.with(Items.copper, 60, Items.graphite, 35));
+            requirements(Category.turret, ItemStack.with(Items.copper, 80, Items.graphite, 35));
             ammo(
                 Items.graphite, Bullets.artilleryDense,
                 Items.silicon, Bullets.artilleryHoming,
@@ -1169,7 +1200,7 @@ public class Blocks implements ContentList{
         arc = new PowerTurret("arc"){{
             requirements(Category.turret, ItemStack.with(Items.copper, 70, Items.lead, 70));
             shootType = Bullets.arc;
-            reload = 20f;
+            reload = 25f;
             shootCone = 40f;
             rotatespeed = 8f;
             powerUsed = 1f / 2f;
diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java
index 1dec6813d2..b490c3cd03 100644
--- a/core/src/io/anuke/mindustry/content/Bullets.java
+++ b/core/src/io/anuke/mindustry/content/Bullets.java
@@ -46,7 +46,7 @@ public class Bullets implements ContentList{
     waterShot, cryoShot, slagShot, oilShot,
 
     //environment, misc.
-    fireball, basicFlame, fuseShot, driverBolt, healBullet, frag, eruptorShot,
+    fireball, basicFlame, pyraFlame, fuseShot, driverBolt, healBullet, frag, eruptorShot,
 
     //bombs
     bombExplosive, bombIncendiary, bombOil, explode;
@@ -454,10 +454,11 @@ public class Bullets implements ContentList{
             }
         };
 
-        basicFlame = new BulletType(2.3f, 5){
+        basicFlame = new BulletType(2.5f, 5){
             {
+                ammoMultiplier = 3f;
                 hitSize = 7f;
-                lifetime = 35f;
+                lifetime = 40f;
                 pierce = true;
                 drag = 0.05f;
                 statusDuration = 60f * 4;
@@ -472,6 +473,25 @@ public class Bullets implements ContentList{
             }
         };
 
+        pyraFlame = new BulletType(2.7f, 8){
+            {
+                ammoMultiplier = 4f;
+                hitSize = 7f;
+                lifetime = 40f;
+                pierce = true;
+                drag = 0.05f;
+                statusDuration = 60f * 6;
+                shootEffect = Fx.shootPyraFlame;
+                hitEffect = Fx.hitFlameSmall;
+                despawnEffect = Fx.none;
+                status = StatusEffects.burning;
+            }
+
+            @Override
+            public void draw(Bullet b){
+            }
+        };
+
         lancerLaser = new BulletType(0.001f, 140){
             Color[] colors = {Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.WHITE};
             float[] tscales = {1f, 0.7f, 0.5f, 0.2f};
@@ -644,7 +664,7 @@ public class Bullets implements ContentList{
             }
         };
 
-        arc = new BulletType(0.001f, 20){{
+        arc = new BulletType(0.001f, 21){{
                 lifetime = 1;
                 despawnEffect = Fx.none;
                 hitEffect = Fx.hitLancer;
@@ -655,7 +675,7 @@ public class Bullets implements ContentList{
 
             @Override
             public void init(Bullet b){
-                Lightning.create(b.getTeam(), Pal.lancerLaser, damage, b.x, b.y, b.rot(), 14);
+                Lightning.create(b.getTeam(), Pal.lancerLaser, damage, b.x, b.y, b.rot(), 15);
             }
         };
 
diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java
index d99024d745..bbb795471e 100644
--- a/core/src/io/anuke/mindustry/content/Fx.java
+++ b/core/src/io/anuke/mindustry/content/Fx.java
@@ -32,7 +32,7 @@ public class Fx implements ContentList{
     plasticExplosion, artilleryTrail, incendTrail, missileTrail, absorb, flakExplosionBig, plasticExplosionFlak, burning, fire,
     fireSmoke, steam, fireballsmoke, ballfire, freezing, melting, wet, oily, overdriven, dropItem, shockwave,
     bigShockwave, nuclearShockwave, explosion, blockExplosion, blockExplosionSmoke, shootSmall, shootHeal, shootSmallSmoke, shootBig, shootBig2, shootBigSmoke,
-    shootBigSmoke2, shootSmallFlame, shootLiquid, shellEjectSmall, shellEjectMedium,
+    shootBigSmoke2, shootSmallFlame, shootPyraFlame, shootLiquid, shellEjectSmall, shellEjectMedium,
     shellEjectBig, lancerLaserShoot, lancerLaserShootSmoke, lancerLaserCharge, lancerLaserChargeBegin, lightningCharge, lightningShoot,
     unitSpawn, spawnShockwave, magmasmoke, impactShockwave, impactcloud, impactsmoke, dynamicExplosion;
 
@@ -221,7 +221,7 @@ public class Fx implements ContentList{
             Draw.color(Pal.lightFlame, Pal.darkFlame, e.fin());
             Lines.stroke(0.5f + e.fout());
 
-            Angles.randLenVectors(e.id, 5, e.fin() * 15f, e.rotation, 50f, (x, y) -> {
+            Angles.randLenVectors(e.id, 2, e.fin() * 15f, e.rotation, 50f, (x, y) -> {
                 float ang = Mathf.angle(x, y);
                 Lines.lineAngle(e.x + x, e.y + y, ang, e.fout() * 3 + 1f);
             });
@@ -736,6 +736,16 @@ public class Fx implements ContentList{
             Draw.reset();
         });
 
+        shootPyraFlame = new Effect(33f, e -> {
+            Draw.color(Pal.lightPyraFlame, Pal.darkPyraFlame, Color.GRAY, e.fin());
+
+            Angles.randLenVectors(e.id, 10, e.finpow() * 50f, e.rotation, 10f, (x, y) -> {
+                Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.6f);
+            });
+
+            Draw.reset();
+        });
+
         shootLiquid = new Effect(40f, e -> {
             Draw.color(e.color, Color.WHITE, e.fout() / 6f + Mathf.randomSeedRange(e.id, 0.1f));
 
diff --git a/core/src/io/anuke/mindustry/content/TechTree.java b/core/src/io/anuke/mindustry/content/TechTree.java
index 330cdc8114..9e888ac3a2 100644
--- a/core/src/io/anuke/mindustry/content/TechTree.java
+++ b/core/src/io/anuke/mindustry/content/TechTree.java
@@ -64,22 +64,26 @@ public class TechTree implements ContentList{
                     });
                 });
 
-                node(arc, () -> {
-                    node(wave, () -> {
-
-                    });
-
-                    node(lancer, () -> {
-                        node(meltdown, () -> {
+                node(scorch, () -> {
+                    node(arc, () -> {
+                        node(wave, () -> {
 
                         });
 
-                        node(shockMine, () -> {
+                        node(lancer, () -> {
+                            node(meltdown, () -> {
 
+                            });
+
+                            node(shockMine, () -> {
+
+                            });
                         });
                     });
                 });
 
+
+
                 node(copperWall, () -> {
                     node(copperWallLarge);
                     node(titaniumWall, () -> {
diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java
index 665d111c4f..b5299f2901 100644
--- a/core/src/io/anuke/mindustry/editor/EditorTool.java
+++ b/core/src/io/anuke/mindustry/editor/EditorTool.java
@@ -110,6 +110,8 @@ public enum EditorTool{
                 return;
             }
 
+            boolean alt = isAlt();
+
             int width = editor.width();
             int height = editor.height();
 
@@ -117,7 +119,13 @@ public enum EditorTool{
                 Tile write = editor.tile(px, py);
 
                 if(isfloor){
-                    write.setFloor((Floor)draw);
+                    if(alt && !(draw instanceof OreBlock)){
+                        Block ore = write.ore();
+                        write.setFloor((Floor)draw);
+                        write.setOre(ore);
+                    }else{
+                        write.setFloor((Floor)draw);
+                    }
                 }else{
                     write.setBlock(draw);
                 }
diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
index a662e4d6fd..fe24a20590 100644
--- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
@@ -84,7 +84,7 @@ public class MapGenerateDialog extends FloatingDialog{
                 add(new Image("icon-refresh"){{
                     setScaling(Scaling.none);
                 }});
-                visible(() -> generating);
+                visible(() -> generating && !updateEditorOnChange);
             }}).size(mobile ? 300f : 400f).padRight(6);
             t.pane(p -> filterTable = p).width(300f).get().setScrollingDisabled(true, false);
         }).grow();
diff --git a/core/src/io/anuke/mindustry/editor/generation/RiverNoiseFilter.java b/core/src/io/anuke/mindustry/editor/generation/RiverNoiseFilter.java
index 2920ee7ad3..629822dc8f 100644
--- a/core/src/io/anuke/mindustry/editor/generation/RiverNoiseFilter.java
+++ b/core/src/io/anuke/mindustry/editor/generation/RiverNoiseFilter.java
@@ -6,16 +6,18 @@ import io.anuke.mindustry.editor.generation.FilterOption.SliderOption;
 import io.anuke.mindustry.world.Block;
 
 import static io.anuke.mindustry.editor.generation.FilterOption.floorsOnly;
+import static io.anuke.mindustry.editor.generation.FilterOption.wallsOnly;
 
 public class RiverNoiseFilter extends GenerateFilter{
     float scl = 40, threshold = 0f, threshold2 = 0.1f;
-    Block floor = Blocks.water, floor2 = Blocks.deepwater;
+    Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandRocks;
 
     {
         options(
             new SliderOption("scale", () -> scl, f -> scl = f, 1f, 500f),
             new SliderOption("threshold", () -> threshold, f -> threshold = f, 0f, 1f),
             new SliderOption("threshold2", () -> threshold2, f -> threshold2 = f, 0f, 1f),
+            new BlockOption("block", () -> block, b -> block = b, wallsOnly),
             new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
             new BlockOption("floor2", () -> floor2, b -> floor2 = b, floorsOnly)
         );
@@ -28,6 +30,10 @@ public class RiverNoiseFilter extends GenerateFilter{
         if(noise >= threshold){
             in.floor = floor;
 
+            if(in.srcblock.solid){
+                in.block = block;
+            }
+
             if(noise >= threshold2){
                 in.floor = floor2;
             }
diff --git a/core/src/io/anuke/mindustry/graphics/Pal.java b/core/src/io/anuke/mindustry/graphics/Pal.java
index 37de7b50b0..f7d7a45839 100644
--- a/core/src/io/anuke/mindustry/graphics/Pal.java
+++ b/core/src/io/anuke/mindustry/graphics/Pal.java
@@ -22,6 +22,9 @@ public class Pal{
     lightFlame = Color.valueOf("ffdd55"),
     darkFlame = Color.valueOf("db401c"),
 
+    lightPyraFlame = Color.valueOf("ffb855"),
+    darkPyraFlame = Color.valueOf("db661c"),
+
     turretHeat = Color.valueOf("ab3400"),
 
     lightOrange = Color.valueOf("f68021"),
diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java
index ff5fc523cb..da11552ffc 100644
--- a/core/src/io/anuke/mindustry/maps/Maps.java
+++ b/core/src/io/anuke/mindustry/maps/Maps.java
@@ -7,7 +7,6 @@ import io.anuke.arc.files.FileHandle;
 import io.anuke.arc.graphics.Texture;
 import io.anuke.arc.util.Disposable;
 import io.anuke.arc.util.Log;
-import io.anuke.arc.util.Time;
 import io.anuke.arc.util.serialization.Json;
 import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.io.MapIO;
@@ -65,7 +64,6 @@ public class Maps implements Disposable{
 
     /** Load all maps. Should be called at application start. */
     public void load(){
-        Time.mark();
         try{
             for(String name : defaultMapNames){
                 FileHandle file = Core.files.internal("maps/" + name + "." + mapExtension);
@@ -76,7 +74,11 @@ public class Maps implements Disposable{
         }
 
         loadCustomMaps();
-        Log.info("Time to load maps: {0}", Time.elapsed());
+    }
+
+    public void reload(){
+        dispose();
+        load();
     }
 
     /** Save a custom map to the directory. This updates all values and stored data necessary.
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
index fa55b6534d..b5f8c076e1 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -179,6 +179,8 @@ public class SettingsMenuDialog extends SettingsDialog{
         graphics.sliderPref("fpscap", 125, 5, 125, 5, s -> (s > 120 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s)));
 
         if(!mobile){
+            graphics.sliderPref("antialias", 0, 0, 5, 1, s -> (s == 0 ? 0 : (1 << s)) + "x");
+
             graphics.checkPref("vsync", true, b -> Core.graphics.setVSync(b));
             graphics.checkPref("fullscreen", false, b -> {
                 if(b){
diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
index 028218e723..3ebae9529f 100644
--- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
@@ -1,9 +1,13 @@
 package io.anuke.mindustry.desktop;
 
 import io.anuke.arc.ApplicationListener;
+import io.anuke.arc.Settings;
 import io.anuke.arc.backends.lwjgl3.Lwjgl3Application;
 import io.anuke.arc.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
+import io.anuke.arc.files.FileHandle;
+import io.anuke.arc.util.OS;
 import io.anuke.mindustry.Mindustry;
+import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.net.Net;
 import io.anuke.net.KryoClient;
@@ -24,6 +28,21 @@ public class DesktopLauncher extends Lwjgl3Application{
             config.setWindowedMode(960, 540);
             config.setWindowIcon("sprites/icon.png");
 
+            try{
+                Settings settings = new Settings(){
+                    @Override
+                    public FileHandle getDataDirectory(){
+                        return dataDirectory == null ? new FileHandle(OS.getAppDataDirectoryString(appName)) : dataDirectory;
+                    }
+                };
+                settings.setAppName(Vars.appName);
+                settings.loadValues();
+                int level = settings.getInt("antialias", 0);
+                config.setBackBufferConfig(8, 8, 8, 8, 0, 0, level == 0 ? 0 : 1 << level);
+            }catch(Throwable t){
+                t.printStackTrace();
+            }
+
             Platform.instance = new DesktopPlatform(arg);
 
             Net.setClientProvider(new KryoClient());
diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java
index 4fd507e487..b93eb19721 100644
--- a/server/src/io/anuke/mindustry/server/ServerControl.java
+++ b/server/src/io/anuke/mindustry/server/ServerControl.java
@@ -259,6 +259,16 @@ public class ServerControl implements ApplicationListener{
             info("&lyMap directory: &lb&fi{0}", customMapDirectory.file().getAbsoluteFile().toString());
         });
 
+        handler.register("reloadmaps", "Reload all maps from disk.", arg -> {
+            int beforeMaps = world.maps.all().size;
+            world.maps.reload();
+            if(world.maps.all().size > beforeMaps){
+                info("&lc{0}&ly new map(s) found and reloaded.", world.maps.all().size - beforeMaps);
+            }else{
+                info("&lyMaps reloaded.");
+            }
+        });
+
         handler.register("status", "Display server status.", arg -> {
             if(state.is(State.menu)){
                 info("Status: &rserver closed");