diff --git a/core/assets-raw/sprites/units/dagger.png b/core/assets-raw/sprites/units/dagger.png
index a99eedc521..2fa4b1464d 100644
Binary files a/core/assets-raw/sprites/units/dagger.png and b/core/assets-raw/sprites/units/dagger.png differ
diff --git a/core/assets-raw/sprites/units/phantom.png b/core/assets-raw/sprites/units/phantom.png
index 173b2c991b..33df9c8438 100644
Binary files a/core/assets-raw/sprites/units/phantom.png and b/core/assets-raw/sprites/units/phantom.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index c2bb9c098c..a652c04d58 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -20,7 +20,7 @@ mend-projector-top
   index: -1
 mender-top
   rotate: false
-  xy: 1993, 951
+  xy: 1731, 285
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -34,35 +34,35 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1969, 475
+  xy: 1975, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1731, 431
+  xy: 1823, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1697, 363
+  xy: 1705, 685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1731, 363
+  xy: 1705, 651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1765, 533
+  xy: 1705, 617
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -83,448 +83,448 @@ block-armored-conveyor-full
   index: -1
 armored-conveyor-0-1
   rotate: false
-  xy: 1693, 839
+  xy: 1867, 1091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-2
   rotate: false
-  xy: 1731, 877
+  xy: 1371, 1648
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-3
   rotate: false
-  xy: 1371, 1648
+  xy: 1901, 1091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 1765, 877
+  xy: 1371, 1614
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 1371, 1614
+  xy: 1935, 1091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 1799, 877
+  xy: 1735, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 1833, 881
+  xy: 1769, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 2012, 1941
+  xy: 1969, 1091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 1405, 1593
+  xy: 2003, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 1861, 919
+  xy: 1803, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 1867, 885
+  xy: 1837, 839
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 651, 547
+  xy: 2012, 1941
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 685, 547
+  xy: 1855, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 719, 547
+  xy: 1889, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 753, 547
+  xy: 1923, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 670, 513
+  xy: 1957, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 670, 479
+  xy: 1991, 1057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 704, 513
+  xy: 1405, 1593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 738, 513
+  xy: 651, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1787, 775
+  xy: 1739, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1771, 737
+  xy: 1739, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1771, 703
+  xy: 1773, 699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1789, 669
+  xy: 1773, 665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1789, 635
+  xy: 1807, 699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1789, 601
+  xy: 1773, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1789, 567
+  xy: 1807, 665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1799, 533
+  xy: 1841, 699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1799, 499
+  xy: 1773, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1799, 465
+  xy: 1807, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1799, 431
+  xy: 1841, 665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1799, 397
+  xy: 1773, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1799, 363
+  xy: 1807, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1821, 775
+  xy: 1841, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1805, 741
+  xy: 1773, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1805, 707
+  xy: 1807, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1839, 741
+  xy: 1841, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1839, 707
+  xy: 1773, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1823, 673
+  xy: 1807, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 1959, 819
+  xy: 1901, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 1993, 815
+  xy: 1901, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 1959, 785
+  xy: 1873, 919
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 1993, 781
+  xy: 1799, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 1941, 751
+  xy: 1833, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 1941, 717
+  xy: 1867, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1969, 441
+  xy: 2009, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1969, 407
+  xy: 1905, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1969, 373
+  xy: 1939, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1969, 339
+  xy: 1973, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1969, 305
+  xy: 2007, 853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1969, 271
+  xy: 1923, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 2003, 577
+  xy: 1957, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 2003, 543
+  xy: 1991, 819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 2003, 509
+  xy: 1941, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 2003, 475
+  xy: 1975, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 2003, 441
+  xy: 1959, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 2003, 407
+  xy: 2009, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 2003, 373
+  xy: 1993, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 2003, 339
+  xy: 1977, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 2003, 305
+  xy: 1977, 683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 2003, 271
+  xy: 1977, 649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 806, 545
+  xy: 1977, 615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 806, 511
+  xy: 1977, 581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 840, 545
+  xy: 1977, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 1833, 367
+  xy: 1875, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -559,28 +559,28 @@ mass-driver-base
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1993, 883
+  xy: 1867, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1959, 853
+  xy: 1901, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1993, 849
+  xy: 1901, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 840, 511
+  xy: 1977, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -755,28 +755,28 @@ water-extractor-top
   index: -1
 block-border
   rotate: false
-  xy: 738, 445
+  xy: 670, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1619, 643
+  xy: 1635, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1595, 541
+  xy: 1907, 775
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1867, 817
+  xy: 1663, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -790,175 +790,175 @@ place-arrow
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1731, 397
+  xy: 1857, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1731, 397
+  xy: 1857, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1629, 363
+  xy: 1891, 737
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1663, 363
+  xy: 1925, 741
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1765, 465
+  xy: 1705, 549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1765, 431
+  xy: 1705, 515
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1765, 397
+  xy: 1671, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1765, 363
+  xy: 1705, 481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1765, 363
+  xy: 1705, 481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1765, 363
+  xy: 1705, 481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1765, 363
+  xy: 1705, 481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1799, 843
+  xy: 1663, 439
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1833, 813
+  xy: 1629, 363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1799, 809
+  xy: 1663, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1727, 839
+  xy: 1739, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1727, 805
+  xy: 1739, 659
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1727, 805
+  xy: 1739, 659
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1761, 843
+  xy: 1739, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1761, 809
+  xy: 1739, 591
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1753, 771
+  xy: 1739, 557
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1993, 1053
+  xy: 1799, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1901, 303
+  xy: 1799, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1935, 307
+  xy: 1833, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1959, 1023
+  xy: 1799, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1993, 1019
+  xy: 1833, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -986,119 +986,119 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1959, 921
+  xy: 1765, 285
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1993, 917
+  xy: 1799, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1959, 887
+  xy: 1833, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1975, 747
+  xy: 1901, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1975, 713
+  xy: 1943, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 2009, 747
+  xy: 1935, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 2009, 713
+  xy: 1935, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1959, 679
+  xy: 1935, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1959, 645
+  xy: 1935, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1993, 679
+  xy: 1969, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1959, 611
+  xy: 1969, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1993, 611
+  xy: 1969, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1829, 1091
+  xy: 1935, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1863, 1091
+  xy: 1969, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1897, 1091
+  xy: 1889, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1855, 1057
+  xy: 1923, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1889, 1057
+  xy: 1957, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1161,14 +1161,14 @@ trident-ship-pad
   index: -1
 battery
   rotate: false
-  xy: 704, 479
+  xy: 685, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-battery-full
   rotate: false
-  xy: 704, 479
+  xy: 685, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1196,14 +1196,14 @@ battery-large-top
   index: -1
 battery-top
   rotate: false
-  xy: 738, 479
+  xy: 719, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1765, 499
+  xy: 1705, 583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1224,14 +1224,14 @@ differential-generator-top
   index: -1
 diode-arrow
   rotate: false
-  xy: 1857, 673
+  xy: 1875, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1867, 537
+  xy: 1909, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1287,14 +1287,14 @@ impact-reactor-plasma-3
   index: -1
 power-source
   rotate: false
-  xy: 1993, 645
+  xy: 1969, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1906, 955
+  xy: 1880, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1441,21 +1441,21 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1873, 1023
+  xy: 1991, 1023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1873, 989
+  xy: 1881, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1872, 955
+  xy: 1915, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1532,28 +1532,28 @@ rock2
   index: -1
 sand-boulder1
   rotate: false
-  xy: 1895, 921
+  xy: 1914, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 1923, 1057
+  xy: 1948, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 1969, 543
+  xy: 1907, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1969, 509
+  xy: 1941, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1574,21 +1574,21 @@ snowrock2
   index: -1
 spore-cluster1
   rotate: false
-  xy: 1697, 911
+  xy: 1831, 911
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 1739, 911
+  xy: 1743, 869
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 1781, 911
+  xy: 1785, 869
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -1609,7 +1609,7 @@ white-tree-dead
   index: -1
 unloader-center
   rotate: false
-  xy: 874, 545
+  xy: 1977, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1623,7 +1623,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 670, 445
+  xy: 753, 547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1700,7 +1700,7 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 1901, 853
+  xy: 1907, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1847,7 +1847,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1907, 989
+  xy: 1983, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1896,14 +1896,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1857, 639
+  xy: 1875, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 insulator-wall
   rotate: false
-  xy: 1867, 503
+  xy: 1909, 601
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1959,28 +1959,28 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1901, 819
+  xy: 1941, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1923, 785
+  xy: 1975, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1969, 577
+  xy: 2009, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1969, 577
+  xy: 2009, 921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2001,7 +2001,7 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 1959, 593
+  xy: 204, 643
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -2029,7 +2029,7 @@ circle-shadow
   index: -1
 error
   rotate: false
-  xy: 1993, 1245
+  xy: 1993, 1295
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -2078,7 +2078,7 @@ missile-back
   index: -1
 particle
   rotate: false
-  xy: 1830, 953
+  xy: 1789, 911
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -2092,14 +2092,14 @@ scale_marker
   index: -1
 shell
   rotate: false
-  xy: 1823, 915
+  xy: 1827, 873
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 1693, 873
+  xy: 1829, 1087
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
@@ -2113,14 +2113,14 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 806, 477
+  xy: 1977, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 418, 438
+  xy: 1493, 548
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
@@ -2134,7 +2134,7 @@ arc
   index: -1
 block-arc-full
   rotate: false
-  xy: 704, 445
+  xy: 670, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2176,49 +2176,49 @@ block-launcher
   index: -1
 block-bridge-conduit-full
   rotate: false
-  xy: 717, 411
+  xy: 704, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 717, 411
+  xy: 704, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-bridge-conveyor-full
   rotate: false
-  xy: 717, 377
+  xy: 738, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 717, 377
+  xy: 738, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-char-full
   rotate: false
-  xy: 717, 343
+  xy: 704, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliff-full
   rotate: false
-  xy: 717, 309
+  xy: 738, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 717, 275
+  xy: 670, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2239,21 +2239,21 @@ coal-centrifuge
   index: -1
 block-combustion-generator-full
   rotate: false
-  xy: 717, 241
+  xy: 704, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 717, 241
+  xy: 704, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conduit-full
   rotate: false
-  xy: 717, 207
+  xy: 738, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2274,28 +2274,28 @@ container
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 717, 173
+  xy: 717, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 717, 173
+  xy: 717, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-full
   rotate: false
-  xy: 751, 411
+  xy: 717, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 751, 411
+  xy: 717, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2358,7 +2358,7 @@ core-shard
   index: -1
 block-craters-full
   rotate: false
-  xy: 751, 377
+  xy: 717, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2386,77 +2386,77 @@ block-cyclone-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 751, 343
+  xy: 717, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-1-full
   rotate: false
-  xy: 751, 309
+  xy: 717, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-2-full
   rotate: false
-  xy: 751, 275
+  xy: 717, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-3-full
   rotate: false
-  xy: 751, 241
+  xy: 717, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-4-full
   rotate: false
-  xy: 751, 207
+  xy: 717, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-5-full
   rotate: false
-  xy: 751, 173
+  xy: 751, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-6-full
   rotate: false
-  xy: 772, 513
+  xy: 751, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 772, 479
+  xy: 751, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-full
   rotate: false
-  xy: 772, 445
+  xy: 751, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-water-full
   rotate: false
-  xy: 785, 411
+  xy: 751, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-deepwater-full
   rotate: false
-  xy: 785, 377
+  xy: 751, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2477,14 +2477,14 @@ differential-generator
   index: -1
 block-diode-full
   rotate: false
-  xy: 785, 343
+  xy: 751, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode
   rotate: false
-  xy: 785, 343
+  xy: 751, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2505,14 +2505,14 @@ distributor
   index: -1
 block-door-full
   rotate: false
-  xy: 785, 309
+  xy: 751, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 785, 309
+  xy: 751, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2533,14 +2533,14 @@ door-large
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 785, 275
+  xy: 772, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 785, 241
+  xy: 772, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2582,7 +2582,7 @@ graphite-press
   index: -1
 block-grass-full
   rotate: false
-  xy: 785, 207
+  xy: 772, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2596,63 +2596,63 @@ block-ground-factory-full
   index: -1
 block-hail-full
   rotate: false
-  xy: 785, 173
+  xy: 785, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1693, 805
+  xy: 785, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 759, 139
+  xy: 785, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 759, 105
+  xy: 785, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 759, 71
+  xy: 785, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 793, 139
+  xy: 785, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 793, 105
+  xy: 785, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-illuminator-full
   rotate: false
-  xy: 793, 71
+  xy: 785, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 793, 71
+  xy: 785, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2666,70 +2666,70 @@ block-impact-reactor-full
   index: -1
 block-incinerator-full
   rotate: false
-  xy: 765, 37
+  xy: 759, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 765, 37
+  xy: 759, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-inverted-sorter-full
   rotate: false
-  xy: 765, 3
+  xy: 759, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter
   rotate: false
-  xy: 765, 3
+  xy: 759, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-source-full
   rotate: false
-  xy: 799, 37
+  xy: 759, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 799, 37
+  xy: 759, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-void-full
   rotate: false
-  xy: 799, 3
+  xy: 793, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 799, 3
+  xy: 793, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-junction-full
   rotate: false
-  xy: 1685, 771
+  xy: 793, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1685, 771
+  xy: 793, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2792,35 +2792,35 @@ launch-pad-large
   index: -1
 block-liquid-junction-full
   rotate: false
-  xy: 1585, 695
+  xy: 793, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1585, 695
+  xy: 793, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 1585, 661
+  xy: 765, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-source-full
   rotate: false
-  xy: 1585, 627
+  xy: 765, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 1585, 627
+  xy: 765, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2834,21 +2834,21 @@ block-liquid-tank-full
   index: -1
 block-liquid-void-full
   rotate: false
-  xy: 1585, 593
+  xy: 799, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1585, 593
+  xy: 799, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 1527, 553
+  xy: 799, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2883,14 +2883,14 @@ block-mechanical-drill-full
   index: -1
 block-mechanical-pump-full
   rotate: false
-  xy: 1527, 519
+  xy: 1535, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1527, 519
+  xy: 1535, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2904,14 +2904,14 @@ block-meltdown-full
   index: -1
 block-melter-full
   rotate: false
-  xy: 1527, 485
+  xy: 1535, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1527, 485
+  xy: 1535, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2932,70 +2932,70 @@ mend-projector
   index: -1
 block-mender-full
   rotate: false
-  xy: 1527, 451
+  xy: 1535, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender
   rotate: false
-  xy: 1527, 451
+  xy: 1535, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-message-full
   rotate: false
-  xy: 1527, 417
+  xy: 1535, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1527, 417
+  xy: 1535, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-2-full
   rotate: false
-  xy: 1635, 745
+  xy: 1527, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-3-full
   rotate: false
-  xy: 1669, 737
+  xy: 1527, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-5-full
   rotate: false
-  xy: 1635, 711
+  xy: 1527, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 1669, 703
+  xy: 1527, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-full
   rotate: false
-  xy: 1619, 677
+  xy: 1585, 695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1619, 609
+  xy: 1685, 795
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3023,42 +3023,42 @@ block-oil-extractor-full
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 1653, 669
+  xy: 1719, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1653, 635
+  xy: 1753, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1653, 601
+  xy: 1787, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1619, 575
+  xy: 1821, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1653, 567
+  xy: 1855, 805
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1703, 737
+  xy: 1865, 877
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3079,63 +3079,63 @@ overdrive-projector
   index: -1
 block-overflow-gate-full
   rotate: false
-  xy: 1703, 703
+  xy: 1871, 843
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 1703, 703
+  xy: 1871, 843
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1687, 669
+  xy: 1889, 809
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conduit-full
   rotate: false
-  xy: 1687, 635
+  xy: 1569, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1687, 635
+  xy: 1569, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conveyor-full
   rotate: false
-  xy: 1687, 601
+  xy: 1569, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1687, 601
+  xy: 1569, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-full
   rotate: false
-  xy: 1687, 567
+  xy: 1569, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1687, 567
+  xy: 1569, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3184,14 +3184,14 @@ plastanium-compressor
   index: -1
 block-plastanium-wall-full
   rotate: false
-  xy: 1719, 771
+  xy: 1569, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1719, 771
+  xy: 1569, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3212,7 +3212,7 @@ plastanium-wall-large
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1721, 669
+  xy: 1561, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3226,14 +3226,14 @@ block-pneumatic-drill-full
   index: -1
 block-power-node-full
   rotate: false
-  xy: 1721, 635
+  xy: 1561, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 1721, 635
+  xy: 1561, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3254,35 +3254,35 @@ power-node-large
   index: -1
 block-power-source-full
   rotate: false
-  xy: 1721, 601
+  xy: 1561, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-void-full
   rotate: false
-  xy: 1721, 567
+  xy: 1561, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1721, 567
+  xy: 1561, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1737, 737
+  xy: 1619, 703
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1737, 703
+  xy: 1669, 753
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3303,7 +3303,7 @@ pyratite-mixer
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1755, 669
+  xy: 1603, 661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3324,7 +3324,7 @@ block-rock-full
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1755, 635
+  xy: 1603, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3345,14 +3345,14 @@ rotary-pump
   index: -1
 block-router-full
   rotate: false
-  xy: 1755, 601
+  xy: 1603, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1755, 601
+  xy: 1603, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3373,14 +3373,14 @@ rtg-generator
   index: -1
 block-salt-full
   rotate: false
-  xy: 1755, 567
+  xy: 1603, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1833, 847
+  xy: 1653, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3394,28 +3394,28 @@ block-salvo-full
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1867, 851
+  xy: 1703, 761
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1561, 559
+  xy: 1737, 767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-water-full
   rotate: false
-  xy: 1561, 525
+  xy: 1771, 767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1561, 491
+  xy: 1805, 767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3429,21 +3429,21 @@ block-scatter-full
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1561, 457
+  xy: 1839, 767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1561, 423
+  xy: 1873, 771
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1561, 423
+  xy: 1873, 771
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3499,35 +3499,35 @@ separator
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1595, 507
+  xy: 1637, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1595, 473
+  xy: 1637, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1595, 439
+  xy: 1637, 601
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shock-mine-full
   rotate: false
-  xy: 1595, 405
+  xy: 1637, 567
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1561, 389
+  xy: 1603, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3548,49 +3548,49 @@ silicon-smelter
   index: -1
 block-slag-full
   rotate: false
-  xy: 1595, 371
+  xy: 1637, 533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 1629, 533
+  xy: 1595, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-pine-full
   rotate: false
-  xy: 1679, 1087
+  xy: 1335, 568
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrock-full
   rotate: false
-  xy: 1335, 568
+  xy: 1729, 1087
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1629, 499
+  xy: 1595, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-solar-panel-full
   rotate: false
-  xy: 1663, 533
+  xy: 1595, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1663, 533
+  xy: 1595, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3611,21 +3611,21 @@ solar-panel-large
   index: -1
 block-sorter-full
   rotate: false
-  xy: 1629, 465
+  xy: 1595, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1629, 465
+  xy: 1595, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spawn-full
   rotate: false
-  xy: 1663, 499
+  xy: 1687, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3646,14 +3646,14 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1697, 533
+  xy: 1671, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-pine-full
   rotate: false
-  xy: 1729, 1087
+  xy: 1779, 1087
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -3667,14 +3667,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1629, 431
+  xy: 1671, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1663, 465
+  xy: 1671, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3695,14 +3695,14 @@ surge-tower
   index: -1
 block-surge-wall-full
   rotate: false
-  xy: 1697, 499
+  xy: 1671, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1697, 499
+  xy: 1671, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3730,21 +3730,21 @@ block-swarmer-full
   index: -1
 block-tainted-water-full
   rotate: false
-  xy: 1731, 533
+  xy: 1671, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tar-full
   rotate: false
-  xy: 1629, 397
+  xy: 1637, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1663, 431
+  xy: 1671, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3793,14 +3793,14 @@ thorium-reactor
   index: -1
 block-thorium-wall-full
   rotate: false
-  xy: 1697, 465
+  xy: 1629, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 1697, 465
+  xy: 1629, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3835,28 +3835,28 @@ thruster
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1731, 499
+  xy: 1629, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1731, 499
+  xy: 1629, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-full
   rotate: false
-  xy: 1663, 397
+  xy: 1629, 397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall
   rotate: false
-  xy: 1663, 397
+  xy: 1629, 397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3891,21 +3891,21 @@ turbine-generator
   index: -1
 block-underflow-gate-full
   rotate: false
-  xy: 1697, 431
+  xy: 1721, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-unloader-full
   rotate: false
-  xy: 1731, 465
+  xy: 1755, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1731, 465
+  xy: 1755, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3933,7 +3933,7 @@ block-water-extractor-full
   index: -1
 block-water-full
   rotate: false
-  xy: 1697, 397
+  xy: 1789, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3961,56 +3961,56 @@ block-white-tree-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1823, 639
+  xy: 1841, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1823, 605
+  xy: 1807, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1823, 571
+  xy: 1841, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1833, 537
+  xy: 1841, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1833, 503
+  xy: 1875, 699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1833, 469
+  xy: 1875, 665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 1833, 435
+  xy: 1875, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 1833, 401
+  xy: 1875, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4248,7 +4248,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1857, 605
+  xy: 1909, 703
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4262,21 +4262,21 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1857, 571
+  xy: 1909, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 1543, 687
+  xy: 1493, 637
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1867, 435
+  xy: 1909, 533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4297,21 +4297,21 @@ item-blast-compound-tiny
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 1443, 648
+  xy: 1393, 589
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 1593, 737
+  xy: 1543, 687
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1867, 367
+  xy: 1943, 707
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4325,28 +4325,28 @@ item-coal-small
   index: -1
 item-coal-tiny
   rotate: false
-  xy: 1595, 575
+  xy: 1977, 401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 1385, 589
+  xy: 1443, 598
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 1643, 787
+  xy: 1593, 737
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1873, 745
+  xy: 1943, 639
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4360,7 +4360,7 @@ item-copper-small
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 1855, 1039
+  xy: 521, 1547
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4374,14 +4374,14 @@ item-copper-xlarge
   index: -1
 item-graphite-large
   rotate: false
-  xy: 783, 1481
+  xy: 1643, 787
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1891, 677
+  xy: 1943, 571
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4395,7 +4395,7 @@ item-graphite-small
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 521, 1547
+  xy: 539, 1547
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4409,14 +4409,14 @@ item-graphite-xlarge
   index: -1
 item-lead-large
   rotate: false
-  xy: 1543, 645
+  xy: 1693, 837
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1891, 609
+  xy: 1943, 503
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4430,28 +4430,28 @@ item-lead-small
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 539, 1547
+  xy: 557, 1547
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1993, 1087
+  xy: 1443, 548
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 1493, 587
+  xy: 783, 1481
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1901, 541
+  xy: 1739, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4465,28 +4465,28 @@ item-metaglass-small
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 557, 1547
+  xy: 559, 1132
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1443, 598
+  xy: 1435, 498
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 1485, 545
+  xy: 1493, 595
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1901, 473
+  xy: 1807, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4500,28 +4500,28 @@ item-phase-fabric-small
   index: -1
 item-phase-fabric-tiny
   rotate: false
-  xy: 1941, 1039
+  xy: 1837, 1371
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1435, 548
+  xy: 1435, 448
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 1485, 503
+  xy: 1493, 553
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1901, 405
+  xy: 1875, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4535,28 +4535,28 @@ item-plastanium-small
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 1941, 1021
+  xy: 1425, 1372
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1435, 498
+  xy: 1505, 1029
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 1485, 461
+  xy: 628, 499
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1889, 783
+  xy: 1943, 469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4570,259 +4570,259 @@ item-pyratite-small
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 1941, 1003
+  xy: 1388, 1869
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1435, 448
+  xy: 1555, 1029
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 628, 499
+  xy: 628, 457
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1907, 715
+  xy: 1697, 379
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1931, 1099
+  xy: 1977, 419
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 1941, 985
+  xy: 2012, 1923
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1505, 1029
+  xy: 1605, 1029
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 628, 457
+  xy: 1485, 506
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1959, 1091
+  xy: 1697, 345
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 806, 451
+  xy: 1243, 1208
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 559, 1132
+  xy: 787, 563
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1555, 1029
+  xy: 1655, 1029
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1543, 603
+  xy: 1485, 464
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1925, 613
+  xy: 1773, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 874, 519
+  xy: 392, 391
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 1837, 1371
+  xy: 717, 155
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1605, 1029
+  xy: 1705, 1029
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 1485, 419
+  xy: 1485, 422
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1935, 545
+  xy: 1841, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 840, 485
+  xy: 2011, 725
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 1425, 1372
+  xy: 583, 935
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 1655, 1029
+  xy: 1755, 1037
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 1705, 995
+  xy: 1755, 995
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1935, 477
+  xy: 1909, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 908, 553
+  xy: 2011, 699
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 1388, 1869
+  xy: 2011, 525
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 1705, 1037
+  xy: 1805, 1037
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 1747, 995
+  xy: 1797, 995
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1935, 409
+  xy: 1731, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1243, 1208
+  xy: 2011, 673
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 2012, 1923
+  xy: 559, 1114
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 1755, 1037
+  xy: 1504, 979
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 1789, 995
+  xy: 1839, 995
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1833, 333
+  xy: 1697, 311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 392, 391
+  xy: 2011, 647
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 717, 155
+  xy: 1837, 1353
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 1805, 1037
+  xy: 1554, 979
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4836,140 +4836,140 @@ lancer
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 1831, 995
+  xy: 1754, 953
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1901, 337
+  xy: 1765, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 1929, 929
+  xy: 2011, 621
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 787, 563
+  xy: 1425, 1354
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 1654, 979
+  xy: 1497, 929
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1704, 953
+  xy: 1796, 953
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1959, 1057
+  xy: 1765, 319
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 832, 451
+  xy: 2011, 595
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 583, 935
+  xy: 1388, 1851
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 1497, 929
+  xy: 1547, 929
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 1746, 953
+  xy: 1838, 953
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1959, 989
+  xy: 1833, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 819, 425
+  xy: 2011, 569
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 819, 381
+  xy: 735, 155
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 1547, 929
+  xy: 1597, 929
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 1788, 953
+  xy: 1747, 911
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1959, 955
+  xy: 1867, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 819, 399
+  xy: 2011, 543
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 559, 1114
+  xy: 2011, 507
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 1597, 929
+  xy: 1647, 929
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4990,7 +4990,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1907, 1023
+  xy: 1949, 989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5018,7 +5018,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 1901, 887
+  xy: 1982, 955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5060,140 +5060,140 @@ wave
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1867, 469
+  xy: 1909, 567
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1867, 401
+  xy: 1909, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1855, 779
+  xy: 1943, 673
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1873, 711
+  xy: 1943, 605
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1891, 643
+  xy: 1943, 537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1891, 575
+  xy: 1705, 447
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1901, 507
+  xy: 1773, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1901, 439
+  xy: 1841, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1901, 371
+  xy: 1909, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1907, 749
+  xy: 1697, 413
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1925, 681
+  xy: 1663, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1925, 647
+  xy: 1739, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1925, 579
+  xy: 1807, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1935, 511
+  xy: 1875, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1935, 443
+  xy: 1943, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1935, 375
+  xy: 1731, 353
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1867, 333
+  xy: 1731, 319
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1935, 341
+  xy: 1765, 353
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1935, 273
+  xy: 1867, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1993, 985
+  xy: 1867, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5263,28 +5263,28 @@ chaos-array-leg
   index: -1
 crawler
   rotate: false
-  xy: 1393, 839
+  xy: 1393, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 1393, 789
+  xy: 1393, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 1393, 739
+  xy: 1393, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 1393, 689
+  xy: 1393, 639
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5326,14 +5326,14 @@ delta-base
   index: -1
 delta-leg
   rotate: false
-  xy: 1993, 1345
+  xy: 1443, 648
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug
   rotate: false
-  xy: 1993, 1295
+  xy: 1993, 1345
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5424,14 +5424,14 @@ glaive
   index: -1
 javelin
   rotate: false
-  xy: 1504, 979
+  xy: 1604, 979
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-shield
   rotate: false
-  xy: 1554, 979
+  xy: 1654, 979
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5478,13 +5478,20 @@ phantom
   orig: 56, 56
   offset: 0, 0
   index: -1
-power-cell
+phantom-cell
   rotate: false
   xy: 1563, 1079
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
+power-cell
+  rotate: false
+  xy: 1335, 676
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
 reaper
   rotate: false
   xy: 1, 1547
@@ -5508,7 +5515,7 @@ spirit
   index: -1
 tau
   rotate: false
-  xy: 1335, 676
+  xy: 1621, 1079
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5543,7 +5550,7 @@ titan-leg
   index: -1
 trident
   rotate: false
-  xy: 1621, 1079
+  xy: 1335, 618
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5557,14 +5564,14 @@ vanguard
   index: -1
 wraith
   rotate: false
-  xy: 1493, 629
+  xy: 1693, 879
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery-equip
   rotate: false
-  xy: 1335, 618
+  xy: 1679, 1079
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
@@ -5578,21 +5585,21 @@ blaster-equip
   index: -1
 bomber-equip
   rotate: false
-  xy: 1779, 1087
+  xy: 1393, 889
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 1779, 1087
+  xy: 1393, 889
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 1393, 889
+  xy: 1393, 839
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5613,42 +5620,42 @@ eradication-equip
   index: -1
 eruption-equip
   rotate: false
-  xy: 1993, 1187
+  xy: 1993, 1237
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 1993, 1137
+  xy: 1993, 1187
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 1335, 510
+  xy: 1993, 1129
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 1393, 639
+  xy: 1335, 518
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles-equip
   rotate: false
-  xy: 1604, 979
+  xy: 1704, 979
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun-equip
   rotate: false
-  xy: 1647, 929
+  xy: 1697, 929
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 741afc6c19..e0e2c21acf 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png
index 038990e873..860218555d 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/src/mindustry/entities/Effect.java b/core/src/mindustry/entities/Effect.java
index b1dd73ed69..37640b577b 100644
--- a/core/src/mindustry/entities/Effect.java
+++ b/core/src/mindustry/entities/Effect.java
@@ -5,6 +5,7 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.math.geom.*;
+import mindustry.graphics.*;
 
 public class Effect{
     private static final EffectContainer container = new EffectContainer();
@@ -75,6 +76,7 @@ public class Effect{
 
     public void render(int id, Color color, float life, float rotation, float x, float y, Object data){
         container.set(id, color, life, lifetime, rotation, x, y, data);
+        Draw.z(ground ? Layer.debris : Layer.effect);
         renderer.get(container);
         Draw.reset();
     }
diff --git a/core/src/mindustry/entities/def/EffectComp.java b/core/src/mindustry/entities/def/EffectComp.java
index 38d28caa4c..e1b72844de 100644
--- a/core/src/mindustry/entities/def/EffectComp.java
+++ b/core/src/mindustry/entities/def/EffectComp.java
@@ -16,7 +16,6 @@ abstract class EffectComp implements Posc, Drawc, Timedc, Rotc, Childc{
 
     @Override
     public void draw(){
-        Draw.z(Layer.effect);
         effect.render(id(), color, time(), rotation(), x(), y(), data);
     }
 
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 6049ae9fd8..084a10eac7 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -120,13 +120,17 @@ public class UnitType extends UnlockableContent{
             drawShadow(unit);
         }
 
-        Draw.z(Mathf.lerp(Layer.groundUnit, Layer.flyingUnit, unit.elevation()));
+        float z = Mathf.lerp(Layer.groundUnit, Layer.flyingUnit, unit.elevation());
 
+        Draw.z(z - 0.02f);
         if(unit instanceof Legsc){
             drawLegs((Legsc)unit);
         }
 
+        Draw.z(z - 0.01f);
         drawOcclusion(unit);
+
+        Draw.z(z);
         drawEngine(unit);
         drawBody(unit);
         drawWeapons(unit);
@@ -185,7 +189,7 @@ public class UnitType extends UnlockableContent{
     public void drawEngine(Unitc unit){
         if(!unit.isFlying()) return;
 
-        Draw.color(unit.team().color, Color.white, 0f);
+        Draw.color(unit.team().color);
         Fill.circle(
             unit.x() + Angles.trnsx(unit.rotation() + 180, engineOffset),
             unit.y() + Angles.trnsy(unit.rotation() + 180, engineOffset),
@@ -211,13 +215,14 @@ public class UnitType extends UnlockableContent{
 
                 float rotation = unit.rotation() - 90;
                 float weaponRotation  = rotation + (weapon.rotate ? mount.rotation : 0);
-                float trY = weapon.y;
                 float width = i > 0 ? -weapon.region.getWidth() : weapon.region.getWidth();
                 float recoil = -(mount.reload / weapon.reload * weapon.recoil) * (weapon.alternate ? Mathf.num(i == Mathf.sign(mount.side)) : 1);
 
+                if(weapon.mirror) rotation = weaponRotation;
+
                 Draw.rect(weapon.region,
-                unit.x() + Angles.trnsx(rotation, weapon.x * i, trY) + Angles.trnsx(weaponRotation, 0, recoil),
-                unit.y() + Angles.trnsy(rotation, weapon.x * i, trY) + Angles.trnsy(weaponRotation, 0, recoil),
+                unit.x() + Angles.trnsx(rotation, weapon.x * i, weapon.y) + Angles.trnsx(weaponRotation, 0, recoil),
+                unit.y() + Angles.trnsy(rotation, weapon.x * i, weapon.y) + Angles.trnsy(weaponRotation, 0, recoil),
                 width * Draw.scl,
                 weapon.region.getHeight() * Draw.scl,
                 weaponRotation);