diff --git a/core/assets-raw/sprites/blocks/extra/block-border.png b/core/assets-raw/sprites/blocks/extra/block-border.png
deleted file mode 100644
index 58c5afd372..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/block-border.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/extra/block-elevation.png b/core/assets-raw/sprites/blocks/extra/block-elevation.png
deleted file mode 100644
index 6f47e65204..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/block-elevation.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/extra/block-slope.png b/core/assets-raw/sprites/blocks/extra/block-slope.png
deleted file mode 100644
index c37587f765..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/block-slope.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/extra/border.png b/core/assets-raw/sprites/blocks/extra/border.png
deleted file mode 100644
index 6d848e1b72..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/border.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/extra/cross-1.png b/core/assets-raw/sprites/blocks/extra/cross-1.png
deleted file mode 100644
index 1c3aa8ae22..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/cross-1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/extra/cross-2.png b/core/assets-raw/sprites/blocks/extra/cross-2.png
deleted file mode 100644
index 3aa3ceb32b..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/cross-2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/extra/cross-3.png b/core/assets-raw/sprites/blocks/extra/cross-3.png
deleted file mode 100644
index 9aacfbb93d..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/cross-3.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/extra/cross-4.png b/core/assets-raw/sprites/blocks/extra/cross-4.png
deleted file mode 100644
index a1247aeafb..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/cross-4.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/extra/place-arrow.png b/core/assets-raw/sprites/blocks/extra/place-arrow.png
index 84f4b22895..3e0ca09fa2 100644
Binary files a/core/assets-raw/sprites/blocks/extra/place-arrow.png and b/core/assets-raw/sprites/blocks/extra/place-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/ripples.png b/core/assets-raw/sprites/blocks/extra/ripples.png
deleted file mode 100644
index d416708543..0000000000
Binary files a/core/assets-raw/sprites/blocks/extra/ripples.png and /dev/null differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png b/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png
index 16c740ccc8..67945e5136 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png and b/core/assets-raw/sprites_replacement/blocks/distribution/bridge-conveyor.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png
index 4abf6073ff..ff6df3e056 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png
index ec3c29a0c6..fa1f9afc74 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png
index 25f23f0485..60fa9d61e2 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png
index f84ff6a2a0..1608ed2778 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-0-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png
index 68c8cb7b61..b76c6d0e5f 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png
index eca436b414..c342da9991 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png
index 8a098631e2..864bcefa12 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png
index 84f9208dd8..f955cd6db8 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png
index 48b9303786..f6bd1ce17e 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png
index f37b6be875..6a8275f3ae 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png
index 8a965a0832..3b5e4d9734 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png
index 90d4a04e30..2713f6321d 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-2-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png
index 3b9bb09cf3..f7a6f2dfa0 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png
index c45b469231..14a5f020b7 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png
index b72320d554..08b98f3d53 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png
index fd433ebf88..48207b5dcf 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-3-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png
index e1be31ca2f..3305e69a62 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png
index c0318792ce..b6dec4f7ac 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png
index be135a6fde..3e2b075222 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png
index be4ed6906f..eed9fba3c1 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/conveyor-4-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png
index f489295410..ac78355581 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png
index 68e0474795..1331de9dd9 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png
index 32cfc46a76..1fca1f793d 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png
index 9742fa6695..12cc96ef97 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-0-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png
index fccde31844..850e8687c4 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png
index f7fa4205c0..a7943dfd58 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png
index 034adabc93..f2360852da 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png
index 5cd7058f56..2980ed5cc3 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png
index 8343e3d016..3a4312276b 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png
index 94e4e48e7d..d9b9fce4d1 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png
index dcdaebb83f..c77efd6f38 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png
index c331490047..0ed5e610b8 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-2-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png
index f05d095c1e..10709043f3 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png
index 2952309d62..e2f5df5012 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png
index 06a38a8841..7a0a11ea0d 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png
index 75d020aa87..86091c1353 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-3-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png
index 046e25d1d1..05d90595f5 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png
index 7047392014..f2745070fa 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png
index ed21a2672d..f558f7624f 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-2.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png
index 75a2d13c85..1772ed5367 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png and b/core/assets-raw/sprites_replacement/blocks/distribution/conveyors/titanium-conveyor-4-3.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/distribution/junction.png b/core/assets-raw/sprites_replacement/blocks/distribution/junction.png
index b2fe3d6598..57bb1d8a37 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/distribution/junction.png and b/core/assets-raw/sprites_replacement/blocks/distribution/junction.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png
index c14653a784..d0e99c4c29 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png and b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png
index ec9fdf7a71..0ad3bd7e5c 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png and b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png
index 105117b67d..14e9ef0b4c 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png and b/core/assets-raw/sprites_replacement/blocks/liquid/conduit-top-5.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png
index 835e8789cc..26ad588573 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png and b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-0.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png
index 94bedc96a3..b4b373dd2a 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png and b/core/assets-raw/sprites_replacement/blocks/liquid/pulse-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png b/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png
index 5ea1a7458e..3762ccccdd 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png and b/core/assets-raw/sprites_replacement/blocks/power/power-node-large.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/power/power-node.png b/core/assets-raw/sprites_replacement/blocks/power/power-node.png
index d5e6cd0c84..1fc40b0717 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/power/power-node.png and b/core/assets-raw/sprites_replacement/blocks/power/power-node.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png b/core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png
index 39e40cd2d7..0467ce528c 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png and b/core/assets-raw/sprites_replacement/blocks/power/powerinfinite.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/power/powervoid.png b/core/assets-raw/sprites_replacement/blocks/power/powervoid.png
index 5b833b9795..1716fbe6eb 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/power/powervoid.png and b/core/assets-raw/sprites_replacement/blocks/power/powervoid.png differ
diff --git a/core/assets-raw/sprites_replacement/shapes/circle.png b/core/assets-raw/sprites_replacement/shapes/circle.png
index 1a6b7a339d..adbc5620d0 100644
Binary files a/core/assets-raw/sprites_replacement/shapes/circle.png and b/core/assets-raw/sprites_replacement/shapes/circle.png differ
diff --git a/core/assets-raw/sprites_replacement/shapes/shape-3.png b/core/assets-raw/sprites_replacement/shapes/shape-3.png
index b73e07e93d..a1b87e1529 100644
Binary files a/core/assets-raw/sprites_replacement/shapes/shape-3.png and b/core/assets-raw/sprites_replacement/shapes/shape-3.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 9589dfe8c6..f106381151 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -14,7 +14,14 @@ screenshot = Screenshot saved to {0}
 gameover = Game Over
 gameover.pvp = The[accent] {0}[] team is victorious!
 highscore = [accent]New highscore!
-wave.lasted = You lasted until wave [accent]{0}[].
+
+stat.wave = Waves Defeated:[accent] {0}
+stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
+stat.built = Buildings Built:[accent] {0}
+stat.destroyed = Buildings Destroyed:[accent] {0}
+stat.deconstructed = Buildings Deconstructed:[accent] {0}
+stat.delivered = Resources Launched:
+
 level.highscore = High Score: [accent]{0}
 level.delete.title = Confirm Delete
 map.delete = Are you sure you want to delete the map "[accent]{0}[]"?
@@ -675,7 +682,7 @@ block.cyclone.description = A large rapid fire turret.
 block.fuse.description = A large turret which shoots powerful short-range beams.
 block.spectre.description = A large turret which shoots two powerful bullets at once.
 block.meltdown.description = A large turret which shoots powerful long-range beams.
-block.conveyor.description = Basic item transport block. Moved items forward and automatically deposits them into turrets or crafters. Rotatable.
+block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into turrets or crafters. Rotatable.
 block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
 block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
 block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 4f084db2e1..326af1e563 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -6,462 +6,462 @@ filter: Nearest,Nearest
 repeat: none
 force-projector-top
   rotate: false
-  xy: 261, 753
+  xy: 359, 949
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mend-projector-top
   rotate: false
-  xy: 851, 1719
+  xy: 1914, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 overdrive-projector-top
   rotate: false
-  xy: 917, 1785
+  xy: 1914, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1019, 1362
+  xy: 1659, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1043, 1396
+  xy: 1693, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1053, 1362
+  xy: 1727, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1409, 1763
+  xy: 921, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1409, 1729
+  xy: 947, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1443, 1767
+  xy: 955, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1477, 1767
+  xy: 981, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1443, 1733
+  xy: 989, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1511, 1767
+  xy: 1015, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1477, 1733
+  xy: 1023, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1545, 1767
+  xy: 1049, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1511, 1733
+  xy: 1057, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1579, 1767
+  xy: 1083, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1545, 1733
+  xy: 1091, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1613, 1767
+  xy: 1117, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1579, 1733
+  xy: 1125, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1647, 1767
+  xy: 1151, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1613, 1733
+  xy: 1159, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1681, 1767
+  xy: 1185, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1647, 1733
+  xy: 1193, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1715, 1767
+  xy: 1219, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1681, 1733
+  xy: 1227, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1749, 1767
+  xy: 1253, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1077, 1425
+  xy: 1695, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1111, 1425
+  xy: 1729, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1087, 1391
+  xy: 1763, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1087, 1357
+  xy: 1797, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1121, 1391
+  xy: 1831, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1121, 1357
+  xy: 1865, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 687, 373
+  xy: 1899, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 687, 339
+  xy: 1933, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 721, 381
+  xy: 1967, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 721, 347
+  xy: 2001, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 755, 381
+  xy: 779, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 789, 382
+  xy: 813, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 823, 383
+  xy: 847, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 755, 347
+  xy: 881, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 789, 348
+  xy: 915, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 823, 349
+  xy: 949, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 705, 305
+  xy: 983, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 705, 271
+  xy: 1017, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 705, 237
+  xy: 1051, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 705, 203
+  xy: 1085, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 263, 118
+  xy: 679, 972
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mass-driver-turret
   rotate: false
-  xy: 261, 459
+  xy: 457, 753
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1861, 1665
+  xy: 807, 841
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1895, 1665
+  xy: 807, 807
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1929, 1681
+  xy: 807, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 warp-gate
   rotate: false
-  xy: 555, 1243
+  xy: 327, 263
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 warp-gate-top
   rotate: false
-  xy: 555, 1145
+  xy: 425, 361
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 blast-drill
   rotate: false
-  xy: 131, 50
+  xy: 131, 180
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 blast-drill-rim
   rotate: false
-  xy: 261, 1733
+  xy: 131, 82
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 blast-drill-rotator
   rotate: false
-  xy: 261, 1635
+  xy: 261, 1733
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 blast-drill-top
   rotate: false
-  xy: 359, 1733
+  xy: 261, 1635
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 laser-drill
   rotate: false
-  xy: 719, 1653
+  xy: 1716, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 laser-drill-rotator
   rotate: false
-  xy: 785, 1719
+  xy: 1716, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 laser-drill-top
   rotate: false
-  xy: 851, 1785
+  xy: 1782, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill
   rotate: false
-  xy: 653, 1521
+  xy: 1782, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill-rotator
   rotate: false
-  xy: 719, 1587
+  xy: 1848, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill-top
   rotate: false
-  xy: 785, 1653
+  xy: 1848, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 oil-extractor
   rotate: false
-  xy: 359, 557
+  xy: 457, 655
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-liquid
   rotate: false
-  xy: 457, 655
+  xy: 261, 557
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-rotator
   rotate: false
-  xy: 359, 459
+  xy: 359, 557
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -475,1400 +475,1337 @@ oil-extractor-top
   index: -1
 plasma-drill
   rotate: false
-  xy: 131, 1368
+  xy: 131, 1498
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 plasma-drill-rim
   rotate: false
-  xy: 131, 1238
+  xy: 131, 1368
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 plasma-drill-rotator
   rotate: false
-  xy: 131, 1108
+  xy: 131, 1238
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 plasma-drill-top
   rotate: false
-  xy: 131, 978
+  xy: 131, 1108
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 pneumatic-drill
   rotate: false
-  xy: 653, 1389
+  xy: 539, 445
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-rotator
   rotate: false
-  xy: 719, 1455
+  xy: 523, 379
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-top
   rotate: false
-  xy: 785, 1521
+  xy: 605, 445
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor
   rotate: false
-  xy: 1049, 1653
+  xy: 621, 1579
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 1115, 1719
+  xy: 819, 1777
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 1181, 1785
+  xy: 753, 1711
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 653, 1191
+  xy: 687, 1645
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 blackrock1
   rotate: false
-  xy: 279, 425
+  xy: 253, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-blackrock
   rotate: false
-  xy: 279, 425
+  xy: 253, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blackstone1
   rotate: false
-  xy: 279, 391
+  xy: 253, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-blackstone
   rotate: false
-  xy: 279, 391
+  xy: 253, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blackstone2
   rotate: false
-  xy: 313, 425
+  xy: 287, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 279, 357
+  xy: 287, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blackstoneedge
   rotate: false
-  xy: 1667, 1801
+  xy: 621, 630
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 1049, 1561
+  xy: 1761, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 1048, 1527
+  xy: 1795, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 1141, 1559
+  xy: 1819, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 1715, 1733
+  xy: 1261, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 1783, 1767
+  xy: 1287, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 1749, 1733
+  xy: 1295, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 1885, 1733
+  xy: 1423, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 1919, 1733
+  xy: 1431, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirtedge
   rotate: false
-  xy: 629, 891
+  xy: 1085, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 generic-cliff-edge
   rotate: false
-  xy: 1351, 1691
+  xy: 1567, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 1351, 1691
+  xy: 1567, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 1385, 1695
+  xy: 1593, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 1385, 1695
+  xy: 1593, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 generic-cliff-edge-2
   rotate: false
-  xy: 1419, 1695
+  xy: 1601, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 1419, 1695
+  xy: 1601, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 generic-cliff-side
   rotate: false
-  xy: 1453, 1699
+  xy: 1627, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 1453, 1699
+  xy: 1627, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 1487, 1699
+  xy: 1635, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 1521, 1699
+  xy: 1661, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 629, 691
+  xy: 1185, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 1725, 1699
+  xy: 1763, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 1759, 1699
+  xy: 1771, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 iceedge
   rotate: false
-  xy: 621, 591
+  xy: 1235, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 1793, 1699
+  xy: 1797, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 263, 84
+  xy: 675, 938
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lavaedge
   rotate: false
-  xy: 679, 1091
+  xy: 1335, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 331, 323
+  xy: 671, 870
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 297, 289
+  xy: 671, 836
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 365, 323
+  xy: 671, 802
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 297, 187
+  xy: 671, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 331, 221
+  xy: 671, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 365, 255
+  xy: 671, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 399, 289
+  xy: 709, 938
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 467, 323
+  xy: 709, 904
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalflooredge
   rotate: false
-  xy: 679, 891
+  xy: 1435, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 619, 339
+  xy: 831, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 653, 373
+  xy: 831, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 637, 305
+  xy: 831, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 637, 271
+  xy: 831, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandedge
   rotate: false
-  xy: 679, 841
+  xy: 1435, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 671, 135
+  xy: 457, 27
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 671, 101
+  xy: 754, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowedge
   rotate: false
-  xy: 679, 741
+  xy: 1485, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 679, 691
+  xy: 1535, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 1793, 1631
+  xy: 1219, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 1827, 1631
+  xy: 1253, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 1861, 1631
+  xy: 1287, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 1895, 1631
+  xy: 1321, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 1725, 1631
+  xy: 1151, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1759, 1631
+  xy: 1185, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stoneedge
   rotate: false
-  xy: 671, 591
+  xy: 1585, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 taredge
   rotate: false
-  xy: 671, 491
+  xy: 1635, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 823, 417
+  xy: 1491, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1075, 1493
+  xy: 1525, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1082, 1527
+  xy: 1559, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1109, 1493
+  xy: 1593, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1075, 1459
+  xy: 1627, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1109, 1459
+  xy: 1661, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 705, 135
+  xy: 1153, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 705, 101
+  xy: 1187, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 705, 67
+  xy: 1221, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 705, 33
+  xy: 1255, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 729, 991
+  xy: 1735, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-block-border
-  rotate: false
-  xy: 381, 391
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-elevation
-  rotate: false
-  xy: 415, 425
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 block-middle
   rotate: false
-  xy: 2014, 1957
+  xy: 1523, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 2014, 1957
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-block-slope
-  rotate: false
-  xy: 2014, 1923
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-border
-  rotate: false
-  xy: 2014, 1889
+  xy: 1523, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 767, 719
+  xy: 1931, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-cross-1
-  rotate: false
-  xy: 1817, 1767
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-cross-2
-  rotate: false
-  xy: 1320, 1851
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-cross-3
-  rotate: false
-  xy: 359, 949
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-cross-4
-  rotate: false
-  xy: 1, 978
-  size: 128, 128
-  orig: 128, 128
-  offset: 0, 0
-  index: -1
 place-arrow
   rotate: false
-  xy: 1963, 1681
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ripples
-  rotate: false
-  xy: 729, 949
-  size: 40, 40
-  orig: 40, 40
+  xy: 245, 459
+  size: 96, 96
+  orig: 96, 96
   offset: 0, 0
   index: -1
 rubble-1-0
   rotate: false
-  xy: 983, 1719
+  xy: 631, 313
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rubble-1-1
   rotate: false
-  xy: 1049, 1785
+  xy: 655, 379
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rubble-2-0
   rotate: false
-  xy: 653, 1323
+  xy: 697, 313
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rubble-2-1
   rotate: false
-  xy: 719, 1389
+  xy: 565, 247
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rubble-3-0
   rotate: false
-  xy: 555, 1635
+  xy: 229, 361
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 rubble-3-1
   rotate: false
-  xy: 555, 1635
+  xy: 229, 361
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 917, 1363
+  xy: 1557, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 917, 1363
+  xy: 1557, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 951, 1362
+  xy: 1591, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 985, 1362
+  xy: 1625, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 785, 1231
+  xy: 1965, 1687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 877, 1229
+  xy: 1999, 1687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 771, 923
+  xy: 1897, 1662
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 767, 889
+  xy: 1863, 1653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 767, 855
+  xy: 1931, 1653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 767, 821
+  xy: 1965, 1653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 767, 787
+  xy: 1999, 1653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 767, 753
+  xy: 1897, 1628
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 2014, 1855
+  xy: 1965, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 2001, 1821
+  xy: 1999, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 2001, 1787
+  xy: 879, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1273, 1725
+  xy: 887, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1307, 1725
+  xy: 687, 1487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1341, 1725
+  xy: 686, 1453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1375, 1729
+  xy: 913, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 399, 323
+  xy: 671, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 297, 221
+  xy: 671, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 331, 255
+  xy: 671, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-tank-bottom
   rotate: false
-  xy: 261, 557
+  xy: 359, 753
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-tank-liquid
   rotate: false
-  xy: 359, 655
+  xy: 457, 851
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-tank-top
   rotate: false
-  xy: 457, 753
+  xy: 359, 655
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1759, 1665
+  xy: 797, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1793, 1665
+  xy: 797, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1827, 1665
+  xy: 807, 875
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1997, 1647
+  xy: 807, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 801, 889
+  xy: 807, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 801, 855
+  xy: 807, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 801, 821
+  xy: 807, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 801, 787
+  xy: 807, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 801, 753
+  xy: 807, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 801, 719
+  xy: 823, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alpha-mech-pad
   rotate: false
-  xy: 555, 569
+  xy: 956, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-alpha-mech-pad
   rotate: false
-  xy: 555, 569
+  xy: 956, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 245, 356
+  xy: 219, 14
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-battery
   rotate: false
-  xy: 245, 356
+  xy: 219, 14
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-large
   rotate: false
-  xy: 131, 148
+  xy: 131, 278
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-battery-large
   rotate: false
-  xy: 131, 148
+  xy: 131, 278
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1239, 1751
+  xy: 1853, 1721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 fusion-reactor
   rotate: false
-  xy: 1, 848
+  xy: 1, 978
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 fusion-reactor-bottom
   rotate: false
-  xy: 1, 718
+  xy: 1, 848
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 fusion-reactor-light
   rotate: false
-  xy: 1, 588
+  xy: 1, 718
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 fusion-reactor-plasma-0
   rotate: false
-  xy: 1, 458
+  xy: 1, 588
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 fusion-reactor-plasma-1
   rotate: false
-  xy: 1, 328
+  xy: 1, 458
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 fusion-reactor-plasma-2
   rotate: false
-  xy: 1, 198
+  xy: 1, 328
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 fusion-reactor-plasma-3
   rotate: false
-  xy: 1, 68
+  xy: 1, 198
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 fusion-reactor-top
   rotate: false
-  xy: 464, 1831
+  xy: 1, 68
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 1997, 1681
+  xy: 807, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large
   rotate: false
-  xy: 851, 1587
+  xy: 589, 379
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 1929, 1647
+  xy: 807, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 1963, 1647
+  xy: 807, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 653, 339
+  xy: 831, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-reactor-center
   rotate: false
-  xy: 555, 1537
+  xy: 229, 263
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-lights
   rotate: false
-  xy: 555, 1439
+  xy: 327, 361
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 turbine-generator-top
   rotate: false
-  xy: 851, 1455
+  xy: 621, 1645
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 alloy-smelter
   rotate: false
-  xy: 131, 246
+  xy: 131, 376
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-alloy-smelter
   rotate: false
-  xy: 131, 246
+  xy: 131, 376
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 alloy-smelter-top
   rotate: false
-  xy: 555, 635
+  xy: 890, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 arc-smelter
   rotate: false
-  xy: 555, 503
+  xy: 1022, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 arc-smelter-top
   rotate: false
-  xy: 668, 1983
+  xy: 1088, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 silicon-smelter-top
   rotate: false
-  xy: 668, 1983
+  xy: 1088, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 biomattercompressor
   rotate: false
-  xy: 734, 1983
+  xy: 1154, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 biomattercompressor-frame0
   rotate: false
-  xy: 800, 1983
+  xy: 1220, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 biomattercompressor-frame1
   rotate: false
-  xy: 866, 1983
+  xy: 1286, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 biomattercompressor-frame2
   rotate: false
-  xy: 932, 1983
+  xy: 1352, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 biomattercompressor-liquid
   rotate: false
-  xy: 998, 1983
+  xy: 1418, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 biomattercompressor-top
   rotate: false
-  xy: 1064, 1983
+  xy: 1484, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 blast-mixer
   rotate: false
-  xy: 1130, 1983
+  xy: 1550, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-blast-mixer
   rotate: false
-  xy: 1130, 1983
+  xy: 1550, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 centrifuge
   rotate: false
-  xy: 1122, 1851
+  xy: 1056, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 centrifuge-liquid
   rotate: false
-  xy: 1188, 1851
+  xy: 1122, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 1386, 1851
+  xy: 1188, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 1452, 1851
+  xy: 1188, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 1518, 1851
+  xy: 1254, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 1584, 1851
+  xy: 1254, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 1650, 1851
+  xy: 1320, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 1716, 1851
+  xy: 1320, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 lavasmelter
   rotate: false
-  xy: 297, 323
+  xy: 675, 904
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 433, 289
+  xy: 705, 734
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-weaver
   rotate: false
-  xy: 785, 1587
+  xy: 303, 99
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-bottom
   rotate: false
-  xy: 851, 1653
+  xy: 401, 197
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-weave
   rotate: false
-  xy: 917, 1719
+  xy: 499, 295
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-compressor-top
   rotate: false
-  xy: 983, 1785
+  xy: 555, 511
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 621, 407
+  xy: 823, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 655, 407
+  xy: 831, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 671, 237
+  xy: 423, 27
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 671, 169
+  xy: 457, 61
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 1521, 1631
+  xy: 947, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-open
   rotate: false
-  xy: 457, 1145
+  xy: 359, 1047
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 core-top
   rotate: false
-  xy: 261, 851
+  xy: 457, 1145
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 sortedunloader
   rotate: false
-  xy: 1555, 1631
+  xy: 981, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 381, 425
+  xy: 1899, 1730
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 347, 357
+  xy: 1933, 1721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-2
   rotate: false
-  xy: 1196, 1983
+  xy: 1616, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-2-top
   rotate: false
-  xy: 1262, 1983
+  xy: 1682, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-3
   rotate: false
-  xy: 261, 1537
+  xy: 359, 1733
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-3-top
   rotate: false
-  xy: 359, 1635
+  xy: 261, 1537
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -1889,385 +1826,385 @@ block-4-top
   index: -1
 arc
   rotate: false
-  xy: 245, 424
+  xy: 2012, 1989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 arc-heat
   rotate: false
-  xy: 245, 390
+  xy: 219, 48
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cyclone
   rotate: false
-  xy: 457, 1047
+  xy: 261, 851
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 duo
   rotate: false
-  xy: 1283, 1691
+  xy: 1533, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 fuse
   rotate: false
-  xy: 359, 753
+  xy: 457, 949
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 hail
   rotate: false
-  xy: 1691, 1699
+  xy: 1737, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail-heat
   rotate: false
-  xy: 87, 26
+  xy: 1785, 1809
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 lancer
   rotate: false
-  xy: 785, 1785
+  xy: 1650, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 653, 1587
+  xy: 1650, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 meltdown
   rotate: false
-  xy: 131, 1628
+  xy: 464, 1831
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 meltdown-heat
   rotate: false
-  xy: 131, 1498
+  xy: 131, 1628
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 ripple
   rotate: false
-  xy: 457, 459
+  xy: 343, 459
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 ripple-heat
   rotate: false
-  xy: 555, 1733
+  xy: 441, 459
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 salvo
   rotate: false
-  xy: 785, 1455
+  xy: 631, 247
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 salvo-heat
   rotate: false
-  xy: 851, 1521
+  xy: 697, 247
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 salvo-panel-left
   rotate: false
-  xy: 917, 1587
+  xy: 499, 229
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 salvo-panel-right
   rotate: false
-  xy: 983, 1653
+  xy: 565, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scatter
   rotate: false
-  xy: 637, 101
+  xy: 389, 95
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 637, 67
+  xy: 389, 61
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 637, 33
+  xy: 423, 95
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spectre
   rotate: false
-  xy: 131, 458
+  xy: 131, 588
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 swarmer
   rotate: false
-  xy: 653, 1257
+  xy: 621, 1777
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 719, 1257
+  xy: 621, 1513
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 785, 1323
+  xy: 819, 1711
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 command-center
   rotate: false
-  xy: 1254, 1851
+  xy: 1122, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dagger-factory-top
   rotate: false
-  xy: 1782, 1851
+  xy: 1386, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dagger-factory-top-open
   rotate: false
-  xy: 1848, 1851
+  xy: 1386, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 fortress-factory
   rotate: false
-  xy: 359, 851
+  xy: 457, 1047
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 fortress-factory-top
   rotate: false
-  xy: 457, 949
+  xy: 261, 753
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 ghoul-factory-top
   rotate: false
-  xy: 457, 949
+  xy: 261, 753
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 titan-factory-top
   rotate: false
-  xy: 457, 949
+  xy: 261, 753
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 fortress-factory-top-open
   rotate: false
-  xy: 261, 655
+  xy: 359, 851
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 ghoul-factory-top-open
   rotate: false
-  xy: 261, 655
+  xy: 359, 851
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 titan-factory-top-open
   rotate: false
-  xy: 261, 655
+  xy: 359, 851
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 ghoul-factory
   rotate: false
-  xy: 457, 851
+  xy: 261, 655
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 phantom-factory-top
   rotate: false
-  xy: 653, 1455
+  xy: 1980, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phantom-factory-top-open
   rotate: false
-  xy: 719, 1521
+  xy: 1980, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 reconstructor-open
   rotate: false
-  xy: 917, 1653
+  xy: 565, 313
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 repair-point-turret
   rotate: false
-  xy: 619, 373
+  xy: 831, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 revenant-factory
   rotate: false
-  xy: 131, 848
+  xy: 131, 978
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 revenant-factory-top
   rotate: false
-  xy: 131, 718
+  xy: 131, 848
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 revenant-factory-top-open
   rotate: false
-  xy: 131, 588
+  xy: 131, 718
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 spirit-factory-top
   rotate: false
-  xy: 1049, 1719
+  xy: 631, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spirit-factory-top-open
   rotate: false
-  xy: 1115, 1785
+  xy: 697, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-factory
   rotate: false
-  xy: 555, 1341
+  xy: 229, 165
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 wraith-factory-top
   rotate: false
-  xy: 851, 1389
+  xy: 753, 1645
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wraith-factory-top-open
   rotate: false
-  xy: 917, 1455
+  xy: 687, 1579
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 1851, 1733
+  xy: 1389, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deflector-wall-large
   rotate: false
-  xy: 1914, 1851
+  xy: 1452, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dense-alloy-wall
   rotate: false
-  xy: 1919, 1767
+  xy: 1397, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dense-alloy-wall-large
   rotate: false
-  xy: 653, 1785
+  xy: 1452, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-large-open
   rotate: false
-  xy: 653, 1719
+  xy: 1518, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 1249, 1691
+  xy: 1525, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 beam
   rotate: false
-  xy: 777, 1207
+  xy: 799, 1037
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 beam-end
   rotate: false
-  xy: 555, 1071
+  xy: 229, 91
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
@@ -2281,504 +2218,504 @@ bullet
   index: -1
 bullet-back
   rotate: false
-  xy: 1363, 1797
+  xy: 621, 930
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 casing
   rotate: false
-  xy: 2039, 1727
+  xy: 841, 1459
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
   index: -1
 command-attack
   rotate: false
-  xy: 1273, 1759
+  xy: 1829, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 command-idle
   rotate: false
-  xy: 1307, 1759
+  xy: 1863, 1687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 command-patrol
   rotate: false
-  xy: 1341, 1759
+  xy: 1897, 1696
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 command-retreat
   rotate: false
-  xy: 1375, 1763
+  xy: 1931, 1687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 enemyarrow
   rotate: false
-  xy: 767, 689
+  xy: 321, 1
   size: 32, 28
   orig: 32, 28
   offset: 0, 0
   index: -1
 error
   rotate: false
-  xy: 629, 841
+  xy: 1085, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 laser
   rotate: false
-  xy: 799, 177
+  xy: 841, 1409
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 laser-end
   rotate: false
-  xy: 555, 923
+  xy: 425, 287
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 laserfull
   rotate: false
-  xy: 555, 849
+  xy: 668, 1975
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 minelaser
   rotate: false
-  xy: 827, 639
+  xy: 799, 987
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 minelaser-end
   rotate: false
-  xy: 555, 775
+  xy: 742, 1975
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 missile
   rotate: false
-  xy: 721, 650
+  xy: 1823, 1755
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 721, 612
+  xy: 1861, 1755
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 scale_marker
   rotate: false
-  xy: 654, 1864
+  xy: 779, 1511
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
   index: -1
 scorch1
   rotate: false
-  xy: 739, 23
+  xy: 781, 1375
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 770, 245
+  xy: 811, 1375
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 800, 246
+  xy: 781, 1273
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 830, 247
+  xy: 811, 1273
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 769, 125
+  xy: 781, 1171
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 shell
   rotate: false
-  xy: 721, 545
+  xy: 1941, 1784
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 721, 507
+  xy: 1979, 1784
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 671, 203
+  xy: 457, 95
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 799, 127
+  xy: 841, 1359
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 705, 169
+  xy: 1119, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 transfer-end
   rotate: false
-  xy: 555, 701
+  xy: 816, 1975
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 blackstone-cliff-edge
   rotate: false
-  xy: 313, 391
+  xy: 321, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-1
   rotate: false
-  xy: 347, 425
+  xy: 321, 31
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-2
   rotate: false
-  xy: 313, 357
+  xy: 355, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blackstone-cliff-side
   rotate: false
-  xy: 347, 391
+  xy: 355, 31
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-arc
   rotate: false
-  xy: 381, 357
+  xy: 1967, 1721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-biomattercompressor
   rotate: false
-  xy: 1328, 1983
+  xy: 1748, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-blast-drill
   rotate: false
-  xy: 457, 1733
+  xy: 359, 1635
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 415, 391
+  xy: 2001, 1721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 415, 391
+  xy: 2001, 1721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 449, 425
+  xy: 401, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 415, 357
+  xy: 435, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 415, 357
+  xy: 435, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 449, 391
+  xy: 819, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-container
   rotate: false
-  xy: 1394, 1983
+  xy: 1814, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 container
   rotate: false
-  xy: 1394, 1983
+  xy: 1814, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 483, 425
+  xy: 853, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-copper-wall
   rotate: false
-  xy: 449, 357
+  xy: 811, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 449, 357
+  xy: 811, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-copper-wall-large
   rotate: false
-  xy: 1460, 1983
+  xy: 1880, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 copper-wall-large
   rotate: false
-  xy: 1460, 1983
+  xy: 1880, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-core
   rotate: false
-  xy: 261, 1439
+  xy: 457, 1733
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 core
   rotate: false
-  xy: 261, 1439
+  xy: 457, 1733
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-cryofluidmixer
   rotate: false
-  xy: 1526, 1983
+  xy: 1946, 1983
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-cultivator
   rotate: false
-  xy: 1592, 1983
+  xy: 555, 1765
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-cyclone
   rotate: false
-  xy: 359, 1537
+  xy: 261, 1439
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-dagger-factory
   rotate: false
-  xy: 1658, 1983
+  xy: 555, 1699
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-dart-ship-pad
   rotate: false
-  xy: 1724, 1983
+  xy: 555, 1633
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dart-ship-pad
   rotate: false
-  xy: 1724, 1983
+  xy: 555, 1633
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 483, 391
+  xy: 845, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 483, 391
+  xy: 845, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-delta-mech-pad
   rotate: false
-  xy: 1790, 1983
+  xy: 555, 1567
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 delta-mech-pad
   rotate: false
-  xy: 1790, 1983
+  xy: 555, 1567
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 517, 425
+  xy: 745, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 517, 425
+  xy: 745, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-distributor
   rotate: false
-  xy: 1856, 1983
+  xy: 555, 1501
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 distributor
   rotate: false
-  xy: 1856, 1983
+  xy: 555, 1501
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-door
   rotate: false
-  xy: 483, 357
+  xy: 745, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 483, 357
+  xy: 745, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-door-large
   rotate: false
-  xy: 1922, 1983
+  xy: 555, 1435
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-large
   rotate: false
-  xy: 1922, 1983
+  xy: 555, 1435
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-duo
   rotate: false
-  xy: 517, 391
+  xy: 935, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-force-projector
   rotate: false
-  xy: 457, 1635
+  xy: 359, 1537
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 force-projector
   rotate: false
-  xy: 457, 1635
+  xy: 359, 1537
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-fortress-factory
   rotate: false
-  xy: 261, 1341
+  xy: 457, 1635
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-fuse
   rotate: false
-  xy: 359, 1439
+  xy: 261, 1341
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -2792,238 +2729,238 @@ block-icon-fusion-reactor
   index: -1
 block-icon-ghoul-factory
   rotate: false
-  xy: 457, 1537
+  xy: 359, 1439
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-glaive-ship-pad
   rotate: false
-  xy: 261, 1243
+  xy: 457, 1537
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 glaive-ship-pad
   rotate: false
-  xy: 261, 1243
+  xy: 457, 1537
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-grass
   rotate: false
-  xy: 517, 357
+  xy: 969, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 517, 357
+  xy: 969, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-hail
   rotate: false
-  xy: 551, 403
+  xy: 1003, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-ice
   rotate: false
-  xy: 551, 369
+  xy: 1037, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 551, 369
+  xy: 1037, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 585, 403
+  xy: 1071, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 585, 403
+  xy: 1071, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 585, 369
+  xy: 1105, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 585, 369
+  xy: 1105, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-item-source
   rotate: false
-  xy: 753, 1165
+  xy: 1139, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 753, 1165
+  xy: 1139, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-item-void
   rotate: false
-  xy: 229, 310
+  xy: 1173, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 229, 310
+  xy: 1173, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-javelin-ship-pad
   rotate: false
-  xy: 555, 437
+  xy: 555, 1369
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 javelin-ship-pad
   rotate: false
-  xy: 555, 437
+  xy: 555, 1369
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-junction
   rotate: false
-  xy: 229, 276
+  xy: 1207, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-lancer
   rotate: false
-  xy: 594, 1936
+  xy: 555, 1303
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-laser-drill
   rotate: false
-  xy: 594, 1870
+  xy: 555, 1237
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-launch-pad
   rotate: false
-  xy: 359, 1341
+  xy: 261, 1243
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launch-pad
   rotate: false
-  xy: 359, 1341
+  xy: 261, 1243
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 229, 242
+  xy: 1241, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 229, 242
+  xy: 1241, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 229, 208
+  xy: 1275, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-liquid-source
   rotate: false
-  xy: 229, 174
+  xy: 1309, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 229, 174
+  xy: 1309, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-liquid-tank
   rotate: false
-  xy: 457, 1439
+  xy: 359, 1341
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-mass-driver
   rotate: false
-  xy: 261, 1145
+  xy: 457, 1439
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mass-driver
   rotate: false
-  xy: 261, 1145
+  xy: 457, 1439
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-mechanical-drill
   rotate: false
-  xy: 660, 1917
+  xy: 555, 1171
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 229, 140
+  xy: 1343, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 229, 140
+  xy: 1343, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3037,161 +2974,161 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 229, 106
+  xy: 1377, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 229, 106
+  xy: 1377, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-mend-projector
   rotate: false
-  xy: 726, 1917
+  xy: 555, 1105
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mend-projector
   rotate: false
-  xy: 726, 1917
+  xy: 555, 1105
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 229, 72
+  xy: 1411, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 229, 72
+  xy: 1411, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-oil-extractor
   rotate: false
-  xy: 359, 1243
+  xy: 261, 1145
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-omega-mech-pad
   rotate: false
-  xy: 457, 1341
+  xy: 359, 1243
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 omega-mech-pad
   rotate: false
-  xy: 457, 1341
+  xy: 359, 1243
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-overdrive-projector
   rotate: false
-  xy: 792, 1917
+  xy: 555, 1039
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 overdrive-projector
   rotate: false
-  xy: 792, 1917
+  xy: 555, 1039
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 1967, 1817
+  xy: 1445, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 1967, 1817
+  xy: 1445, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-phantom-factory
   rotate: false
-  xy: 858, 1917
+  xy: 555, 973
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 1967, 1783
+  xy: 1479, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1967, 1783
+  xy: 1479, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 551, 335
+  xy: 1513, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 551, 335
+  xy: 1513, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 585, 335
+  xy: 1547, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 585, 335
+  xy: 1547, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-phase-wall-large
   rotate: false
-  xy: 924, 1917
+  xy: 555, 907
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-wall-large
   rotate: false
-  xy: 924, 1917
+  xy: 555, 907
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-phase-weaver
   rotate: false
-  xy: 990, 1917
+  xy: 555, 841
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -3205,147 +3142,147 @@ block-icon-plasma-drill
   index: -1
 block-icon-plastanium-compressor
   rotate: false
-  xy: 1056, 1917
+  xy: 555, 775
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-compressor
   rotate: false
-  xy: 1056, 1917
+  xy: 555, 775
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-pneumatic-drill
   rotate: false
-  xy: 1122, 1917
+  xy: 555, 709
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 983, 1430
+  xy: 1581, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-power-node-large
   rotate: false
-  xy: 1188, 1917
+  xy: 555, 643
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-power-source
   rotate: false
-  xy: 975, 1396
+  xy: 1615, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-source
   rotate: false
-  xy: 975, 1396
+  xy: 1615, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-power-void
   rotate: false
-  xy: 1017, 1430
+  xy: 1649, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1017, 1430
+  xy: 1649, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 1009, 1396
+  xy: 1683, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 1107, 1619
+  xy: 1717, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-pyratite-mixer
   rotate: false
-  xy: 1254, 1917
+  xy: 555, 577
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pyratite-mixer
   rotate: false
-  xy: 1254, 1917
+  xy: 555, 577
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-reconstructor
   rotate: false
-  xy: 1320, 1917
+  xy: 87, 2
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dagger-factory
   rotate: false
-  xy: 1320, 1917
+  xy: 87, 2
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phantom-factory
   rotate: false
-  xy: 1320, 1917
+  xy: 87, 2
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 reconstructor
   rotate: false
-  xy: 1320, 1917
+  xy: 87, 2
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spirit-factory
   rotate: false
-  xy: 1320, 1917
+  xy: 87, 2
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wraith-factory
   rotate: false
-  xy: 1320, 1917
+  xy: 87, 2
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 1107, 1585
+  xy: 1751, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 1107, 1585
+  xy: 1751, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3359,245 +3296,245 @@ block-icon-revenant-factory
   index: -1
 block-icon-ripple
   rotate: false
-  xy: 261, 1047
+  xy: 457, 1341
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-rock
   rotate: false
-  xy: 1141, 1627
+  xy: 1785, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 1141, 1627
+  xy: 1785, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-rocks
   rotate: false
-  xy: 1141, 1593
+  xy: 877, 1677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks1
   rotate: false
-  xy: 1141, 1593
+  xy: 877, 1677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-rotary-pump
   rotate: false
-  xy: 1386, 1917
+  xy: 153, 16
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rotary-pump
   rotate: false
-  xy: 1386, 1917
+  xy: 153, 16
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-router
   rotate: false
-  xy: 1181, 1693
+  xy: 911, 1680
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1181, 1693
+  xy: 911, 1680
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 1452, 1917
+  xy: 594, 1936
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 1452, 1917
+  xy: 594, 1936
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-salvo
   rotate: false
-  xy: 1518, 1917
+  xy: 594, 1870
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-sand
   rotate: false
-  xy: 1215, 1693
+  xy: 945, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 1215, 1693
+  xy: 945, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 843, 1289
+  xy: 979, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 843, 1255
+  xy: 1013, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 843, 1255
+  xy: 1013, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-shock-mine
   rotate: false
-  xy: 877, 1297
+  xy: 1047, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shock-mine
   rotate: false
-  xy: 877, 1297
+  xy: 1047, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 877, 1263
+  xy: 1081, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 877, 1263
+  xy: 1081, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-silicon-smelter
   rotate: false
-  xy: 1584, 1917
+  xy: 660, 1909
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 silicon-smelter
   rotate: false
-  xy: 1584, 1917
+  xy: 660, 1909
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 771, 957
+  xy: 1115, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 771, 957
+  xy: 1115, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 759, 654
+  xy: 1149, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 759, 654
+  xy: 1149, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-solar-panel-large
   rotate: false
-  xy: 359, 1145
+  xy: 261, 1047
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 solar-panel-large
   rotate: false
-  xy: 359, 1145
+  xy: 261, 1047
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 759, 620
+  xy: 1183, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 759, 620
+  xy: 1183, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 759, 586
+  xy: 1217, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 759, 586
+  xy: 1217, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-spawn
   rotate: false
-  xy: 759, 552
+  xy: 1251, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn
   rotate: false
-  xy: 759, 552
+  xy: 1251, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3611,245 +3548,245 @@ block-icon-spectre
   index: -1
 block-icon-spirit-factory
   rotate: false
-  xy: 1650, 1917
+  xy: 726, 1909
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-stone
   rotate: false
-  xy: 759, 518
+  xy: 1285, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 759, 518
+  xy: 1285, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-surge-wall
   rotate: false
-  xy: 759, 484
+  xy: 1319, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 759, 484
+  xy: 1319, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-surge-wall-large
   rotate: false
-  xy: 1716, 1917
+  xy: 792, 1909
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 surge-wall-large
   rotate: false
-  xy: 1716, 1917
+  xy: 792, 1909
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-swarmer
   rotate: false
-  xy: 1782, 1917
+  xy: 660, 1843
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-tar
   rotate: false
-  xy: 759, 450
+  xy: 1353, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 759, 450
+  xy: 1353, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-tau-mech-pad
   rotate: false
-  xy: 1848, 1917
+  xy: 726, 1843
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 tau-mech-pad
   rotate: false
-  xy: 1848, 1917
+  xy: 726, 1843
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-thermal-generator
   rotate: false
-  xy: 1914, 1917
+  xy: 792, 1843
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-generator
   rotate: false
-  xy: 1914, 1917
+  xy: 792, 1843
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-thermal-pump
   rotate: false
-  xy: 660, 1851
+  xy: 858, 1909
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-pump
   rotate: false
-  xy: 660, 1851
+  xy: 858, 1909
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-thorium-reactor
   rotate: false
-  xy: 457, 1243
+  xy: 359, 1145
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor
   rotate: false
-  xy: 457, 1243
+  xy: 359, 1145
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 721, 415
+  xy: 1387, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 721, 415
+  xy: 1387, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-thorium-wall-large
   rotate: false
-  xy: 726, 1851
+  xy: 858, 1843
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thorium-wall-large
   rotate: false
-  xy: 726, 1851
+  xy: 858, 1843
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-titan-factory
   rotate: false
-  xy: 261, 949
+  xy: 457, 1243
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 1980, 1949
+  xy: 1421, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-trident-ship-pad
   rotate: false
-  xy: 792, 1851
+  xy: 924, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 trident-ship-pad
   rotate: false
-  xy: 792, 1851
+  xy: 924, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-turbine-generator
   rotate: false
-  xy: 858, 1851
+  xy: 924, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 turbine-generator
   rotate: false
-  xy: 858, 1851
+  xy: 924, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 1980, 1915
+  xy: 1455, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1980, 1915
+  xy: 1455, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-vault
   rotate: false
-  xy: 359, 1047
+  xy: 261, 949
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 vault
   rotate: false
-  xy: 359, 1047
+  xy: 261, 949
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 block-icon-water
   rotate: false
-  xy: 1980, 1881
+  xy: 1489, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 1980, 1881
+  xy: 1489, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-water-extractor
   rotate: false
-  xy: 924, 1851
+  xy: 990, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -3863,1225 +3800,1225 @@ block-icon-wave
   index: -1
 block-icon-wraith-factory
   rotate: false
-  xy: 1056, 1851
+  xy: 1056, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 1783, 1733
+  xy: 1321, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 1851, 1767
+  xy: 1329, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 1817, 1733
+  xy: 1355, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 1885, 1767
+  xy: 1363, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 1953, 1749
+  xy: 1457, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 1953, 1715
+  xy: 1465, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 1987, 1749
+  xy: 1491, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 1987, 1715
+  xy: 1499, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 1555, 1699
+  xy: 1669, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 1589, 1699
+  xy: 1695, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 1623, 1699
+  xy: 1703, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 1657, 1699
+  xy: 1729, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 679, 1041
+  xy: 1335, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 679, 991
+  xy: 1385, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 679, 941
+  xy: 1385, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-omega-mech
   rotate: false
-  xy: 1049, 1595
+  xy: 753, 1587
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 mech-icon-tau-mech
   rotate: false
-  xy: 1115, 1661
+  xy: 687, 1521
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 mech-icon-trident-ship
   rotate: false
-  xy: 1181, 1727
+  xy: 621, 1390
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 1181, 1727
+  xy: 621, 1390
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 297, 153
+  xy: 705, 870
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 331, 187
+  xy: 705, 836
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 365, 221
+  xy: 705, 802
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 399, 255
+  xy: 705, 768
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 501, 323
+  xy: 705, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 297, 119
+  xy: 705, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 331, 153
+  xy: 705, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 365, 187
+  xy: 705, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 399, 221
+  xy: 705, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 433, 255
+  xy: 705, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 467, 289
+  xy: 705, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 297, 85
+  xy: 705, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 331, 119
+  xy: 739, 870
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 365, 153
+  xy: 739, 836
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 399, 187
+  xy: 739, 802
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 433, 221
+  xy: 739, 768
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 467, 255
+  xy: 739, 734
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 501, 289
+  xy: 739, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 331, 85
+  xy: 739, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 365, 119
+  xy: 739, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 399, 153
+  xy: 739, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 433, 187
+  xy: 739, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 467, 221
+  xy: 739, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 501, 255
+  xy: 739, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 365, 85
+  xy: 739, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 399, 119
+  xy: 721, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 433, 153
+  xy: 721, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 467, 187
+  xy: 755, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 501, 221
+  xy: 755, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 399, 85
+  xy: 763, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 433, 119
+  xy: 763, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 467, 153
+  xy: 763, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 501, 187
+  xy: 763, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 433, 85
+  xy: 763, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 467, 119
+  xy: 763, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 501, 153
+  xy: 763, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 467, 85
+  xy: 1899, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 501, 119
+  xy: 1933, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 501, 85
+  xy: 1967, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 535, 301
+  xy: 2001, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 535, 267
+  xy: 713, 1419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 569, 301
+  xy: 713, 1385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 535, 233
+  xy: 713, 1351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 569, 267
+  xy: 713, 1317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 535, 199
+  xy: 713, 1283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 569, 233
+  xy: 713, 1249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 535, 165
+  xy: 713, 1215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 569, 199
+  xy: 713, 1181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 535, 131
+  xy: 713, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 569, 165
+  xy: 713, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 535, 97
+  xy: 713, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 569, 131
+  xy: 713, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 569, 97
+  xy: 713, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 603, 301
+  xy: 713, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 603, 267
+  xy: 720, 1453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 603, 233
+  xy: 747, 1419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 603, 199
+  xy: 747, 1385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 603, 165
+  xy: 747, 1351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 603, 131
+  xy: 747, 1317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 603, 97
+  xy: 747, 1283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 263, 50
+  xy: 747, 1249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 297, 51
+  xy: 747, 1215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 331, 51
+  xy: 747, 1181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 365, 51
+  xy: 747, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 399, 51
+  xy: 747, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 433, 51
+  xy: 747, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 467, 51
+  xy: 747, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 501, 51
+  xy: 747, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 535, 63
+  xy: 747, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 569, 63
+  xy: 743, 943
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 603, 63
+  xy: 743, 909
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 535, 29
+  xy: 777, 943
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 569, 29
+  xy: 777, 909
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 603, 29
+  xy: 773, 875
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 242, 16
+  xy: 773, 841
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 276, 16
+  xy: 773, 807
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 310, 17
+  xy: 773, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 344, 17
+  xy: 773, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 378, 17
+  xy: 773, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 412, 17
+  xy: 773, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 446, 17
+  xy: 773, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 480, 17
+  xy: 773, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 755, 415
+  xy: 773, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 1385, 1661
+  xy: 773, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 1419, 1661
+  xy: 773, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 1453, 1665
+  xy: 773, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 1487, 1665
+  xy: 789, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 1521, 1665
+  xy: 789, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 1555, 1665
+  xy: 797, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 1589, 1665
+  xy: 797, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 1623, 1665
+  xy: 797, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 1657, 1665
+  xy: 797, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 1691, 1665
+  xy: 797, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 1725, 1665
+  xy: 797, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 637, 237
+  xy: 831, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 637, 203
+  xy: 369, 129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 637, 169
+  xy: 403, 129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 637, 135
+  xy: 437, 129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 671, 67
+  xy: 811, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 671, 33
+  xy: 845, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 1453, 1631
+  xy: 879, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 1487, 1631
+  xy: 913, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 1589, 1631
+  xy: 1015, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 1623, 1631
+  xy: 1049, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 1657, 1631
+  xy: 1083, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 1691, 1631
+  xy: 1117, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge
   rotate: false
-  xy: 1929, 1613
+  xy: 1355, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge-1
   rotate: false
-  xy: 1963, 1613
+  xy: 1389, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge-2
   rotate: false
-  xy: 1997, 1613
+  xy: 1423, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-side
   rotate: false
-  xy: 789, 416
+  xy: 1457, 1551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unit-icon-dagger
   rotate: false
-  xy: 729, 1091
+  xy: 1685, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-icon-fortress
   rotate: false
-  xy: 917, 1521
+  xy: 753, 1777
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unit-icon-titan
   rotate: false
-  xy: 983, 1587
+  xy: 687, 1711
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unit-icon-wraith
   rotate: false
-  xy: 729, 1041
+  xy: 1735, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wraith
   rotate: false
-  xy: 729, 1041
+  xy: 1735, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-bioglass
   rotate: false
-  xy: 1827, 1699
+  xy: 1805, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 1861, 1699
+  xy: 1839, 1619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1895, 1699
+  xy: 1831, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1041, 1488
+  xy: 1865, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 793, 655
+  xy: 679, 1414
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-dense-alloy
   rotate: false
-  xy: 793, 621
+  xy: 679, 1380
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 793, 587
+  xy: 679, 1346
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 793, 553
+  xy: 679, 1312
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 793, 519
+  xy: 679, 1278
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 793, 485
+  xy: 679, 1244
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 793, 451
+  xy: 679, 1210
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 263, 322
+  xy: 679, 1176
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 263, 288
+  xy: 679, 1142
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 263, 254
+  xy: 679, 1108
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 263, 220
+  xy: 679, 1074
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 263, 186
+  xy: 679, 1040
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 263, 152
+  xy: 679, 1006
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 297, 255
+  xy: 671, 768
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 331, 289
+  xy: 671, 734
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 365, 289
+  xy: 671, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 433, 323
+  xy: 671, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alpha-mech
   rotate: false
-  xy: 1467, 1801
+  xy: 621, 830
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-mech-base
   rotate: false
-  xy: 1517, 1801
+  xy: 621, 780
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-mech-leg
   rotate: false
-  xy: 1567, 1801
+  xy: 621, 730
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech
   rotate: false
-  xy: 629, 1041
+  xy: 985, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-base
   rotate: false
-  xy: 629, 991
+  xy: 1035, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 629, 941
+  xy: 1035, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 omega-mech
   rotate: false
-  xy: 1247, 1793
+  xy: 621, 1332
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-mech-armor
   rotate: false
-  xy: 719, 1199
+  xy: 621, 1274
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-mech-base
   rotate: false
-  xy: 785, 1265
+  xy: 621, 1216
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-mech-leg
   rotate: false
-  xy: 851, 1331
+  xy: 621, 1158
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-mech
   rotate: false
-  xy: 1305, 1793
+  xy: 621, 984
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-mech-base
   rotate: false
-  xy: 671, 441
+  xy: 1635, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-mech-leg
   rotate: false
-  xy: 703, 1141
+  xy: 1685, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 629, 1091
+  xy: 985, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 glaive-ship
   rotate: false
-  xy: 1988, 1991
+  xy: 819, 1653
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 mech-icon-glaive-ship
   rotate: false
-  xy: 1988, 1991
+  xy: 819, 1653
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 javelin-ship
   rotate: false
-  xy: 621, 491
+  xy: 1285, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-javelin-ship
   rotate: false
-  xy: 621, 491
+  xy: 1285, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-ship-shield
   rotate: false
-  xy: 621, 441
+  xy: 1285, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5102,21 +5039,21 @@ circle
   index: -1
 clear
   rotate: false
-  xy: 721, 688
+  xy: 2046, 2020
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 shape-3
   rotate: false
-  xy: 983, 1522
+  xy: 621, 1448
   size: 63, 63
   orig: 63, 63
   offset: 0, 0
   index: -1
 button
   rotate: false
-  xy: 129, 21
+  xy: 1865, 1793
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5124,7 +5061,7 @@ button
   index: -1
 button-down
   rotate: false
-  xy: 729, 920
+  xy: 885, 1714
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5132,7 +5069,7 @@ button-down
   index: -1
 button-edge-1
   rotate: false
-  xy: 729, 891
+  xy: 1785, 1780
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5140,7 +5077,7 @@ button-edge-1
   index: -1
 button-edge-2
   rotate: false
-  xy: 729, 862
+  xy: 1827, 1822
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5148,7 +5085,7 @@ button-edge-2
   index: -1
 button-edge-3
   rotate: false
-  xy: 729, 833
+  xy: 1785, 1751
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5156,7 +5093,7 @@ button-edge-3
   index: -1
 button-edge-4
   rotate: false
-  xy: 729, 804
+  xy: 1865, 1822
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5164,7 +5101,7 @@ button-edge-4
   index: -1
 button-over
   rotate: false
-  xy: 729, 775
+  xy: 1903, 1822
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5172,7 +5109,7 @@ button-over
   index: -1
 button-right
   rotate: false
-  xy: 729, 688
+  xy: 1827, 1793
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5180,7 +5117,7 @@ button-right
   index: -1
 button-right-down
   rotate: false
-  xy: 729, 746
+  xy: 1941, 1822
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5188,7 +5125,7 @@ button-right-down
   index: -1
 button-right-over
   rotate: false
-  xy: 729, 717
+  xy: 1979, 1822
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -5196,7 +5133,7 @@ button-right-over
   index: -1
 button-select
   rotate: false
-  xy: 1980, 1855
+  xy: 369, 163
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -5204,28 +5141,28 @@ button-select
   index: -1
 check-off
   rotate: false
-  xy: 689, 407
+  xy: 469, 253
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on
   rotate: false
-  xy: 739, 193
+  xy: 1289, 1517
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 739, 159
+  xy: 850, 1483
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 739, 125
+  xy: 1319, 1517
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
@@ -5239,119 +5176,119 @@ clear
   index: -1
 cursor
   rotate: false
-  xy: 1947, 1727
+  xy: 2012, 1983
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
   index: -1
 discord-banner
   rotate: false
-  xy: 582, 2002
+  xy: 1, 21
   size: 84, 45
   orig: 84, 45
   offset: 0, 0
   index: -1
 empty-sector
   rotate: false
-  xy: 1317, 1691
+  xy: 1559, 1585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 229, 54
+  xy: 721, 1503
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 514, 33
+  xy: 369, 111
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 819, 1247
+  xy: 355, 13
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-effect
   rotate: false
-  xy: 801, 701
+  xy: 2017, 1793
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 806, 228
+  xy: 639, 512
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 2031, 1637
+  xy: 1385, 1533
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 2031, 1619
+  xy: 781, 1033
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 129, 3
+  xy: 781, 997
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 165, 3
+  xy: 1439, 1533
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 532, 11
+  xy: 988, 1499
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 controller-cursor
   rotate: false
-  xy: 1929, 1715
+  xy: 523, 361
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-about
   rotate: false
-  xy: 535, 341
+  xy: 245, 572
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-add
   rotate: false
-  xy: 1257, 1735
+  xy: 539, 541
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-admin
   rotate: false
-  xy: 247, 56
+  xy: 1873, 1619
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5365,378 +5302,378 @@ icon-admin-small
   index: -1
 icon-areaDelete
   rotate: false
-  xy: 245, 344
+  xy: 923, 1731
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow
   rotate: false
-  xy: 770, 227
+  xy: 541, 361
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 770, 227
+  xy: 541, 361
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-down
   rotate: false
-  xy: 801, 689
+  xy: 1887, 1743
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 582, 1978
+  xy: 369, 99
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 813, 689
+  xy: 355, 1
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 582, 1966
+  xy: 75, 9
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-back
   rotate: false
-  xy: 788, 227
+  xy: 204, 1759
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-ban
   rotate: false
-  xy: 1083, 1561
+  xy: 721, 1487
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-break
   rotate: false
-  xy: 204, 1759
+  xy: 636, 1852
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 636, 1852
+  xy: 877, 1659
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 502, 5
+  xy: 582, 1978
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-check
   rotate: false
-  xy: 753, 1147
+  xy: 1873, 1635
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-copy
   rotate: false
-  xy: 1239, 1733
+  xy: 621, 512
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 568, 1
+  xy: 923, 1719
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 1059, 1472
+  xy: 539, 525
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 1099, 1561
+  xy: 373, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 310, 1
+  xy: 2033, 1705
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 326, 1
+  xy: 2033, 1689
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 342, 1
+  xy: 2033, 1673
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 358, 1
+  xy: 2033, 1657
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-elevation
   rotate: false
-  xy: 1083, 1577
+  xy: 425, 269
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-eraser
   rotate: false
-  xy: 1041, 1470
+  xy: 880, 1499
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-exit
   rotate: false
-  xy: 374, 1
+  xy: 2033, 1641
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 2021, 1727
+  xy: 1349, 1533
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 21, 3
+  xy: 754, 1459
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 390, 1
+  xy: 2033, 1625
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 222, 1759
+  xy: 327, 171
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-floppy
   rotate: false
-  xy: 406, 1
+  xy: 737, 1487
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 39, 3
+  xy: 781, 1069
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 422, 1
+  xy: 671, 446
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 438, 1
+  xy: 895, 1661
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-generated
   rotate: false
-  xy: 621, 541
+  xy: 1235, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 icon-github
   rotate: false
-  xy: 454, 1
+  xy: 911, 1664
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 470, 1
+  xy: 880, 1483
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-grid
   rotate: false
-  xy: 240, 1759
+  xy: 21, 3
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-hold
   rotate: false
-  xy: 580, 1
+  xy: 1887, 1731
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 592, 1
+  xy: 582, 1966
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 486, 1
+  xy: 1349, 1517
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 568, 13
+  xy: 1006, 1501
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 604, 1
+  xy: 367, 1
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 584, 13
+  xy: 1475, 1535
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 616, 1
+  xy: 229, 462
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 1077, 1415
+  xy: 1887, 1721
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 57, 3
+  xy: 222, 1759
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-link
   rotate: false
-  xy: 600, 13
+  xy: 687, 446
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 628, 1
+  xy: 131, 70
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 616, 13
+  xy: 927, 1664
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 771, 1147
+  xy: 443, 269
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 514, 15
+  xy: 898, 1499
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 819, 1229
+  xy: 1367, 1533
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 819, 701
+  xy: 345, 171
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 825, 689
+  xy: 523, 447
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 1059, 1456
+  xy: 896, 1483
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5750,14 +5687,14 @@ icon-menu
   index: -1
 icon-menu-large
   rotate: false
-  xy: 2031, 1709
+  xy: 781, 1051
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-missing
   rotate: false
-  xy: 1953, 1789
+  xy: 153, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5771,301 +5708,301 @@ icon-mission-background
   index: -1
 icon-mission-battle
   rotate: false
-  xy: 2035, 1843
+  xy: 721, 382
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-defense
   rotate: false
-  xy: 1189, 1681
+  xy: 657, 518
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-done
   rotate: false
-  xy: 1173, 1665
+  xy: 245, 560
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 606, 1832
+  xy: 539, 513
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 2021, 1717
+  xy: 143, 72
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-paste
   rotate: false
-  xy: 2031, 1691
+  xy: 39, 3
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 2035, 1831
+  xy: 389, 15
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 2031, 1673
+  xy: 240, 1759
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 909, 1347
+  xy: 1365, 1517
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 2031, 1655
+  xy: 916, 1499
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 1201, 1681
+  xy: 2035, 1799
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 909, 1331
+  xy: 1022, 1501
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 618, 1832
+  xy: 1429, 1521
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 2035, 1819
+  xy: 1086, 1505
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 925, 1347
+  xy: 1491, 1535
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 2031, 1601
+  xy: 57, 3
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 925, 1331
+  xy: 703, 446
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 911, 1315
+  xy: 912, 1483
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 837, 1237
+  xy: 934, 1499
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 911, 1299
+  xy: 1381, 1517
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 911, 1283
+  xy: 1038, 1501
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 911, 1267
+  xy: 1507, 1535
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 911, 1251
+  xy: 928, 1483
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 911, 1235
+  xy: 1397, 1517
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 855, 1237
+  xy: 1403, 1533
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 75, 3
+  xy: 781, 1015
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 1213, 1681
+  xy: 1555, 1539
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 93, 8
+  xy: 952, 1499
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 927, 1315
+  xy: 1054, 1501
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 2035, 1807
+  xy: 976, 1487
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 1225, 1681
+  xy: 606, 1832
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 927, 1299
+  xy: 1523, 1535
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 111, 8
+  xy: 1421, 1533
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-trello
   rotate: false
-  xy: 927, 1283
+  xy: 944, 1483
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 927, 1267
+  xy: 1413, 1517
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 147, 3
+  xy: 970, 1499
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocked
   rotate: false
-  xy: 183, 3
+  xy: 781, 979
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 927, 1251
+  xy: 1070, 1501
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 927, 1235
+  xy: 1539, 1535
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 550, 11
+  xy: 1457, 1533
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 1173, 1677
+  xy: 960, 1483
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 info-banner
   rotate: false
-  xy: 1, 21
+  xy: 582, 2002
   size: 84, 45
   orig: 84, 45
   offset: 0, 0
   index: -1
 inventory
   rotate: false
-  xy: 769, 20
+  xy: 781, 1129
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -6080,7 +6017,7 @@ logotext
   index: -1
 pane
   rotate: false
-  xy: 721, 583
+  xy: 1899, 1764
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6088,7 +6025,7 @@ pane
   index: -1
 pane-2
   rotate: false
-  xy: 167, 21
+  xy: 1903, 1793
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6096,7 +6033,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 795, 25
+  xy: 811, 1173
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -6104,7 +6041,7 @@ scroll
   index: -1
 scroll-horizontal
   rotate: false
-  xy: 205, 24
+  xy: 2012, 2023
   size: 35, 24
   split: 6, 5, 10, 10
   orig: 35, 24
@@ -6120,7 +6057,7 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 2021, 1745
+  xy: 781, 1087
   size: 24, 40
   split: 10, 10, 6, 10
   orig: 24, 40
@@ -6128,63 +6065,63 @@ scroll-knob-vertical-black
   index: -1
 sector-edge
   rotate: false
-  xy: 671, 305
+  xy: 423, 61
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sector-select
   rotate: false
-  xy: 671, 271
+  xy: 389, 27
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 selection
   rotate: false
-  xy: 2046, 2046
+  xy: 229, 459
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 532, 41
+  xy: 258, 1818
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 739, 307
+  xy: 2017, 1811
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 739, 267
+  xy: 788, 1477
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 739, 227
+  xy: 819, 1477
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-vertical
   rotate: false
-  xy: 1375, 1726
+  xy: 885, 1711
   size: 8, 1
   orig: 8, 1
   offset: 0, 0
   index: -1
 underline
   rotate: false
-  xy: 721, 449
+  xy: 1975, 1755
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6192,7 +6129,7 @@ underline
   index: -1
 underline-2
   rotate: false
-  xy: 721, 478
+  xy: 1937, 1755
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -6200,14 +6137,14 @@ underline-2
   index: -1
 white
   rotate: false
-  xy: 1048, 1522
+  xy: 686, 1448
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
   index: -1
 window-empty
   rotate: false
-  xy: 769, 62
+  xy: 811, 1210
   size: 27, 61
   split: 8, 8, 44, 11
   orig: 27, 61
@@ -6215,203 +6152,203 @@ window-empty
   index: -1
 alpha-drone
   rotate: false
-  xy: 1417, 1801
+  xy: 621, 880
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 1867, 1801
+  xy: 885, 1743
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 1917, 1801
+  xy: 935, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 653, 1141
+  xy: 935, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 fortress
   rotate: false
-  xy: 719, 1785
+  xy: 1518, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 fortress-base
   rotate: false
-  xy: 653, 1653
+  xy: 1584, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-base
   rotate: false
-  xy: 653, 1653
+  xy: 1584, 1917
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 fortress-leg
   rotate: false
-  xy: 719, 1719
+  xy: 1584, 1851
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 ghoul
   rotate: false
-  xy: 555, 997
+  xy: 327, 189
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 unit-icon-ghoul
   rotate: false
-  xy: 555, 997
+  xy: 327, 189
   size: 72, 72
   orig: 72, 72
   offset: 0, 0
   index: -1
 phantom
   rotate: false
-  xy: 917, 1397
+  xy: 621, 1100
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 unit-icon-phantom
   rotate: false
-  xy: 917, 1397
+  xy: 621, 1100
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 power-cell
   rotate: false
-  xy: 983, 1464
+  xy: 621, 1042
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 revenant
   rotate: false
-  xy: 131, 344
+  xy: 131, 474
   size: 112, 112
   orig: 112, 112
   offset: 0, 0
   index: -1
 unit-icon-revenant
   rotate: false
-  xy: 131, 344
+  xy: 131, 474
   size: 112, 112
   orig: 112, 112
   offset: 0, 0
   index: -1
 spirit
   rotate: false
-  xy: 671, 641
+  xy: 1535, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-icon-spirit
   rotate: false
-  xy: 671, 641
+  xy: 1535, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titan
   rotate: false
-  xy: 719, 1323
+  xy: 621, 1711
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-leg
   rotate: false
-  xy: 785, 1389
+  xy: 687, 1777
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 artillery-equip
   rotate: false
-  xy: 1617, 1801
+  xy: 621, 680
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 blaster-equip
   rotate: false
-  xy: 1717, 1801
+  xy: 621, 580
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 bomber-equip
   rotate: false
-  xy: 1767, 1801
+  xy: 621, 530
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 1767, 1801
+  xy: 621, 530
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 1817, 1801
+  xy: 885, 1793
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 629, 791
+  xy: 1135, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 629, 741
+  xy: 1135, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 621, 641
+  xy: 1185, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 679, 791
+  xy: 1485, 1801
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 671, 541
+  xy: 1585, 1751
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 5b1b17f87f..69249a6e46 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index eecebea3b9..1a3f9ba3b0 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -725,8 +725,8 @@ public class Blocks implements ContentList{
 
         core = new CoreBlock("core"){{
             health = 1100;
-            itemCapacity = 2000;
-            launchThreshold = 1000;
+            itemCapacity = 1000;
+            launchThreshold = 500;
             launchTime = 60f * 10;
             launchChunkSize = 100;
         }};
@@ -763,12 +763,12 @@ public class Blocks implements ContentList{
                 Items.pyratite, Bullets.standardIncendiary,
                 Items.silicon, Bullets.standardHoming
             );
-            reload = 25f;
+            reload = 20f;
             restitution = 0.03f;
             range = 90f;
             shootCone = 15f;
             ammoUseEffect = Fx.shellEjectSmall;
-            health = 80;
+            health = 110;
             inaccuracy = 2f;
             rotatespeed = 10f;
         }};
diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java
index fc9c0ee633..638a31a87b 100644
--- a/core/src/io/anuke/mindustry/content/Recipes.java
+++ b/core/src/io/anuke/mindustry/content/Recipes.java
@@ -51,8 +51,8 @@ public class Recipes implements ContentList{
         new Recipe(effect, Blocks.shockMine, new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 25));
 
         //TURRETS
-        new Recipe(turret, Blocks.duo, new ItemStack(Items.copper, 40)).setAlwaysUnlocked(true);
-        new Recipe(turret, Blocks.arc, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 40));
+        new Recipe(turret, Blocks.duo, new ItemStack(Items.copper, 60)).setAlwaysUnlocked(true);
+        new Recipe(turret, Blocks.arc, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 60));
         new Recipe(turret, Blocks.hail, new ItemStack(Items.copper, 60), new ItemStack(Items.graphite, 35));
         new Recipe(turret, Blocks.lancer, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 90));
         new Recipe(turret, Blocks.wave, new ItemStack(Items.titanium, 70), new ItemStack(Items.lead, 150));
diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 8c5c48e251..c14148568b 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -27,14 +27,9 @@ public class Zones implements ContentList{
                         unitScaling = 2;
                     }},
 
-                    new SpawnGroup(UnitTypes.dagger){{
-                        begin = 5;
-                        unitScaling = 2;
-                    }},
-
                     new SpawnGroup(UnitTypes.dagger){{
                         begin = 10;
-                        unitScaling = 1;
+                        unitScaling = 2;
                     }},
 
                     new SpawnGroup(UnitTypes.dagger){{
@@ -50,6 +45,11 @@ public class Zones implements ContentList{
                     new SpawnGroup(UnitTypes.dagger){{
                         begin = 25;
                         unitScaling = 1;
+                    }},
+
+                    new SpawnGroup(UnitTypes.dagger){{
+                        begin = 30;
+                        unitScaling = 1;
                     }}
                 );
             }};
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 657d80840f..e9b793fc73 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -116,15 +116,16 @@ public class Control implements ApplicationListener{
         //todo high scores for custom maps, as well as other statistics
 
         Events.on(GameOverEvent.class, event -> {
+            state.stats.wavesLasted = state.wave;
+            Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y);
+            //the restart dialog can show info for any number of scenarios
+            Call.onGameOver(event.winner);
             if(state.rules.zone != -1){
                 //remove zone save on game over
                 if(saves.getZoneSlot() != null){
                     saves.getZoneSlot().delete();
                 }
             }
-            Effects.shake(5, 6, Core.camera.position.x, Core.camera.position.y);
-            //the restart dialog can show info for any number of scenarios
-            Call.onGameOver(event.winner);
         });
 
         //autohost for pvp sectors
@@ -141,6 +142,28 @@ public class Control implements ApplicationListener{
         });
 
         Events.on(UnlockEvent.class, e -> ui.hudfrag.showUnlock(e.content));
+
+        Events.on(BlockBuildEndEvent.class, e -> {
+            if(e.team == players[0].getTeam()){
+                if(e.breaking){
+                    state.stats.buildingsDeconstructed++;
+                }else{
+                    state.stats.buildingsBuilt ++;
+                }
+            }
+        });
+
+        Events.on(BlockDestroyEvent.class, e -> {
+            if(e.tile.getTeam() == players[0].getTeam()){
+                state.stats.buildingsDestroyed ++;
+            }
+        });
+
+        Events.on(UnitDestroyEvent.class, e -> {
+            if(e.unit.getTeam() != players[0].getTeam()){
+                state.stats.enemyUnitsDestroyed ++;
+            }
+        });
     }
 
     public void addPlayer(int index){
diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java
index 7ec682daeb..598a3a268e 100644
--- a/core/src/io/anuke/mindustry/core/GameState.java
+++ b/core/src/io/anuke/mindustry/core/GameState.java
@@ -3,6 +3,7 @@ package io.anuke.mindustry.core;
 import io.anuke.arc.Events;
 import io.anuke.mindustry.game.EventType.StateChangeEvent;
 import io.anuke.mindustry.game.Rules;
+import io.anuke.mindustry.game.Stats;
 import io.anuke.mindustry.game.Teams;
 import io.anuke.mindustry.net.Net;
 
@@ -18,6 +19,8 @@ public class GameState{
     public boolean gameOver = false;
     /**The current game rules.*/
     public Rules rules = new Rules();
+    /**Statistics for this save/game. Displayed after game over.*/
+    public Stats stats = new Stats();
     /**Team data. Gets reset every new game.*/
     public Teams teams = new Teams();
     /**Number of enemies in the game; only used clientside in servers.*/
diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java
index 4ccedec0b7..e532a9fa57 100644
--- a/core/src/io/anuke/mindustry/core/Logic.java
+++ b/core/src/io/anuke/mindustry/core/Logic.java
@@ -10,11 +10,8 @@ import io.anuke.arc.entities.EntityQuery;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.TileEntity;
+import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.game.EventType.*;
-import io.anuke.mindustry.game.Rules;
-import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.game.Teams;
-import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Recipe;
 import io.anuke.mindustry.world.Tile;
@@ -68,6 +65,7 @@ public class Logic implements ApplicationListener{
         state.gameOver = false;
         state.teams = new Teams();
         state.rules = new Rules();
+        state.stats = new Stats();
 
         Time.clear();
         Entities.clear();
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index a5b237e5f0..b3f28917dd 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -47,7 +47,7 @@ public class UI implements ApplicationListener{
     public LoadingFragment loadfrag;
 
     public AboutDialog about;
-    public RestartDialog restart;
+    public GameOverDialog restart;
     public CustomGameDialog levels;
     public MapsDialog maps;
     public LoadDialog load;
@@ -158,7 +158,7 @@ public class UI implements ApplicationListener{
 
         editor = new MapEditorDialog();
         controls = new ControlsDialog();
-        restart = new RestartDialog();
+        restart = new GameOverDialog();
         join = new JoinDialog();
         discord = new DiscordDialog();
         load = new LoadDialog();
diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java
index 8145191ac4..d72d4c7a4d 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/io/anuke/mindustry/core/World.java
@@ -26,6 +26,7 @@ import io.anuke.mindustry.maps.MapTileData;
 import io.anuke.mindustry.maps.MapTileData.TileDataMarker;
 import io.anuke.mindustry.maps.Maps;
 import io.anuke.mindustry.maps.generators.Generator;
+import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.type.Zone;
 import io.anuke.mindustry.world.Block;
@@ -195,7 +196,11 @@ public class World implements ApplicationListener{
     }
 
     public boolean isZone(){
-        return state.rules.zone != -1;
+        return getZone() != null;
+    }
+
+    public Zone getZone(){
+        return content.getByID(ContentType.zone, state.rules.zone);
     }
 
     public void playZone(Zone zone){
diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java
index c77d797f8a..2d0c82e265 100644
--- a/core/src/io/anuke/mindustry/entities/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/TileEntity.java
@@ -2,6 +2,7 @@ package io.anuke.mindustry.entities;
 
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
+import io.anuke.arc.Events;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.ObjectSet;
 import io.anuke.arc.entities.Effects;
@@ -16,6 +17,7 @@ import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.traits.TargetTrait;
+import io.anuke.mindustry.game.EventType.BlockDestroyEvent;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.world.Block;
@@ -244,6 +246,7 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
             dead = true;
             Block block = tile.block();
 
+            Events.fire(new BlockDestroyEvent(tile));
             block.onDestroyed(tile);
             world.removeBlock(tile);
             block.afterDestroyed(tile, this);
diff --git a/core/src/io/anuke/mindustry/entities/Unit.java b/core/src/io/anuke/mindustry/entities/Unit.java
index efb067caec..ad369adbf0 100644
--- a/core/src/io/anuke/mindustry/entities/Unit.java
+++ b/core/src/io/anuke/mindustry/entities/Unit.java
@@ -1,6 +1,7 @@
 package io.anuke.mindustry.entities;
 
 import io.anuke.arc.Core;
+import io.anuke.arc.Events;
 import io.anuke.arc.entities.Effects;
 import io.anuke.arc.entities.impl.DestructibleEntity;
 import io.anuke.arc.entities.trait.DamageTrait;
@@ -17,6 +18,7 @@ import io.anuke.arc.math.geom.Vector2;
 import io.anuke.arc.util.Time;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.entities.traits.*;
+import io.anuke.mindustry.game.EventType.UnitDestroyEvent;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.game.Teams.TeamData;
 import io.anuke.mindustry.net.Interpolator;
@@ -121,6 +123,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
         inventory.clear();
         drownTime = 0f;
         status.clear();
+        Events.fire(new UnitDestroyEvent(this));
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
index ced259f6e9..58aa066d06 100644
--- a/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
+++ b/core/src/io/anuke/mindustry/entities/effect/ScorchDecal.java
@@ -31,12 +31,16 @@ public class ScorchDecal extends Decal{
 
     @Override
     public void drawDecal(){
-
         for(int i = 0; i < 5; i++){
             TextureRegion region = regions[Mathf.randomSeed(id - i, 0, scorches - 1)];
             float rotation = Mathf.randomSeed(id + i, 0, 360);
             float space = 1.5f + Mathf.randomSeed(id + i + 1, 0, 20) / 10f;
-            Draw.rect(region, x + Angles.trnsx(rotation, space), y + Angles.trnsy(rotation, space) + region.getHeight()/2f, region.getWidth()/2f, 0, rotation - 90);
+            Draw.rect(region,
+            x + Angles.trnsx(rotation, space),
+            y + Angles.trnsy(rotation, space) + region.getHeight()/2f*Draw.scl,
+            region.getWidth() * Draw.scl,
+            region.getHeight() * Draw.scl,
+            region.getWidth()/2f*Draw.scl, 0, rotation - 90);
         }
     }
 }
diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java
index 7c210cbda7..ef730a377a 100644
--- a/core/src/io/anuke/mindustry/game/EventType.java
+++ b/core/src/io/anuke/mindustry/game/EventType.java
@@ -2,6 +2,7 @@ package io.anuke.mindustry.game;
 
 import io.anuke.arc.Events.Event;
 import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.entities.traits.BuilderTrait;
 import io.anuke.mindustry.world.Tile;
 
@@ -81,6 +82,18 @@ public class EventType{
         }
     }
 
+    public static class BlockBuildEndEvent implements Event{
+        public final Tile tile;
+        public final Team team;
+        public final boolean breaking;
+
+        public BlockBuildEndEvent(Tile tile, Team team, boolean breaking){
+            this.tile = tile;
+            this.team = team;
+            this.breaking = breaking;
+        }
+    }
+
     /**Called when a player or drone begins building something.
      * This does not necessarily happen when a new BuildBlock is created.*/
     public static class BuildSelectEvent implements Event{
@@ -97,6 +110,22 @@ public class EventType{
         }
     }
 
+    public static class BlockDestroyEvent implements Event{
+        public final Tile tile;
+
+        public BlockDestroyEvent(Tile tile){
+            this.tile = tile;
+        }
+    }
+
+    public static class UnitDestroyEvent implements Event{
+        public final Unit unit;
+
+        public UnitDestroyEvent(Unit unit){
+            this.unit = unit;
+        }
+    }
+
     public static class ResizeEvent implements Event{
 
     }
diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java
index 91be265eaf..4e3b32eae0 100644
--- a/core/src/io/anuke/mindustry/game/GlobalData.java
+++ b/core/src/io/anuke/mindustry/game/GlobalData.java
@@ -28,6 +28,7 @@ public class GlobalData{
     public void addItem(Item item, int amount){
         modified = true;
         items.getAndIncrement(item, 0, amount);
+        state.stats.itemsDelivered.getAndIncrement(item, 0, amount);
     }
 
     public boolean hasItems(ItemStack[] stacks){
diff --git a/core/src/io/anuke/mindustry/game/Stats.java b/core/src/io/anuke/mindustry/game/Stats.java
new file mode 100644
index 0000000000..49c3427cd0
--- /dev/null
+++ b/core/src/io/anuke/mindustry/game/Stats.java
@@ -0,0 +1,23 @@
+package io.anuke.mindustry.game;
+
+import io.anuke.annotations.Annotations.Serialize;
+import io.anuke.arc.collection.ObjectIntMap;
+import io.anuke.mindustry.type.Item;
+
+@Serialize
+public class Stats{
+    /**Items delivered to global resoure counter. Zones only.*/
+    public ObjectIntMap<Item> itemsDelivered = new ObjectIntMap<>();
+    /**Enemy (red team) units destroyed.*/
+    public int enemyUnitsDestroyed;
+    /**Total waves lasted.*/
+    public int wavesLasted;
+    /**Total (ms) time lasted in this save/zone.*/
+    public long timeLasted;
+    /**Friendly buildings fully built.*/
+    public int buildingsBuilt;
+    /**Friendly buildings fully deconstructed.*/
+    public int buildingsDeconstructed;
+    /**Friendly buildings destroyed.*/
+    public int buildingsDestroyed;
+}
diff --git a/core/src/io/anuke/mindustry/graphics/Palette.java b/core/src/io/anuke/mindustry/graphics/Palette.java
index a3bc3a534b..a4b4929db7 100644
--- a/core/src/io/anuke/mindustry/graphics/Palette.java
+++ b/core/src/io/anuke/mindustry/graphics/Palette.java
@@ -38,10 +38,6 @@ public class Palette{
 
     stoneGray = Color.valueOf("8f8f8f"),
 
-    portalLight = Color.valueOf("9054ea"),
-    portal = Color.valueOf("6344d7"),
-    portalDark = Color.valueOf("3f3dac"),
-
     heal = Color.valueOf("98ffa9"),
     bar = Color.SLATE,
     accent = Color.valueOf("ffd37f"),
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index 84e23a5d00..3d626f301d 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -80,11 +80,19 @@ public class DesktopInput extends InputHandler{
                 int y = selectY + i * Mathf.sign(cursorY - selectY) * Mathf.num(!result.isX());
 
                 if(i + recipe.result.size > result.getLength() && recipe.result.rotate){
-                    Draw.color(!validPlace(x, y, recipe.result, result.rotation) ? Palette.remove : Palette.placeRotate);
-                    Draw.rect(Core.atlas.find("place-arrow"), x * tilesize + recipe.result.offset(),
-                            y * tilesize + recipe.result.offset(),
-                    Core.atlas.find("place-arrow").getWidth() * Draw.scl, Core.atlas.find("place-arrow").getHeight() * Draw.scl,
-                    x * tilesize + recipe.result.offset()/2f, 0f, result.rotation * 90 - 90);
+                    Draw.color(!validPlace(x, y, recipe.result, result.rotation) ? Palette.removeBack : Palette.accentBack);
+                    Draw.rect(Core.atlas.find("place-arrow"),
+                        x * tilesize + recipe.result.offset(),
+                        y * tilesize + recipe.result.offset() - 1,
+                        Core.atlas.find("place-arrow").getWidth() * Draw.scl,
+                        Core.atlas.find("place-arrow").getHeight() * Draw.scl, result.rotation * 90 - 90);
+
+                    Draw.color(!validPlace(x, y, recipe.result, result.rotation) ? Palette.remove : Palette.accent);
+                    Draw.rect(Core.atlas.find("place-arrow"),
+                        x * tilesize + recipe.result.offset(),
+                        y * tilesize + recipe.result.offset(),
+                        Core.atlas.find("place-arrow").getWidth() * Draw.scl,
+                        Core.atlas.find("place-arrow").getHeight() * Draw.scl, result.rotation * 90 - 90);
                 }
 
                 drawPlace(x, y, recipe.result, result.rotation);
@@ -114,12 +122,19 @@ public class DesktopInput extends InputHandler{
             Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
         }else if(isPlacing()){
             if(recipe.result.rotate){
-                Draw.color(!validPlace(cursorX, cursorY, recipe.result, rotation) ? Palette.remove : Palette.placeRotate);
-                Draw.rect(Core.atlas.find("place-arrow"), cursorX * tilesize + recipe.result.offset(),
-                        cursorY * tilesize + recipe.result.offset(),
-                Core.atlas.find("place-arrow").getWidth() * Draw.scl,
-                Core.atlas.find("place-arrow").getHeight() * Draw.scl,
-                cursorX * tilesize + recipe.result.offset()/2f, 0, rotation * 90 - 90);
+                Draw.color(!validPlace(cursorX, cursorY, recipe.result, rotation) ? Palette.removeBack : Palette.accentBack);
+                Draw.rect(Core.atlas.find("place-arrow"),
+                    cursorX * tilesize + recipe.result.offset(),
+                    cursorY * tilesize + recipe.result.offset() - 1,
+                    Core.atlas.find("place-arrow").getWidth() * Draw.scl,
+                    Core.atlas.find("place-arrow").getHeight() * Draw.scl, rotation * 90 - 90);
+
+                Draw.color(!validPlace(cursorX, cursorY, recipe.result, rotation) ? Palette.remove : Palette.accent);
+                Draw.rect(Core.atlas.find("place-arrow"),
+                    cursorX * tilesize + recipe.result.offset(),
+                    cursorY * tilesize + recipe.result.offset(),
+                    Core.atlas.find("place-arrow").getWidth() * Draw.scl,
+                    Core.atlas.find("place-arrow").getHeight() * Draw.scl, rotation * 90 - 90);
             }
             drawPlace(cursorX, cursorY, recipe.result, rotation);
             recipe.result.drawPlace(cursorX, cursorY, rotation, validPlace(cursorX, cursorY, recipe.result, rotation));
diff --git a/core/src/io/anuke/mindustry/io/versions/Save16.java b/core/src/io/anuke/mindustry/io/versions/Save16.java
index 5eb83a7fb9..3735f3c17c 100644
--- a/core/src/io/anuke/mindustry/io/versions/Save16.java
+++ b/core/src/io/anuke/mindustry/io/versions/Save16.java
@@ -42,11 +42,11 @@ public class Save16 extends SaveFileVersion{
 
         state.wave = wave;
         state.wavetime = wavetime;
+        state.stats = Serialization.readStats(stream);
 
         content.setTemporaryMapper(readContentHeader(stream));
 
         readEntities(stream);
-
         readMap(stream);
     }
 
@@ -65,6 +65,8 @@ public class Save16 extends SaveFileVersion{
         stream.writeInt(state.wave); //wave
         stream.writeFloat(state.wavetime); //wave countdown
 
+        Serialization.writeStats(stream, state.stats);
+
         writeContentHeader(stream);
 
         //--ENTITIES--
diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java
index 87a3cc45b6..4353dfa0fc 100644
--- a/core/src/io/anuke/mindustry/type/Zone.java
+++ b/core/src/io/anuke/mindustry/type/Zone.java
@@ -8,6 +8,8 @@ import io.anuke.mindustry.game.Rules;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.maps.generators.Generator;
 
+import static io.anuke.mindustry.Vars.state;
+
 public class Zone extends UnlockableContent{
     public final String name;
     public final Generator generator;
@@ -15,12 +17,18 @@ public class Zone extends UnlockableContent{
     public ItemStack[] startingItems = {};
     public Supplier<Rules> rules = Rules::new;
     public boolean alwaysUnlocked;
+    public int conditionWave = Integer.MAX_VALUE;
 
     public Zone(String name, Generator generator){
         this.name = name;
         this.generator = generator;
     }
 
+    /**Whether this zone has met its condition; if true, the player can leave.*/
+    public boolean metCondition(){
+        return state.wave > conditionWave;
+    }
+
     @Override
     public void init(){
         generator.init();
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java
new file mode 100644
index 0000000000..cc0c7454b8
--- /dev/null
+++ b/core/src/io/anuke/mindustry/ui/dialogs/GameOverDialog.java
@@ -0,0 +1,86 @@
+package io.anuke.mindustry.ui.dialogs;
+
+import io.anuke.arc.Core;
+import io.anuke.mindustry.core.GameState.State;
+import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.type.Item;
+
+import static io.anuke.mindustry.Vars.*;
+
+public class GameOverDialog extends FloatingDialog{
+    private Team winner;
+
+    public GameOverDialog(){
+        super("$gameover");
+        setFillParent(false);
+        shown(this::rebuild);
+    }
+
+    public void show(Team winner){
+        this.winner = winner;
+        show();
+    }
+
+    void rebuild(){
+        buttons.clear();
+        cont.clear();
+
+        buttons.margin(10);
+
+        if(state.rules.pvp){
+            cont.add(Core.bundle.format("gameover.pvp",winner.localized())).pad(6);
+            buttons.addButton("$menu", () -> {
+                hide();
+                state.set(State.menu);
+                logic.reset();
+            }).size(130f, 60f);
+        }else{
+            if(control.isHighScore()){
+                cont.add("$highscore").pad(6);
+                cont.row();
+            }
+
+            cont.table(t -> {
+                cont.left().defaults().left();
+                cont.add(Core.bundle.format("stat.wave", state.stats.wavesLasted));
+                cont.row();
+                cont.add(Core.bundle.format("stat.enemiesDestroyed", state.stats.enemyUnitsDestroyed));
+                cont.row();
+                cont.add(Core.bundle.format("stat.built", state.stats.buildingsBuilt));
+                cont.row();
+                cont.add(Core.bundle.format("stat.destroyed", state.stats.buildingsDestroyed));
+                cont.row();
+                cont.add(Core.bundle.format("stat.deconstructed", state.stats.buildingsDeconstructed));
+                cont.row();
+                if(world.isZone() && !state.stats.itemsDelivered.isEmpty()){
+                    cont.add("$stat.delivered");
+                    cont.row();
+                    for(Item item : content.items()){
+                        if(state.stats.itemsDelivered.containsKey(item)){
+                            cont.table(items -> {
+                                items.add("    [LIGHT_GRAY]" + state.stats.itemsDelivered.get(item, 0));
+                                items.addImage(item.region).size(8 *3).pad(4);
+                            }).left();
+                            cont.row();
+                        }
+                    }
+                }
+            }).pad(12);
+
+            if(world.isZone()){
+                buttons.addButton("$continue", () -> {
+                    hide();
+                    state.set(State.menu);
+                    logic.reset();
+                    ui.deploy.show();
+                }).size(130f, 60f);
+            }else{
+                buttons.addButton("$menu", () -> {
+                    hide();
+                    state.set(State.menu);
+                    logic.reset();
+                }).size(130f, 60f);
+            }
+        }
+    }
+}
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/RestartDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/RestartDialog.java
deleted file mode 100644
index 094f6c9d08..0000000000
--- a/core/src/io/anuke/mindustry/ui/dialogs/RestartDialog.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package io.anuke.mindustry.ui.dialogs;
-
-import io.anuke.arc.Core;
-import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.game.Team;
-
-import static io.anuke.mindustry.Vars.*;
-
-public class RestartDialog extends FloatingDialog{
-    private Team winner;
-
-    public RestartDialog(){
-        super("$gameover");
-        setFillParent(false);
-        shown(this::rebuild);
-    }
-
-    public void show(Team winner){
-        this.winner = winner;
-        show();
-    }
-
-    void rebuild(){
-        buttons.clear();
-        cont.clear();
-
-        buttons.margin(10);
-
-        if(state.rules.pvp){
-            cont.add(Core.bundle.format("gameover.pvp",winner.localized())).pad(6);
-            buttons.addButton("$menu", () -> {
-                hide();
-                state.set(State.menu);
-                logic.reset();
-            }).size(130f, 60f);
-        }else{
-            if(control.isHighScore()){
-                cont.add("$highscore").pad(6);
-                cont.row();
-            }
-            cont.add(Core.bundle.format("wave.lasted", state.wave)).pad(12);
-
-            buttons.addButton("$menu", () -> {
-                hide();
-                state.set(State.menu);
-                logic.reset();
-            }).size(130f, 60f);
-        }
-    }
-}
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
index 7a06ff5240..c54b1c8b3f 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -126,7 +126,7 @@ public class SettingsMenuDialog extends SettingsDialog{
         if(mobile){
             game.checkPref("autotarget", true);
         }
-        game.sliderPref("saveinterval", 120, 10, 5 * 120, i -> Core.bundle.format("setting.seconds", i));
+        game.sliderPref("saveinterval", 60, 10, 5 * 120, i -> Core.bundle.format("setting.seconds", i));
 
         if(!mobile){
             game.checkPref("crashreport", true);
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index 5e2ac59189..b272ad3ad6 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -3,6 +3,7 @@ package io.anuke.mindustry.world.blocks;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.arc.Core;
+import io.anuke.arc.Events;
 import io.anuke.arc.Graphics.Cursor;
 import io.anuke.arc.Graphics.Cursor.SystemCursor;
 import io.anuke.arc.entities.Effects;
@@ -15,6 +16,7 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.entities.effect.RubbleDecal;
 import io.anuke.mindustry.entities.traits.BuilderTrait.BuildRequest;
+import io.anuke.mindustry.game.EventType.BlockBuildEndEvent;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Layer;
@@ -46,8 +48,10 @@ public class BuildBlock extends Block{
 
     @Remote(called = Loc.server)
     public static void onDeconstructFinish(Tile tile, Block block){
+        Team team = tile.getTeam();
         Effects.effect(Fx.breakBlock, tile.drawx(), tile.drawy(), block.size);
         world.removeBlock(tile);
+        Events.fire(new BlockBuildEndEvent(tile, team, true));
     }
 
     @Remote(called = Loc.server)
@@ -64,6 +68,7 @@ public class BuildBlock extends Block{
             //event first before they can recieve the placed() event modification results
             Core.app.post(() -> tile.block().playerPlaced(tile));
         }
+        Core.app.post(() -> Events.fire(new BlockBuildEndEvent(tile, team, false)));
     }
 
     @Override
diff --git a/tools/build.gradle b/tools/build.gradle
index 84e5e620df..92737431f7 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -162,7 +162,7 @@ task scaleSprites(){
 
 task pack(){
     dependsOn 'cleanSprites', 'scaleSprites'
-    finalizedBy 'cleanup'
+    //finalizedBy 'cleanup'
 
     doLast{
 
@@ -189,8 +189,7 @@ task cleanup(){
 }
 
 task cleanSprites(){
-    finalizedBy 'cleanup'
-    
+
     doLast{
         delete{
             delete "../core/assets-raw/sprites_out/"