diff --git a/core/assets-raw/sprites/units/power-cell.png b/core/assets-raw/sprites/units/power-cell.png
index 1e99e1a211..04a09f93f3 100644
Binary files a/core/assets-raw/sprites/units/power-cell.png and b/core/assets-raw/sprites/units/power-cell.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 4b04b68b6c..5061578d31 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: 1403, 87
+  xy: 1754, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -34,133 +34,133 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1651, 1197
+  xy: 1709, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1379, 733
+  xy: 1920, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1379, 597
+  xy: 1954, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1379, 563
+  xy: 1988, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1379, 529
+  xy: 1954, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-0
   rotate: false
-  xy: 1236, 929
+  xy: 1278, 971
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-armored-conveyor-full
   rotate: false
-  xy: 1236, 929
+  xy: 1278, 971
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-1
   rotate: false
-  xy: 1278, 971
+  xy: 890, 851
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-2
   rotate: false
-  xy: 890, 851
+  xy: 1278, 937
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-3
   rotate: false
-  xy: 1236, 895
+  xy: 389, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 389, 15
+  xy: 423, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 423, 10
+  xy: 457, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 457, 10
+  xy: 491, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 491, 10
+  xy: 525, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 525, 10
+  xy: 559, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 559, 10
+  xy: 593, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 593, 10
+  xy: 627, 12
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 627, 12
+  xy: 661, 12
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 661, 12
+  xy: 1236, 887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -174,357 +174,357 @@ armored-conveyor-3-1
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 1224, 861
+  xy: 1312, 937
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 1209, 827
+  xy: 911, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 1209, 793
+  xy: 945, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 1209, 759
+  xy: 1278, 903
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 1209, 725
+  xy: 1312, 903
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 1209, 691
+  xy: 1209, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1413, 839
+  xy: 1954, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1413, 805
+  xy: 1988, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1413, 771
+  xy: 1368, 1035
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1413, 737
+  xy: 1402, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1413, 703
+  xy: 1436, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1413, 669
+  xy: 1470, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1413, 635
+  xy: 1504, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1413, 601
+  xy: 1301, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1413, 567
+  xy: 1335, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1413, 533
+  xy: 1369, 843
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1413, 499
+  xy: 1369, 809
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1440, 907
+  xy: 1538, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1421, 465
+  xy: 1572, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1421, 431
+  xy: 1606, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1421, 397
+  xy: 1640, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1421, 363
+  xy: 1674, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1421, 329
+  xy: 1708, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1421, 295
+  xy: 1742, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1447, 839
+  xy: 1776, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0-0
   rotate: false
-  xy: 1471, 159
+  xy: 1856, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1-0
   rotate: false
-  xy: 1437, 91
+  xy: 1890, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2-0
   rotate: false
-  xy: 1471, 125
+  xy: 1856, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-3-0
   rotate: false
-  xy: 1471, 91
+  xy: 1890, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-4-0
   rotate: false
-  xy: 1505, 227
+  xy: 1924, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-5-0
   rotate: false
-  xy: 1505, 193
+  xy: 1890, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-6-0
   rotate: false
-  xy: 1505, 159
+  xy: 1924, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1719, 1197
+  xy: 1709, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1753, 1197
+  xy: 1743, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1787, 1197
+  xy: 1777, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1821, 1197
+  xy: 1743, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1855, 1197
+  xy: 1777, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1889, 1197
+  xy: 1811, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1923, 1197
+  xy: 1777, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1957, 1197
+  xy: 1811, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1991, 1197
+  xy: 1845, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1436, 1053
+  xy: 1811, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1436, 1019
+  xy: 1845, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1448, 985
+  xy: 1879, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1448, 951
+  xy: 1845, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1481, 1163
+  xy: 1879, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1515, 1163
+  xy: 1913, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1549, 1163
+  xy: 1879, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1583, 1163
+  xy: 1913, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1617, 1163
+  xy: 1947, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1651, 1163
+  xy: 1913, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -538,21 +538,21 @@ mass-driver-base
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1437, 159
+  xy: 1822, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1471, 193
+  xy: 1856, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1437, 125
+  xy: 1822, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -727,28 +727,28 @@ water-extractor-top
   index: -1
 block-border
   rotate: false
-  xy: 1209, 555
+  xy: 1209, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1376, 1077
+  xy: 1546, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1319, 325
+  xy: 1818, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1387, 291
+  xy: 1682, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -874,175 +874,175 @@ rubble-8-1
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1379, 699
+  xy: 1954, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1379, 699
+  xy: 1954, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1379, 665
+  xy: 1988, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1379, 631
+  xy: 1920, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1387, 461
+  xy: 1988, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1387, 427
+  xy: 1546, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1387, 393
+  xy: 1580, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1387, 359
+  xy: 1614, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1387, 359
+  xy: 1614, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1387, 359
+  xy: 1614, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1387, 359
+  xy: 1614, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1387, 325
+  xy: 1648, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1402, 1043
+  xy: 1716, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1402, 1009
+  xy: 1750, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1414, 975
+  xy: 1784, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1414, 941
+  xy: 1818, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1414, 941
+  xy: 1818, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1406, 907
+  xy: 1852, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1394, 873
+  xy: 1886, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1428, 873
+  xy: 1920, 1027
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1335, 121
+  xy: 1652, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1369, 155
+  xy: 1686, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1335, 87
+  xy: 1720, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1369, 121
+  xy: 1686, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1369, 87
+  xy: 1720, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1070,133 +1070,133 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1437, 227
+  xy: 1788, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1437, 193
+  xy: 1822, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1471, 227
+  xy: 1788, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1505, 125
+  xy: 1958, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1505, 91
+  xy: 1924, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1301, 53
+  xy: 1958, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1335, 53
+  xy: 1992, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1369, 53
+  xy: 1958, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1403, 53
+  xy: 1992, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1437, 57
+  xy: 1992, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1471, 57
+  xy: 1505, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1295, 19
+  xy: 1505, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1329, 19
+  xy: 1539, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1363, 19
+  xy: 1539, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1397, 19
+  xy: 1573, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1413, 1189
+  xy: 1539, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1410, 1155
+  xy: 1573, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 1209, 657
+  xy: 1209, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-battery-full
   rotate: false
-  xy: 1209, 657
+  xy: 1209, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1217,7 +1217,7 @@ block-battery-large-full
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1379, 495
+  xy: 1988, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1238,14 +1238,14 @@ differential-generator-top
   index: -1
 diode-arrow
   rotate: false
-  xy: 1447, 533
+  xy: 1335, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1455, 431
+  xy: 1380, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1301,14 +1301,14 @@ impact-reactor-plasma-3
   index: -1
 power-source
   rotate: false
-  xy: 1505, 57
+  xy: 1505, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1444, 1087
+  xy: 1641, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1455,21 +1455,21 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1410, 1121
+  xy: 1607, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1410, 1087
+  xy: 1573, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1447, 1189
+  xy: 1607, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1525,7 +1525,7 @@ spore-press-top
   index: -1
 unloader-center
   rotate: false
-  xy: 1719, 1163
+  xy: 1981, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1539,7 +1539,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 1209, 623
+  xy: 1209, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1616,7 +1616,7 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 1515, 1197
+  xy: 1641, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1742,7 +1742,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1444, 1121
+  xy: 1607, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1791,14 +1791,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1447, 499
+  xy: 1369, 775
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 insulator-wall
   rotate: false
-  xy: 1455, 397
+  xy: 1380, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1854,42 +1854,42 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1549, 1197
+  xy: 1675, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1583, 1197
+  xy: 1709, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1617, 1197
+  xy: 1675, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1617, 1197
+  xy: 1675, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bullet
   rotate: false
-  xy: 1037, 7
+  xy: 1095, 7
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 bullet-back
   rotate: false
-  xy: 1091, 7
+  xy: 1149, 14
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
@@ -1910,7 +1910,7 @@ circle-end
   index: -1
 circle-mid
   rotate: false
-  xy: 2025, 1130
+  xy: 2022, 1030
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
@@ -1980,35 +1980,35 @@ scale_marker
   index: -1
 scorch1
   rotate: false
-  xy: 1478, 1061
+  xy: 1243, 673
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 1508, 1061
+  xy: 1243, 571
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 1538, 1061
+  xy: 1243, 469
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 1568, 1061
+  xy: 1251, 367
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 1598, 1061
+  xy: 1273, 673
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
@@ -2029,7 +2029,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 1685, 1197
+  xy: 1743, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2043,7 +2043,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1685, 1163
+  xy: 1947, 823
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2071,7 +2071,7 @@ arc
   index: -1
 block-arc-full
   rotate: false
-  xy: 1209, 589
+  xy: 1209, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2085,42 +2085,42 @@ block-blast-drill-full
   index: -1
 block-bridge-conduit-full
   rotate: false
-  xy: 1209, 521
+  xy: 1209, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1209, 521
+  xy: 1209, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-bridge-conveyor-full
   rotate: false
-  xy: 1209, 487
+  xy: 1209, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1209, 487
+  xy: 1209, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-char-full
   rotate: false
-  xy: 911, 11
+  xy: 1209, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 945, 11
+  xy: 1209, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2141,14 +2141,14 @@ coal-centrifuge
   index: -1
 block-combustion-generator-full
   rotate: false
-  xy: 1243, 827
+  xy: 1209, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 1243, 827
+  xy: 1209, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2169,7 +2169,7 @@ command-center
   index: -1
 block-conduit-full
   rotate: false
-  xy: 1243, 793
+  xy: 1209, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2190,28 +2190,28 @@ container
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 1243, 759
+  xy: 695, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1243, 759
+  xy: 695, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-full
   rotate: false
-  xy: 1243, 725
+  xy: 729, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 1243, 725
+  xy: 729, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2274,7 +2274,7 @@ core-shard
   index: -1
 block-craters-full
   rotate: false
-  xy: 1243, 691
+  xy: 763, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2316,70 +2316,70 @@ block-dagger-factory-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 1243, 657
+  xy: 1334, 1013
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-1-full
   rotate: false
-  xy: 1243, 623
+  xy: 1346, 979
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-2-full
   rotate: false
-  xy: 1243, 589
+  xy: 1346, 945
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-3-full
   rotate: false
-  xy: 1243, 555
+  xy: 1346, 911
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-4-full
   rotate: false
-  xy: 1243, 521
+  xy: 1270, 869
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-5-full
   rotate: false
-  xy: 1243, 487
+  xy: 1304, 869
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-6-full
   rotate: false
-  xy: 1258, 861
+  xy: 1346, 877
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 1277, 827
+  xy: 1342, 1181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-full
   rotate: false
-  xy: 1277, 793
+  xy: 1342, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-water-full
   rotate: false
-  xy: 1277, 759
+  xy: 1342, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2400,7 +2400,7 @@ dart-mech-pad
   index: -1
 block-deepwater-full
   rotate: false
-  xy: 1277, 725
+  xy: 1342, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2435,14 +2435,14 @@ differential-generator
   index: -1
 block-diode-full
   rotate: false
-  xy: 1277, 691
+  xy: 1376, 1205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode
   rotate: false
-  xy: 1277, 691
+  xy: 1376, 1205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2463,14 +2463,14 @@ distributor
   index: -1
 block-door-full
   rotate: false
-  xy: 1277, 657
+  xy: 1376, 1171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 1277, 657
+  xy: 1376, 1171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2498,14 +2498,14 @@ block-draug-factory-full
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 1277, 623
+  xy: 1376, 1137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 1277, 589
+  xy: 1376, 1103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2575,70 +2575,70 @@ graphite-press
   index: -1
 block-grass-full
   rotate: false
-  xy: 1277, 555
+  xy: 1410, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hail-full
   rotate: false
-  xy: 1277, 521
+  xy: 1410, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1277, 487
+  xy: 1410, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 1251, 453
+  xy: 1410, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 1251, 419
+  xy: 1376, 1069
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 1251, 385
+  xy: 1410, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 1251, 351
+  xy: 1444, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 1251, 317
+  xy: 1444, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-illuminator-full
   rotate: false
-  xy: 1251, 283
+  xy: 1478, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1251, 283
+  xy: 1478, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2652,56 +2652,56 @@ block-impact-reactor-full
   index: -1
 block-incinerator-full
   rotate: false
-  xy: 1285, 453
+  xy: 1444, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 1285, 453
+  xy: 1444, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-inverted-sorter-full
   rotate: false
-  xy: 1285, 419
+  xy: 1478, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1285, 419
+  xy: 1478, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-source-full
   rotate: false
-  xy: 1285, 385
+  xy: 1444, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1285, 385
+  xy: 1444, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-void-full
   rotate: false
-  xy: 1285, 351
+  xy: 1478, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1285, 351
+  xy: 1478, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2722,14 +2722,14 @@ javelin-ship-pad
   index: -1
 block-junction-full
   rotate: false
-  xy: 1285, 317
+  xy: 1478, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1285, 317
+  xy: 1478, 1087
   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: 1285, 283
+  xy: 1444, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1285, 283
+  xy: 1444, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 695, 10
+  xy: 1478, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-source-full
   rotate: false
-  xy: 729, 10
+  xy: 1512, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 729, 10
+  xy: 1512, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2834,7 +2834,7 @@ block-liquid-tank-full
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 763, 10
+  xy: 1512, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2855,14 +2855,14 @@ block-mechanical-drill-full
   index: -1
 block-mechanical-pump-full
   rotate: false
-  xy: 1345, 1213
+  xy: 1512, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1345, 1213
+  xy: 1512, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2876,14 +2876,14 @@ block-meltdown-full
   index: -1
 block-melter-full
   rotate: false
-  xy: 1379, 1213
+  xy: 1512, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1379, 1213
+  xy: 1512, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2904,70 +2904,70 @@ mend-projector
   index: -1
 block-mender-full
   rotate: false
-  xy: 1342, 1179
+  xy: 1512, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender
   rotate: false
-  xy: 1342, 1179
+  xy: 1512, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-message-full
   rotate: false
-  xy: 1376, 1179
+  xy: 1546, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1376, 1179
+  xy: 1546, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-2-full
   rotate: false
-  xy: 1342, 1145
+  xy: 1546, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-3-full
   rotate: false
-  xy: 1376, 1145
+  xy: 1580, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-5-full
   rotate: false
-  xy: 1342, 1111
+  xy: 1546, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 1376, 1111
+  xy: 1580, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-full
   rotate: false
-  xy: 1342, 1077
+  xy: 1614, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1334, 1043
+  xy: 1580, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3009,14 +3009,14 @@ omega-mech-pad
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 1334, 1009
+  xy: 1614, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-coal-medium
   rotate: false
-  xy: 1334, 1009
+  xy: 1614, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3051,14 +3051,14 @@ block-ore-coal-xlarge
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1368, 1043
+  xy: 1648, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-medium
   rotate: false
-  xy: 1368, 1043
+  xy: 1648, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3072,7 +3072,7 @@ block-ore-copper-large
   index: -1
 block-ore-copper-small
   rotate: false
-  xy: 259, 1379
+  xy: 1342, 1053
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3093,14 +3093,14 @@ block-ore-copper-xlarge
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1368, 1009
+  xy: 1546, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-medium
   rotate: false
-  xy: 1368, 1009
+  xy: 1546, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3114,14 +3114,14 @@ block-ore-lead-large
   index: -1
 block-ore-lead-small
   rotate: false
-  xy: 960, 966
+  xy: 1224, 861
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-lead-tiny
   rotate: false
-  xy: 1295, 1
+  xy: 204, 1129
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3135,14 +3135,14 @@ block-ore-lead-xlarge
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1346, 975
+  xy: 1580, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-medium
   rotate: false
-  xy: 1346, 975
+  xy: 1580, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3156,14 +3156,14 @@ block-ore-scrap-large
   index: -1
 block-ore-scrap-small
   rotate: false
-  xy: 901, 1820
+  xy: 259, 1379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-scrap-tiny
   rotate: false
-  xy: 1313, 1
+  xy: 566, 929
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3177,14 +3177,14 @@ block-ore-scrap-xlarge
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1380, 975
+  xy: 1614, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-medium
   rotate: false
-  xy: 1380, 975
+  xy: 1614, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3198,14 +3198,14 @@ block-ore-thorium-large
   index: -1
 block-ore-thorium-small
   rotate: false
-  xy: 1753, 1171
+  xy: 960, 966
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-thorium-tiny
   rotate: false
-  xy: 1331, 1
+  xy: 660, 831
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3219,14 +3219,14 @@ block-ore-thorium-xlarge
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1278, 937
+  xy: 1648, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-medium
   rotate: false
-  xy: 1278, 937
+  xy: 1648, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3240,14 +3240,14 @@ block-ore-titanium-large
   index: -1
 block-ore-titanium-small
   rotate: false
-  xy: 1628, 1137
+  xy: 901, 1820
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-titanium-tiny
   rotate: false
-  xy: 1349, 1
+  xy: 749, 733
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3275,21 +3275,21 @@ overdrive-projector
   index: -1
 block-overflow-gate-full
   rotate: false
-  xy: 1312, 937
+  xy: 1682, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 1312, 937
+  xy: 1682, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1346, 941
+  xy: 1580, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3303,42 +3303,42 @@ block-phantom-factory-full
   index: -1
 block-phase-conduit-full
   rotate: false
-  xy: 1380, 941
+  xy: 1614, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1380, 941
+  xy: 1614, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conveyor-full
   rotate: false
-  xy: 1270, 903
+  xy: 1648, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1270, 903
+  xy: 1648, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-full
   rotate: false
-  xy: 1304, 903
+  xy: 1682, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1304, 903
+  xy: 1682, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3387,21 +3387,21 @@ plastanium-compressor
   index: -1
 block-plastanium-conveyor-full
   rotate: false
-  xy: 1292, 869
+  xy: 1716, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-plastanium-wall-full
   rotate: false
-  xy: 1326, 869
+  xy: 1614, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1326, 869
+  xy: 1614, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3422,7 +3422,7 @@ plastanium-wall-large
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1338, 903
+  xy: 1648, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3436,14 +3436,14 @@ block-pneumatic-drill-full
   index: -1
 block-power-node-full
   rotate: false
-  xy: 1372, 907
+  xy: 1682, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 1372, 907
+  xy: 1682, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3464,35 +3464,35 @@ power-node-large
   index: -1
 block-power-source-full
   rotate: false
-  xy: 1311, 835
+  xy: 1716, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-void-full
   rotate: false
-  xy: 1311, 801
+  xy: 1750, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1311, 801
+  xy: 1750, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1311, 767
+  xy: 1648, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1311, 733
+  xy: 1682, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3513,7 +3513,7 @@ pyratite-mixer
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1311, 699
+  xy: 1716, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3541,7 +3541,7 @@ block-rock-full
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1311, 665
+  xy: 1750, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3562,14 +3562,14 @@ rotary-pump
   index: -1
 block-router-full
   rotate: false
-  xy: 1311, 631
+  xy: 1784, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1311, 631
+  xy: 1784, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3590,14 +3590,14 @@ rtg-generator
   index: -1
 block-salt-full
   rotate: false
-  xy: 1311, 597
+  xy: 1682, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1311, 563
+  xy: 1716, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3611,28 +3611,28 @@ block-salvo-full
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1311, 529
+  xy: 1750, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1311, 495
+  xy: 1784, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-water-full
   rotate: false
-  xy: 1319, 461
+  xy: 1818, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1319, 427
+  xy: 1716, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3646,21 +3646,21 @@ block-scatter-full
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1319, 393
+  xy: 1750, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1319, 359
+  xy: 1784, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1319, 359
+  xy: 1784, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3716,35 +3716,35 @@ separator
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1319, 291
+  xy: 1852, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1345, 835
+  xy: 1750, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1345, 801
+  xy: 1784, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shock-mine-full
   rotate: false
-  xy: 1345, 767
+  xy: 1818, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1345, 733
+  xy: 1852, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3765,7 +3765,7 @@ silicon-smelter
   index: -1
 block-snow-full
   rotate: false
-  xy: 1345, 699
+  xy: 1886, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3786,21 +3786,21 @@ block-snowrock-full
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1345, 665
+  xy: 1784, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-solar-panel-full
   rotate: false
-  xy: 1345, 631
+  xy: 1818, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1345, 631
+  xy: 1818, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3821,21 +3821,21 @@ solar-panel-large
   index: -1
 block-sorter-full
   rotate: false
-  xy: 1345, 597
+  xy: 1852, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1345, 597
+  xy: 1852, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spawn-full
   rotate: false
-  xy: 1345, 563
+  xy: 1886, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3863,7 +3863,7 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1345, 529
+  xy: 1920, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3884,14 +3884,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1345, 495
+  xy: 1818, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1360, 869
+  xy: 1852, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3912,14 +3912,14 @@ surge-tower
   index: -1
 block-surge-wall-full
   rotate: false
-  xy: 1353, 461
+  xy: 1886, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1353, 461
+  xy: 1886, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3947,14 +3947,14 @@ block-swarmer-full
   index: -1
 block-tainted-water-full
   rotate: false
-  xy: 1353, 427
+  xy: 1920, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tar-full
   rotate: false
-  xy: 1353, 393
+  xy: 1954, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3975,7 +3975,7 @@ tau-mech-pad
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1353, 359
+  xy: 1852, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4024,14 +4024,14 @@ thorium-reactor
   index: -1
 block-thorium-wall-full
   rotate: false
-  xy: 1353, 325
+  xy: 1886, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 1353, 325
+  xy: 1886, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4073,28 +4073,28 @@ block-titan-factory-full
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1353, 291
+  xy: 1920, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1353, 291
+  xy: 1920, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-full
   rotate: false
-  xy: 1379, 835
+  xy: 1954, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall
   rotate: false
-  xy: 1379, 835
+  xy: 1954, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4143,14 +4143,14 @@ turbine-generator
   index: -1
 block-unloader-full
   rotate: false
-  xy: 1379, 801
+  xy: 1988, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1379, 801
+  xy: 1988, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4178,7 +4178,7 @@ block-water-extractor-full
   index: -1
 block-water-full
   rotate: false
-  xy: 1379, 767
+  xy: 1886, 1061
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4213,56 +4213,56 @@ block-wraith-factory-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1447, 805
+  xy: 1810, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1447, 771
+  xy: 1844, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1447, 737
+  xy: 1878, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1447, 703
+  xy: 1912, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1447, 669
+  xy: 1946, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1447, 635
+  xy: 1980, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 1447, 601
+  xy: 2014, 993
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 1447, 567
+  xy: 1301, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4500,7 +4500,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1462, 873
+  xy: 1380, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4514,7 +4514,7 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1455, 465
+  xy: 1380, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4528,28 +4528,28 @@ item-blast-compound-large
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1455, 329
+  xy: 1414, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-small
   rotate: false
-  xy: 1654, 1137
+  xy: 1251, 341
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-tiny
   rotate: false
-  xy: 1367, 1
+  xy: 623, 1709
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 1525, 1281
+  xy: 1575, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4563,63 +4563,63 @@ item-coal-large
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1481, 839
+  xy: 1414, 917
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal-small
   rotate: false
-  xy: 1805, 1171
+  xy: 1273, 647
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-tiny
   rotate: false
-  xy: 1385, 1
+  xy: 649, 1399
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 1575, 1281
+  xy: 1625, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 1208, 1057
+  xy: 1208, 1007
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1481, 771
+  xy: 1482, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 1628, 1085
+  xy: 285, 1379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 1403, 1
+  xy: 987, 776
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 1625, 1281
+  xy: 1675, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4633,308 +4633,308 @@ item-graphite-large
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1481, 703
+  xy: 1482, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 1654, 1111
+  xy: 1269, 775
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 1421, 1
+  xy: 924, 867
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 1675, 1281
+  xy: 1725, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 1208, 1015
+  xy: 1011, 1460
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1481, 635
+  xy: 1414, 883
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 1680, 1137
+  xy: 1295, 775
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 1301, 265
+  xy: 924, 849
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1725, 1281
+  xy: 1775, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 1011, 1460
+  xy: 99, 2
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1481, 567
+  xy: 1482, 883
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 1831, 1171
+  xy: 1251, 315
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 204, 1129
+  xy: 1345, 1239
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1775, 1281
+  xy: 1825, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 99, 2
+  xy: 1261, 1215
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1481, 499
+  xy: 1403, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 1654, 1085
+  xy: 1273, 621
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-tiny
   rotate: false
-  xy: 566, 929
+  xy: 1345, 1221
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1825, 1281
+  xy: 1875, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 1261, 1215
+  xy: 1303, 1215
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1489, 431
+  xy: 1403, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 1680, 1111
+  xy: 1321, 775
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 660, 831
+  xy: 1516, 1001
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1875, 1281
+  xy: 1925, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 1303, 1215
+  xy: 1258, 1173
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1489, 363
+  xy: 1471, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1706, 1137
+  xy: 1303, 749
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 749, 733
+  xy: 2026, 975
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1925, 1281
+  xy: 1975, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 1258, 1173
+  xy: 1258, 1131
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1489, 295
+  xy: 1471, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1857, 1171
+  xy: 1251, 289
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 623, 1709
+  xy: 1209, 469
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1975, 1281
+  xy: 1267, 1257
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 1258, 1131
+  xy: 1300, 1173
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1353, 257
+  xy: 1516, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 1680, 1085
+  xy: 1273, 595
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 649, 1399
+  xy: 1250, 869
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1267, 1257
+  xy: 1317, 1257
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1300, 1173
+  xy: 1258, 1089
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1421, 261
+  xy: 1550, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 1706, 1111
+  xy: 1303, 723
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 987, 776
+  xy: 1347, 783
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1317, 1257
+  xy: 1367, 1239
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4948,133 +4948,133 @@ item-spore-pod-large
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1489, 261
+  xy: 1550, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1883, 1171
+  xy: 1273, 569
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 924, 867
+  xy: 1329, 757
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 1367, 1247
+  xy: 1417, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 1258, 1089
+  xy: 1300, 1089
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1301, 189
+  xy: 1550, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1706, 1085
+  xy: 1303, 697
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 924, 849
+  xy: 1251, 271
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 1417, 1223
+  xy: 1467, 1223
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 1300, 1089
+  xy: 1258, 1047
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1301, 155
+  xy: 1618, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1909, 1171
+  xy: 1273, 543
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 1209, 469
+  xy: 1273, 473
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 1475, 1231
+  xy: 1525, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 1250, 1047
+  xy: 1300, 1047
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1369, 223
+  xy: 1618, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1935, 1171
+  xy: 1273, 517
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 1732, 1145
+  xy: 1299, 601
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 1525, 1231
+  xy: 1575, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5088,140 +5088,140 @@ lancer
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 1292, 1047
+  xy: 1250, 1005
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1335, 155
+  xy: 1618, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 1961, 1171
+  xy: 1273, 491
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 1680, 1067
+  xy: 222, 1129
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 1725, 1231
+  xy: 1775, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1250, 1005
+  xy: 1292, 1005
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1301, 87
+  xy: 1686, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 1987, 1171
+  xy: 1303, 671
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 222, 1129
+  xy: 584, 929
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 1775, 1231
+  xy: 1825, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 1292, 1005
+  xy: 1236, 963
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1403, 189
+  xy: 1720, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 1628, 1059
+  xy: 1299, 645
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 584, 929
+  xy: 678, 831
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 1825, 1231
+  xy: 1875, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 1236, 963
+  xy: 1236, 921
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1403, 121
+  xy: 1788, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 1654, 1059
+  xy: 1299, 619
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 678, 831
+  xy: 767, 733
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 1875, 1231
+  xy: 1925, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5235,21 +5235,21 @@ mass-driver
   index: -1
 mech-alpha-mech-full
   rotate: false
-  xy: 1925, 1231
+  xy: 1975, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-dart-ship-full
   rotate: false
-  xy: 1975, 1231
+  xy: 1119, 1249
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-delta-mech-full
   rotate: false
-  xy: 1119, 1249
+  xy: 1169, 1249
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5263,7 +5263,7 @@ mech-glaive-ship-full
   index: -1
 mech-javelin-ship-full
   rotate: false
-  xy: 1169, 1249
+  xy: 1119, 1199
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5298,7 +5298,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1444, 1155
+  xy: 1641, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5326,7 +5326,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 1481, 1197
+  xy: 1675, 857
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5354,14 +5354,14 @@ unit-chaos-array-full
   index: -1
 unit-crawler-full
   rotate: false
-  xy: 1186, 899
+  xy: 1208, 1149
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 1208, 1149
+  xy: 1208, 1099
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5403,140 +5403,140 @@ wave
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1455, 363
+  xy: 1414, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1455, 295
+  xy: 1448, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1481, 805
+  xy: 1448, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1481, 737
+  xy: 1448, 917
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1481, 669
+  xy: 1482, 917
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1481, 601
+  xy: 1448, 883
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1481, 533
+  xy: 1403, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1489, 465
+  xy: 1437, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1489, 397
+  xy: 1437, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1489, 329
+  xy: 1437, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1319, 257
+  xy: 1471, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1387, 257
+  xy: 1516, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1455, 261
+  xy: 1516, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1301, 223
+  xy: 1584, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1335, 223
+  xy: 1584, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1335, 189
+  xy: 1584, 891
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1301, 121
+  xy: 1652, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1369, 189
+  xy: 1652, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1403, 223
+  xy: 1754, 959
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1403, 155
+  xy: 1754, 925
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5550,14 +5550,14 @@ alpha-mech
   index: -1
 alpha-mech-base
   rotate: false
-  xy: 1145, 18
+  xy: 1203, 18
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-mech-leg
   rotate: false
-  xy: 1195, 18
+  xy: 1253, 20
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5613,21 +5613,21 @@ omega-mech-leg
   index: -1
 tau-mech
   rotate: false
-  xy: 815, 7
+  xy: 979, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-mech-base
   rotate: false
-  xy: 1158, 999
+  xy: 1186, 949
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-mech-leg
   rotate: false
-  xy: 1186, 949
+  xy: 1186, 899
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5648,21 +5648,21 @@ glaive-ship
   index: -1
 javelin-ship
   rotate: false
-  xy: 1575, 1231
+  xy: 1625, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-ship-shield
   rotate: false
-  xy: 1625, 1231
+  xy: 1675, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 979, 3
+  xy: 1037, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5711,28 +5711,21 @@ chaos-array-leg
   index: -1
 crater
   rotate: false
-  xy: 285, 1379
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-power-cell
-  rotate: false
-  xy: 285, 1379
+  xy: 1947, 797
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 crater-base
   rotate: false
-  xy: 1779, 1171
+  xy: 1981, 831
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 crater-leg
   rotate: false
-  xy: 1628, 1111
+  xy: 1243, 775
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5877,6 +5870,13 @@ phantom
   orig: 56, 56
   offset: 0, 0
   index: -1
+power-cell
+  rotate: false
+  xy: 815, 7
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
 reaper
   rotate: false
   xy: 323, 1727
@@ -5893,7 +5893,7 @@ revenant
   index: -1
 spirit
   rotate: false
-  xy: 1158, 1099
+  xy: 1158, 1049
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5914,14 +5914,14 @@ titan-leg
   index: -1
 wraith
   rotate: false
-  xy: 1208, 1099
+  xy: 1208, 1049
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery-equip
   rotate: false
-  xy: 1245, 12
+  xy: 1325, 1307
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
@@ -5970,63 +5970,63 @@ eradication-equip
   index: -1
 eruption-equip
   rotate: false
-  xy: 1325, 1307
+  xy: 1375, 1289
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 1375, 1297
+  xy: 1425, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 1425, 1273
+  xy: 1475, 1273
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 1475, 1281
+  xy: 1525, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles-equip
   rotate: false
-  xy: 1675, 1231
+  xy: 1725, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun-equip
   rotate: false
-  xy: 1119, 1199
+  xy: 1169, 1199
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles-equip
   rotate: false
-  xy: 1169, 1199
+  xy: 1158, 1149
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 1158, 1149
+  xy: 1158, 1099
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 1158, 1049
+  xy: 1158, 999
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index f42fdff85b..2302d98629 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/mindustry/entities/type/Player.java b/core/src/mindustry/entities/type/Player.java
index 7c6d72adcf..4077da0e4e 100644
--- a/core/src/mindustry/entities/type/Player.java
+++ b/core/src/mindustry/entities/type/Player.java
@@ -352,7 +352,7 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
 
     @Override
     public void drawStats(){
-//        Draw.color(Color.black, team.color, healthf() + Mathf.absin(Time.time(), healthf() * 5f, 1f - healthf()));
+        Draw.color(Color.black, team.color, healthf() + Mathf.absin(Time.time(), healthf() * 5f, 1f - healthf()));
         Draw.rect(getPowerCellRegion(), x + Angles.trnsx(rotation, mech.cellTrnsY, 0f), y + Angles.trnsy(rotation, mech.cellTrnsY, 0f), rotation - 90);
         Draw.reset();
         drawBackItems(itemtime, isLocal);
diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java
index 8dff6c5a09..6a037d6f36 100644
--- a/core/src/mindustry/entities/type/Unit.java
+++ b/core/src/mindustry/entities/type/Unit.java
@@ -381,7 +381,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
     }
 
     public void drawStats(){
-//        Draw.color(Color.black, team.color, healthf() + Mathf.absin(Time.time(), Math.max(healthf() * 5f, 1f), 1f - healthf()));
+        Draw.color(Color.black, team.color, healthf() + Mathf.absin(Time.time(), Math.max(healthf() * 5f, 1f), 1f - healthf()));
         Draw.rect(getPowerCellRegion(), x, y, rotation - 90);
         Draw.color();