diff --git a/core/assets-raw/sprites/blocks/production/separator-liquid.png b/core/assets-raw/sprites/blocks/production/separator-liquid.png
index f9adfeb523..0f81574062 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator-liquid.png and b/core/assets-raw/sprites/blocks/production/separator-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator-spinner.png b/core/assets-raw/sprites/blocks/production/separator-spinner.png
new file mode 100644
index 0000000000..d5e9c620c8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/separator-spinner.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator.png b/core/assets-raw/sprites/blocks/production/separator.png
index a3810f08d8..cefbb02633 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator.png and b/core/assets-raw/sprites/blocks/production/separator.png differ
diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png
index 65838bd5f5..8e3bae6726 100644
Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index c23fb40fb5..4bb9f34666 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: 1754, 891
+  xy: 1285, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -34,49 +34,49 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1607, 789
+  xy: 1379, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1920, 1095
+  xy: 1844, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1954, 1095
+  xy: 1980, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1988, 1129
+  xy: 1742, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1954, 1061
+  xy: 1776, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-0
   rotate: false
-  xy: 1278, 971
+  xy: 1258, 1059
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-armored-conveyor-full
   rotate: false
-  xy: 1278, 971
+  xy: 1258, 1059
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -90,392 +90,392 @@ armored-conveyor-0-1
   index: -1
 armored-conveyor-0-2
   rotate: false
-  xy: 1278, 937
+  xy: 389, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-3
   rotate: false
-  xy: 389, 15
+  xy: 423, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 423, 10
+  xy: 457, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 457, 10
+  xy: 491, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 491, 10
+  xy: 525, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 525, 10
+  xy: 559, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 559, 10
+  xy: 593, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 593, 10
+  xy: 627, 12
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 627, 12
+  xy: 661, 12
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 661, 12
+  xy: 1258, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 1236, 887
+  xy: 911, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 1312, 971
+  xy: 945, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 1312, 937
+  xy: 1303, 1223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 911, 11
+  xy: 1337, 1231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 945, 11
+  xy: 1228, 965
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 1278, 903
+  xy: 1228, 931
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 1312, 903
+  xy: 1228, 897
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 1209, 827
+  xy: 1228, 863
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1954, 1027
+  xy: 1530, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1988, 1027
+  xy: 1564, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1368, 1035
+  xy: 1598, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1402, 1027
+  xy: 1632, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1436, 1019
+  xy: 1666, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1470, 1019
+  xy: 1700, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1504, 1019
+  xy: 1394, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1301, 835
+  xy: 1428, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1335, 835
+  xy: 1462, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1369, 843
+  xy: 1496, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1369, 809
+  xy: 1530, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1538, 993
+  xy: 1564, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1572, 993
+  xy: 1598, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1606, 993
+  xy: 1632, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1640, 993
+  xy: 1666, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1674, 993
+  xy: 1700, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1708, 993
+  xy: 1734, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1742, 993
+  xy: 1768, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1776, 993
+  xy: 1802, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1675, 857
+  xy: 1369, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1641, 789
+  xy: 1369, 917
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1675, 823
+  xy: 1403, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1709, 857
+  xy: 1403, 917
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1675, 789
+  xy: 1369, 883
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1709, 823
+  xy: 1437, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1743, 857
+  xy: 1403, 883
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1709, 789
+  xy: 1437, 917
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1743, 823
+  xy: 1369, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1777, 857
+  xy: 1403, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1743, 789
+  xy: 1437, 883
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1777, 823
+  xy: 1369, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1811, 857
+  xy: 1403, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1777, 789
+  xy: 1437, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1811, 823
+  xy: 1369, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1845, 857
+  xy: 1403, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1811, 789
+  xy: 1437, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1845, 823
+  xy: 1369, 747
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1879, 857
+  xy: 1403, 747
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -489,21 +489,21 @@ mass-driver-base
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1822, 925
+  xy: 1319, 363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1856, 959
+  xy: 1319, 329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1822, 891
+  xy: 1319, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -650,56 +650,56 @@ pneumatic-drill-top
   index: -1
 water-extractor
   rotate: false
-  xy: 1135, 1365
+  xy: 1201, 1431
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 1201, 1431
+  xy: 1201, 1365
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 1201, 1365
+  xy: 1135, 1299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 1135, 1299
+  xy: 1267, 1431
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 1209, 691
+  xy: 1300, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1580, 1129
+  xy: 1643, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1818, 1163
+  xy: 1983, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1682, 1027
+  xy: 1326, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -825,175 +825,175 @@ rubble-8-1
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1954, 1129
+  xy: 1878, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1954, 1129
+  xy: 1878, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1988, 1163
+  xy: 1912, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1920, 1061
+  xy: 1946, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1988, 1061
+  xy: 1844, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1546, 1027
+  xy: 1878, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1580, 1027
+  xy: 1912, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1614, 1027
+  xy: 1946, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1614, 1027
+  xy: 1946, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1614, 1027
+  xy: 1946, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1614, 1027
+  xy: 1946, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1648, 1027
+  xy: 1980, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1716, 1027
+  xy: 1326, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1750, 1027
+  xy: 1360, 1043
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1784, 1027
+  xy: 1360, 1009
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1818, 1027
+  xy: 1394, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1818, 1027
+  xy: 1394, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1852, 1027
+  xy: 1428, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1886, 1027
+  xy: 1462, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1920, 1027
+  xy: 1496, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1652, 891
+  xy: 1335, 533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1686, 925
+  xy: 1301, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1720, 959
+  xy: 1335, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1686, 891
+  xy: 1301, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1720, 925
+  xy: 1335, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1021,133 +1021,133 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1788, 925
+  xy: 1285, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1822, 959
+  xy: 1319, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1788, 891
+  xy: 1319, 397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1856, 925
+  xy: 1319, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1890, 959
+  xy: 1353, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1856, 891
+  xy: 1353, 397
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1890, 925
+  xy: 1353, 363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1924, 959
+  xy: 1353, 329
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1890, 891
+  xy: 1353, 295
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1924, 925
+  xy: 1353, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1958, 959
+  xy: 1301, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1958, 925
+  xy: 1335, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1992, 959
+  xy: 1301, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1958, 891
+  xy: 1335, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1992, 925
+  xy: 1301, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1992, 891
+  xy: 1335, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1505, 849
+  xy: 1301, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 1209, 793
+  xy: 1371, 1213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-battery-full
   rotate: false
-  xy: 1209, 793
+  xy: 1371, 1213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1168,7 +1168,7 @@ block-battery-large-full
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1988, 1095
+  xy: 1810, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1189,14 +1189,14 @@ differential-generator-top
   index: -1
 diode-arrow
   rotate: false
-  xy: 1335, 801
+  xy: 1836, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1380, 891
+  xy: 1972, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1252,14 +1252,14 @@ impact-reactor-plasma-3
   index: -1
 power-source
   rotate: false
-  xy: 1924, 891
+  xy: 1301, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1539, 789
+  xy: 1369, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1280,7 +1280,7 @@ thorium-reactor-lights
   index: -1
 turbine-generator-top
   rotate: false
-  xy: 1069, 1431
+  xy: 1069, 1365
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1406,21 +1406,21 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1505, 815
+  xy: 1335, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1505, 781
+  xy: 1335, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1539, 857
+  xy: 1369, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1432,51 +1432,58 @@ separator-liquid
   orig: 64, 64
   offset: 0, 0
   index: -1
-spore-press
+separator-spinner
   rotate: false
-  xy: 1143, 596
+  xy: 1143, 662
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-spore-press-frame0
+spore-press
   rotate: false
   xy: 1143, 530
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-spore-press-frame1
+spore-press-frame0
   rotate: false
   xy: 1143, 464
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-spore-press-frame2
+spore-press-frame1
   rotate: false
   xy: 1185, 398
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-spore-press-liquid
+spore-press-frame2
   rotate: false
   xy: 1185, 332
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-spore-press-top
+spore-press-liquid
   rotate: false
   xy: 1185, 266
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+spore-press-top
+  rotate: false
+  xy: 1177, 200
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 unloader-center
   rotate: false
-  xy: 1879, 823
+  xy: 1369, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1490,7 +1497,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 1209, 759
+  xy: 1337, 1197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1567,14 +1574,14 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 1607, 857
+  xy: 1311, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 1267, 1365
+  xy: 1201, 1299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1693,7 +1700,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1573, 857
+  xy: 1369, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1714,7 +1721,7 @@ revenant-factory-top
   index: -1
 spirit-factory-top
   rotate: false
-  xy: 1143, 662
+  xy: 1143, 596
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1728,7 +1735,7 @@ titan-factory
   index: -1
 wraith-factory-top
   rotate: false
-  xy: 1201, 1299
+  xy: 1333, 1431
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1742,14 +1749,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1369, 775
+  xy: 1870, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 insulator-wall
   rotate: false
-  xy: 1380, 993
+  xy: 2006, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1805,49 +1812,49 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1573, 789
+  xy: 1311, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1607, 823
+  xy: 1345, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1641, 857
+  xy: 1345, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1641, 857
+  xy: 1345, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bullet
   rotate: false
-  xy: 1095, 7
+  xy: 1153, 14
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 bullet-back
   rotate: false
-  xy: 1149, 14
+  xy: 1207, 14
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 casing
   rotate: false
-  xy: 2038, 2031
+  xy: 1301, 73
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -1861,7 +1868,7 @@ circle-end
   index: -1
 circle-mid
   rotate: false
-  xy: 2022, 1030
+  xy: 1399, 512
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
@@ -1875,7 +1882,7 @@ circle-shadow
   index: -1
 error
   rotate: false
-  xy: 1991, 1331
+  xy: 1325, 1315
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -1931,35 +1938,35 @@ scale_marker
   index: -1
 scorch1
   rotate: false
-  xy: 1243, 673
+  xy: 2019, 1129
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 1243, 571
+  xy: 1369, 611
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 1243, 469
+  xy: 1369, 509
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 1251, 367
+  xy: 1262, 923
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 1273, 673
+  xy: 1471, 875
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
@@ -1973,28 +1980,28 @@ shell
   index: -1
 shell-back
   rotate: false
-  xy: 1186, 861
+  xy: 1258, 1093
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 1641, 823
+  xy: 1379, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 979, 259
+  xy: 2043, 1281
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1845, 789
+  xy: 1437, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2008,7 +2015,7 @@ transfer-end
   index: -1
 white
   rotate: false
-  xy: 1209, 464
+  xy: 1443, 1342
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
@@ -2022,7 +2029,7 @@ arc
   index: -1
 block-arc-full
   rotate: false
-  xy: 1209, 725
+  xy: 1303, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2036,42 +2043,42 @@ block-blast-drill-full
   index: -1
 block-bridge-conduit-full
   rotate: false
-  xy: 1209, 657
+  xy: 1300, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1209, 657
+  xy: 1300, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-bridge-conveyor-full
   rotate: false
-  xy: 1209, 623
+  xy: 1296, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1209, 623
+  xy: 1296, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-char-full
   rotate: false
-  xy: 1209, 589
+  xy: 1292, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 1209, 555
+  xy: 1292, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2092,14 +2099,14 @@ coal-centrifuge
   index: -1
 block-combustion-generator-full
   rotate: false
-  xy: 1209, 521
+  xy: 1371, 1179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 1209, 521
+  xy: 1371, 1179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2120,7 +2127,7 @@ command-center
   index: -1
 block-conduit-full
   rotate: false
-  xy: 1209, 487
+  xy: 1337, 1163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2141,28 +2148,28 @@ container
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 695, 10
+  xy: 1334, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 695, 10
+  xy: 1334, 1129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-full
   rotate: false
-  xy: 729, 10
+  xy: 1371, 1145
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 729, 10
+  xy: 1371, 1145
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2225,7 +2232,7 @@ core-shard
   index: -1
 block-craters-full
   rotate: false
-  xy: 763, 10
+  xy: 1405, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2267,70 +2274,70 @@ block-dagger-factory-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 1334, 1013
+  xy: 1405, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-1-full
   rotate: false
-  xy: 1346, 979
+  xy: 1439, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-2-full
   rotate: false
-  xy: 1346, 945
+  xy: 1439, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-3-full
   rotate: false
-  xy: 1346, 911
+  xy: 1473, 1189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-4-full
   rotate: false
-  xy: 1270, 869
+  xy: 1473, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-5-full
   rotate: false
-  xy: 1304, 869
+  xy: 1368, 1111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-6-full
   rotate: false
-  xy: 1346, 877
+  xy: 1334, 1095
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 1342, 1181
+  xy: 1368, 1077
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-full
   rotate: false
-  xy: 1342, 1147
+  xy: 1209, 829
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-water-full
   rotate: false
-  xy: 1342, 1113
+  xy: 1209, 795
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2351,7 +2358,7 @@ dart-mech-pad
   index: -1
 block-deepwater-full
   rotate: false
-  xy: 1342, 1079
+  xy: 1209, 761
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2386,14 +2393,14 @@ differential-generator
   index: -1
 block-diode-full
   rotate: false
-  xy: 1376, 1205
+  xy: 1209, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode
   rotate: false
-  xy: 1376, 1205
+  xy: 1209, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2414,14 +2421,14 @@ distributor
   index: -1
 block-door-full
   rotate: false
-  xy: 1376, 1171
+  xy: 1209, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 1376, 1171
+  xy: 1209, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2449,14 +2456,14 @@ block-draug-factory-full
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 1376, 1137
+  xy: 1209, 659
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 1376, 1103
+  xy: 1209, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2526,70 +2533,70 @@ graphite-press
   index: -1
 block-grass-full
   rotate: false
-  xy: 1410, 1197
+  xy: 1209, 591
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hail-full
   rotate: false
-  xy: 1410, 1163
+  xy: 1209, 557
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1410, 1129
+  xy: 1209, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 1410, 1095
+  xy: 1209, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 1376, 1069
+  xy: 1243, 829
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 1410, 1061
+  xy: 1243, 795
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 1444, 1189
+  xy: 1243, 761
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 1444, 1155
+  xy: 1243, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-illuminator-full
   rotate: false
-  xy: 1478, 1189
+  xy: 1243, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1478, 1189
+  xy: 1243, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2603,56 +2610,56 @@ block-impact-reactor-full
   index: -1
 block-incinerator-full
   rotate: false
-  xy: 1444, 1121
+  xy: 1243, 659
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 1444, 1121
+  xy: 1243, 659
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-inverted-sorter-full
   rotate: false
-  xy: 1478, 1155
+  xy: 1243, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1478, 1155
+  xy: 1243, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-source-full
   rotate: false
-  xy: 1444, 1087
+  xy: 1243, 591
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1444, 1087
+  xy: 1243, 591
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-void-full
   rotate: false
-  xy: 1478, 1121
+  xy: 1243, 557
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1478, 1121
+  xy: 1243, 557
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2673,14 +2680,14 @@ javelin-ship-pad
   index: -1
 block-junction-full
   rotate: false
-  xy: 1478, 1087
+  xy: 1243, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1478, 1087
+  xy: 1243, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2743,35 +2750,35 @@ launch-pad-large
   index: -1
 block-liquid-junction-full
   rotate: false
-  xy: 1444, 1053
+  xy: 1243, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1444, 1053
+  xy: 1243, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 1478, 1053
+  xy: 695, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-source-full
   rotate: false
-  xy: 1512, 1189
+  xy: 729, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 1512, 1189
+  xy: 729, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2785,21 +2792,21 @@ block-liquid-tank-full
   index: -1
 block-liquid-void-full
   rotate: false
-  xy: 1512, 1155
+  xy: 763, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1512, 1155
+  xy: 763, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 1512, 1121
+  xy: 1405, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2820,14 +2827,14 @@ block-mechanical-drill-full
   index: -1
 block-mechanical-pump-full
   rotate: false
-  xy: 1512, 1087
+  xy: 1439, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1512, 1087
+  xy: 1439, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2841,14 +2848,14 @@ block-meltdown-full
   index: -1
 block-melter-full
   rotate: false
-  xy: 1512, 1053
+  xy: 1473, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1512, 1053
+  xy: 1473, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2869,70 +2876,70 @@ mend-projector
   index: -1
 block-mender-full
   rotate: false
-  xy: 1546, 1197
+  xy: 1402, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender
   rotate: false
-  xy: 1546, 1197
+  xy: 1402, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-message-full
   rotate: false
-  xy: 1546, 1163
+  xy: 1436, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1546, 1163
+  xy: 1436, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-2-full
   rotate: false
-  xy: 1580, 1197
+  xy: 1470, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-3-full
   rotate: false
-  xy: 1546, 1129
+  xy: 1507, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-5-full
   rotate: false
-  xy: 1580, 1163
+  xy: 1541, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 1614, 1197
+  xy: 1575, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-full
   rotate: false
-  xy: 1546, 1095
+  xy: 1609, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1614, 1163
+  xy: 1677, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2974,14 +2981,14 @@ omega-mech-pad
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 1648, 1197
+  xy: 1507, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-coal-medium
   rotate: false
-  xy: 1648, 1197
+  xy: 1507, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3009,21 +3016,21 @@ block-ore-coal-tiny
   index: -1
 block-ore-coal-xlarge
   rotate: false
-  xy: 1448, 1381
+  xy: 1549, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1546, 1061
+  xy: 1541, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-medium
   rotate: false
-  xy: 1546, 1061
+  xy: 1541, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3037,35 +3044,35 @@ block-ore-copper-large
   index: -1
 block-ore-copper-small
   rotate: false
-  xy: 1342, 1053
+  xy: 259, 1379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-copper-tiny
   rotate: false
-  xy: 797, 8
+  xy: 1507, 1205
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-copper-xlarge
   rotate: false
-  xy: 1498, 1381
+  xy: 1599, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1580, 1095
+  xy: 1575, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-medium
   rotate: false
-  xy: 1580, 1095
+  xy: 1575, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3079,35 +3086,35 @@ block-ore-lead-large
   index: -1
 block-ore-lead-small
   rotate: false
-  xy: 1224, 861
+  xy: 960, 966
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-lead-tiny
   rotate: false
-  xy: 204, 1129
+  xy: 1369, 465
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-lead-xlarge
   rotate: false
-  xy: 1548, 1381
+  xy: 1649, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1614, 1129
+  xy: 1609, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-medium
   rotate: false
-  xy: 1614, 1129
+  xy: 1609, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3121,35 +3128,35 @@ block-ore-scrap-large
   index: -1
 block-ore-scrap-small
   rotate: false
-  xy: 259, 1379
+  xy: 901, 1820
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-scrap-tiny
   rotate: false
-  xy: 566, 929
+  xy: 1507, 1187
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-scrap-xlarge
   rotate: false
-  xy: 1598, 1381
+  xy: 1699, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1648, 1163
+  xy: 1643, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-medium
   rotate: false
-  xy: 1648, 1163
+  xy: 1643, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3163,35 +3170,35 @@ block-ore-thorium-large
   index: -1
 block-ore-thorium-small
   rotate: false
-  xy: 960, 966
+  xy: 1403, 721
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-thorium-tiny
   rotate: false
-  xy: 660, 831
+  xy: 797, 8
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-thorium-xlarge
   rotate: false
-  xy: 1648, 1381
+  xy: 1749, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1682, 1197
+  xy: 1677, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-medium
   rotate: false
-  xy: 1682, 1197
+  xy: 1677, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3205,21 +3212,21 @@ block-ore-titanium-large
   index: -1
 block-ore-titanium-small
   rotate: false
-  xy: 901, 1820
+  xy: 1437, 755
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-ore-titanium-tiny
   rotate: false
-  xy: 749, 733
+  xy: 204, 1129
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-ore-titanium-xlarge
   rotate: false
-  xy: 1698, 1381
+  xy: 1799, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -3240,21 +3247,21 @@ overdrive-projector
   index: -1
 block-overflow-gate-full
   rotate: false
-  xy: 1580, 1061
+  xy: 1504, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 1580, 1061
+  xy: 1504, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1614, 1095
+  xy: 1538, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3268,42 +3275,42 @@ block-phantom-factory-full
   index: -1
 block-phase-conduit-full
   rotate: false
-  xy: 1648, 1129
+  xy: 1572, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1648, 1129
+  xy: 1572, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conveyor-full
   rotate: false
-  xy: 1682, 1163
+  xy: 1606, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1682, 1163
+  xy: 1606, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-full
   rotate: false
-  xy: 1716, 1197
+  xy: 1640, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1716, 1197
+  xy: 1640, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3331,7 +3338,7 @@ block-phase-weaver-full
   index: -1
 block-pine-full
   rotate: false
-  xy: 1748, 1381
+  xy: 1849, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -3352,14 +3359,14 @@ plastanium-compressor
   index: -1
 block-plastanium-wall-full
   rotate: false
-  xy: 1614, 1061
+  xy: 1674, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1614, 1061
+  xy: 1674, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3380,7 +3387,7 @@ plastanium-wall-large
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1648, 1095
+  xy: 1711, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3394,14 +3401,14 @@ block-pneumatic-drill-full
   index: -1
 block-power-node-full
   rotate: false
-  xy: 1682, 1129
+  xy: 1711, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 1682, 1129
+  xy: 1711, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3422,35 +3429,35 @@ power-node-large
   index: -1
 block-power-source-full
   rotate: false
-  xy: 1716, 1163
+  xy: 1708, 1079
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-void-full
   rotate: false
-  xy: 1750, 1197
+  xy: 1745, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1750, 1197
+  xy: 1745, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1648, 1061
+  xy: 1745, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1682, 1095
+  xy: 1779, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3471,7 +3478,7 @@ pyratite-mixer
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1716, 1129
+  xy: 1779, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3492,14 +3499,14 @@ block-ripple-full
   index: -1
 block-rock-full
   rotate: false
-  xy: 1798, 1381
+  xy: 1899, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1750, 1163
+  xy: 1813, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3520,14 +3527,14 @@ rotary-pump
   index: -1
 block-router-full
   rotate: false
-  xy: 1784, 1197
+  xy: 1813, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1784, 1197
+  xy: 1813, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3548,14 +3555,14 @@ rtg-generator
   index: -1
 block-salt-full
   rotate: false
-  xy: 1682, 1061
+  xy: 1847, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1716, 1095
+  xy: 1847, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3569,28 +3576,28 @@ block-salvo-full
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1750, 1129
+  xy: 1881, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1784, 1163
+  xy: 1881, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-water-full
   rotate: false
-  xy: 1818, 1197
+  xy: 1915, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1716, 1061
+  xy: 1915, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3604,21 +3611,21 @@ block-scatter-full
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1750, 1095
+  xy: 1949, 1155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1784, 1129
+  xy: 1949, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1784, 1129
+  xy: 1949, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3674,35 +3681,35 @@ separator
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1852, 1197
+  xy: 1983, 1121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1750, 1061
+  xy: 1402, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1784, 1095
+  xy: 1436, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shock-mine-full
   rotate: false
-  xy: 1818, 1129
+  xy: 1470, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1852, 1163
+  xy: 1504, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3723,42 +3730,42 @@ silicon-smelter
   index: -1
 block-snow-full
   rotate: false
-  xy: 1886, 1197
+  xy: 1538, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-pine-full
   rotate: false
-  xy: 1848, 1381
+  xy: 1949, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrock-full
   rotate: false
-  xy: 1898, 1381
+  xy: 1999, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1784, 1061
+  xy: 1572, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-solar-panel-full
   rotate: false
-  xy: 1818, 1095
+  xy: 1606, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1818, 1095
+  xy: 1606, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3779,21 +3786,21 @@ solar-panel-large
   index: -1
 block-sorter-full
   rotate: false
-  xy: 1852, 1129
+  xy: 1640, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1852, 1129
+  xy: 1640, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spawn-full
   rotate: false
-  xy: 1886, 1163
+  xy: 1674, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3821,14 +3828,14 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1920, 1197
+  xy: 1708, 1045
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-pine-full
   rotate: false
-  xy: 1948, 1381
+  xy: 1398, 1347
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -3842,14 +3849,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1818, 1061
+  xy: 1745, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1852, 1095
+  xy: 1779, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3870,14 +3877,14 @@ surge-tower
   index: -1
 block-surge-wall-full
   rotate: false
-  xy: 1886, 1129
+  xy: 1813, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1886, 1129
+  xy: 1813, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3905,14 +3912,14 @@ block-swarmer-full
   index: -1
 block-tainted-water-full
   rotate: false
-  xy: 1920, 1163
+  xy: 1847, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tar-full
   rotate: false
-  xy: 1954, 1197
+  xy: 1881, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3933,7 +3940,7 @@ tau-mech-pad
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1852, 1061
+  xy: 1915, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3982,14 +3989,14 @@ thorium-reactor
   index: -1
 block-thorium-wall-full
   rotate: false
-  xy: 1886, 1095
+  xy: 1949, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 1886, 1095
+  xy: 1949, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4031,28 +4038,28 @@ block-titan-factory-full
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1920, 1129
+  xy: 1983, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1920, 1129
+  xy: 1983, 1087
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-full
   rotate: false
-  xy: 1954, 1163
+  xy: 1742, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall
   rotate: false
-  xy: 1954, 1163
+  xy: 1742, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4101,14 +4108,14 @@ turbine-generator
   index: -1
 block-unloader-full
   rotate: false
-  xy: 1988, 1197
+  xy: 1776, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1988, 1197
+  xy: 1776, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4136,7 +4143,7 @@ block-water-extractor-full
   index: -1
 block-water-full
   rotate: false
-  xy: 1886, 1061
+  xy: 1810, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4171,56 +4178,56 @@ block-wraith-factory-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1810, 993
+  xy: 1836, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1844, 993
+  xy: 1870, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1878, 993
+  xy: 1904, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1912, 993
+  xy: 1938, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1946, 993
+  xy: 1972, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1980, 993
+  xy: 1734, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 2014, 993
+  xy: 1768, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 1301, 801
+  xy: 1802, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4458,7 +4465,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1380, 959
+  xy: 1904, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4472,196 +4479,196 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1380, 925
+  xy: 1938, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 1219, 1257
+  xy: 1158, 999
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1414, 951
+  xy: 2014, 1053
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-small
   rotate: false
-  xy: 1913, 865
+  xy: 1369, 483
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-tiny
   rotate: false
-  xy: 623, 1709
+  xy: 566, 929
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 1575, 1281
+  xy: 1158, 1141
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 1219, 1215
+  xy: 1219, 1257
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1414, 917
+  xy: 1251, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal-small
   rotate: false
-  xy: 1879, 797
+  xy: 1262, 897
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-tiny
   rotate: false
-  xy: 649, 1399
+  xy: 660, 831
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 1625, 1281
+  xy: 1158, 1091
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 1208, 1007
+  xy: 1219, 1215
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1482, 985
+  xy: 1251, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 1243, 775
+  xy: 1501, 951
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 987, 776
+  xy: 749, 733
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 1675, 1281
+  xy: 1158, 1041
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-graphite-large
   rotate: false
-  xy: 1011, 1502
+  xy: 1725, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1482, 951
+  xy: 1251, 319
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 1251, 341
+  xy: 1471, 849
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 924, 867
+  xy: 623, 1709
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 1725, 1281
+  xy: 1208, 1141
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 1011, 1460
+  xy: 1011, 1502
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1414, 883
+  xy: 1301, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 1273, 647
+  xy: 1501, 925
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 924, 849
+  xy: 1425, 1329
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1775, 1281
+  xy: 1208, 1091
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 99, 2
+  xy: 1200, 999
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1482, 883
+  xy: 1335, 975
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4675,322 +4682,322 @@ item-metaglass-small
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 1345, 1239
+  xy: 649, 1399
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1825, 1281
+  xy: 1208, 1041
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 1261, 1215
+  xy: 1767, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1403, 815
+  xy: 1301, 917
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 1913, 839
+  xy: 1262, 871
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-tiny
   rotate: false
-  xy: 1345, 1221
+  xy: 987, 776
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1875, 1281
+  xy: 1375, 1297
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 1303, 1215
+  xy: 1011, 1460
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1403, 781
+  xy: 1301, 883
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 1939, 865
+  xy: 1527, 951
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 1516, 1001
+  xy: 1219, 1197
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1925, 1281
+  xy: 1325, 1265
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 1258, 1173
+  xy: 1809, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1471, 849
+  xy: 1301, 849
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1269, 775
+  xy: 1471, 823
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 2026, 975
+  xy: 924, 867
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1975, 1281
+  xy: 1375, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 1258, 1131
+  xy: 1851, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1471, 815
+  xy: 1301, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1295, 775
+  xy: 1501, 899
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 1209, 469
+  xy: 924, 849
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1267, 1257
+  xy: 1425, 1273
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 1300, 1173
+  xy: 1893, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1516, 959
+  xy: 1301, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 1251, 315
+  xy: 1527, 925
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 1250, 869
+  xy: 1405, 1229
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1317, 1257
+  xy: 1425, 1223
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1258, 1089
+  xy: 1935, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1550, 959
+  xy: 1301, 747
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 1273, 621
+  xy: 1553, 951
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 1347, 783
+  xy: 1209, 471
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1367, 1239
+  xy: 1475, 1273
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 1300, 1131
+  xy: 1977, 1189
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1550, 925
+  xy: 1301, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1939, 839
+  xy: 1471, 797
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 1303, 731
+  xy: 1251, 267
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 1417, 1231
+  xy: 1475, 1223
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 1300, 1089
+  xy: 99, 2
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1550, 891
+  xy: 1301, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1965, 865
+  xy: 1527, 899
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 1329, 757
+  xy: 1369, 991
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 1467, 1223
+  xy: 1525, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 1258, 1047
+  xy: 1261, 1215
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1618, 959
+  xy: 1301, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1321, 775
+  xy: 1553, 925
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 1251, 271
+  xy: 2025, 1313
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5004,35 +5011,35 @@ item-thorium-xlarge
   index: -1
 item-titanium-large
   rotate: false
-  xy: 1300, 1047
+  xy: 1186, 957
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1618, 925
+  xy: 1301, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1303, 749
+  xy: 1579, 951
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 1273, 577
+  xy: 1501, 881
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 1575, 1231
+  xy: 1575, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5046,140 +5053,140 @@ lancer
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 1250, 1005
+  xy: 1186, 915
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1618, 891
+  xy: 1301, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 1251, 289
+  xy: 1553, 899
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 1991, 847
+  xy: 1605, 933
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 1775, 1231
+  xy: 1675, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1292, 1005
+  xy: 1186, 873
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1686, 959
+  xy: 1301, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 1273, 595
+  xy: 1579, 925
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 222, 1129
+  xy: 1631, 959
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 1825, 1231
+  xy: 1675, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 1236, 963
+  xy: 1258, 1173
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1720, 891
+  xy: 1285, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 1965, 839
+  xy: 1605, 951
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 584, 929
+  xy: 222, 1129
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 1875, 1231
+  xy: 1725, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 1236, 921
+  xy: 1258, 1131
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1788, 959
+  xy: 1285, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 1991, 865
+  xy: 1579, 899
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 678, 831
+  xy: 584, 929
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 1925, 1231
+  xy: 1725, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5193,21 +5200,21 @@ mass-driver
   index: -1
 mech-alpha-mech-full
   rotate: false
-  xy: 1975, 1231
+  xy: 1775, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-dart-ship-full
   rotate: false
-  xy: 1119, 1249
+  xy: 1775, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-delta-mech-full
   rotate: false
-  xy: 1169, 1249
+  xy: 1825, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5221,28 +5228,28 @@ mech-glaive-ship-full
   index: -1
 mech-javelin-ship-full
   rotate: false
-  xy: 1119, 1199
+  xy: 1825, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-omega-mech-full
   rotate: false
-  xy: 1333, 1374
+  xy: 1243, 70
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 mech-tau-mech-full
   rotate: false
-  xy: 1243, 70
+  xy: 1267, 1307
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 mech-trident-ship-full
   rotate: false
-  xy: 1267, 1307
+  xy: 157, 25
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5256,7 +5263,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1539, 823
+  xy: 1369, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5284,7 +5291,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 1573, 823
+  xy: 1369, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5298,7 +5305,7 @@ spectre
   index: -1
 swarmer
   rotate: false
-  xy: 1177, 200
+  xy: 1177, 134
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -5312,14 +5319,14 @@ unit-chaos-array-full
   index: -1
 unit-crawler-full
   rotate: false
-  xy: 1208, 1149
+  xy: 1575, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 1208, 1099
+  xy: 1625, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5333,217 +5340,217 @@ unit-eradicator-full
   index: -1
 unit-eruptor-full
   rotate: false
-  xy: 1069, 1365
+  xy: 1135, 1431
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unit-fortress-full
   rotate: false
-  xy: 1135, 1431
+  xy: 1069, 1299
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unit-titan-full
   rotate: false
-  xy: 1069, 1299
+  xy: 1135, 1365
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 1267, 1431
+  xy: 1267, 1365
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1414, 985
+  xy: 2006, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1448, 985
+  xy: 2014, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1448, 951
+  xy: 1251, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1448, 917
+  xy: 1251, 353
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1482, 917
+  xy: 1251, 285
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1448, 883
+  xy: 1301, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1403, 849
+  xy: 1335, 941
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1437, 849
+  xy: 1335, 907
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1437, 815
+  xy: 1335, 873
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1437, 781
+  xy: 1335, 839
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1471, 781
+  xy: 1335, 805
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1516, 925
+  xy: 1335, 771
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1516, 891
+  xy: 1335, 737
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1584, 959
+  xy: 1335, 703
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1584, 925
+  xy: 1335, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1584, 891
+  xy: 1335, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1652, 959
+  xy: 1335, 601
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1652, 925
+  xy: 1335, 567
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1754, 959
+  xy: 1285, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1754, 925
+  xy: 1285, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alpha-mech
   rotate: false
-  xy: 1398, 1447
+  xy: 1399, 1447
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-mech-base
   rotate: false
-  xy: 1203, 18
+  xy: 1261, 20
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-mech-leg
   rotate: false
-  xy: 1253, 20
+  xy: 1399, 1397
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech
   rotate: false
-  xy: 1791, 1331
+  xy: 1849, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-base
   rotate: false
-  xy: 1841, 1331
+  xy: 1899, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 1891, 1331
+  xy: 1949, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 omega-mech
   rotate: false
-  xy: 157, 25
+  xy: 215, 25
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5557,42 +5564,42 @@ omega-mech-armor
   index: -1
 omega-mech-base
   rotate: false
-  xy: 215, 25
+  xy: 273, 25
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-mech-leg
   rotate: false
-  xy: 273, 25
+  xy: 331, 25
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-mech
   rotate: false
-  xy: 979, 3
+  xy: 1037, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-mech-base
   rotate: false
-  xy: 1186, 949
+  xy: 1975, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-mech-leg
   rotate: false
-  xy: 1186, 899
+  xy: 1525, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 1741, 1331
+  xy: 1799, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5606,21 +5613,21 @@ glaive-ship
   index: -1
 javelin-ship
   rotate: false
-  xy: 1625, 1231
+  xy: 1575, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-ship-shield
   rotate: false
-  xy: 1675, 1231
+  xy: 1625, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 1037, 3
+  xy: 1095, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5641,7 +5648,7 @@ circle
   index: -1
 shape-3
   rotate: false
-  xy: 1333, 1432
+  xy: 1333, 1366
   size: 63, 63
   orig: 63, 63
   offset: 0, 0
@@ -5669,49 +5676,49 @@ chaos-array-leg
   index: -1
 crawler
   rotate: false
-  xy: 1441, 1331
+  xy: 1499, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 1491, 1331
+  xy: 1549, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 1541, 1331
+  xy: 1599, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 1591, 1331
+  xy: 1649, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 1641, 1331
+  xy: 1699, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 1691, 1331
+  xy: 1749, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug
   rotate: false
-  xy: 1941, 1331
+  xy: 1999, 1331
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5802,14 +5809,14 @@ lich
   index: -1
 phantom
   rotate: false
-  xy: 331, 25
+  xy: 815, 7
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 power-cell
   rotate: false
-  xy: 815, 7
+  xy: 979, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5830,63 +5837,63 @@ revenant
   index: -1
 spirit
   rotate: false
-  xy: 1158, 1049
+  xy: 1925, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titan
   rotate: false
-  xy: 1177, 134
+  xy: 1177, 68
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-leg
   rotate: false
-  xy: 1177, 68
+  xy: 1069, 1431
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wraith
   rotate: false
-  xy: 1208, 1049
+  xy: 1675, 1181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery-equip
   rotate: false
-  xy: 1325, 1307
+  xy: 1449, 1373
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 blaster-equip
   rotate: false
-  xy: 1398, 1397
+  xy: 1499, 1381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 bomber-equip
   rotate: false
-  xy: 1998, 1381
+  xy: 1448, 1323
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 1998, 1381
+  xy: 1448, 1323
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 1391, 1347
+  xy: 1267, 1257
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5907,63 +5914,63 @@ eradication-equip
   index: -1
 eruption-equip
   rotate: false
-  xy: 1375, 1289
+  xy: 1119, 1241
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 1425, 1281
+  xy: 1119, 1191
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 1475, 1273
+  xy: 1169, 1241
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 1525, 1281
+  xy: 1169, 1191
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles-equip
   rotate: false
-  xy: 1725, 1231
+  xy: 1625, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun-equip
   rotate: false
-  xy: 1169, 1199
+  xy: 1875, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles-equip
   rotate: false
-  xy: 1158, 1149
+  xy: 1875, 1231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 1158, 1099
+  xy: 1925, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 1158, 999
+  xy: 1975, 1281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index fb27149b8f..065e98c094 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png
index 7cd10c87d2..80dc51ef77 100644
Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ
diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png
index 82e66a4467..4d5fd922eb 100644
Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 35ac946dfa..76d5ee40e2 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -624,10 +624,6 @@ public class Blocks implements ContentList{
             );
             hasPower = true;
             craftTime = 35f;
-            spinnerLength = 1.5f;
-            spinnerRadius = 3.5f;
-            spinnerThickness = 1.5f;
-            spinnerSpeed = 3f;
             size = 2;
 
             consumes.power(1f);
diff --git a/core/src/mindustry/entities/type/Unit.java b/core/src/mindustry/entities/type/Unit.java
index 42463dc508..05dd89a4d6 100644
--- a/core/src/mindustry/entities/type/Unit.java
+++ b/core/src/mindustry/entities/type/Unit.java
@@ -242,6 +242,10 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
         return tile == null ? (Floor)Blocks.air : tile.floor();
     }
 
+    public @Nullable Tile tileOn(){
+        return world.tileWorld(x, y);
+    }
+
     public void onRespawn(Tile tile){
     }
 
diff --git a/core/src/mindustry/ui/ItemImage.java b/core/src/mindustry/ui/ItemImage.java
index f04a8f0dab..aed8997f5f 100644
--- a/core/src/mindustry/ui/ItemImage.java
+++ b/core/src/mindustry/ui/ItemImage.java
@@ -27,7 +27,7 @@ public class ItemImage extends Stack{
 
         if(stack.amount != 0){
             Table t = new Table().left().bottom();
-            t.add(stack.amount + "").name("item-label");
+            t.add(stack.amount + "").name("item-label").style(Styles.outlineLabel);
             add(t);
         }
     }
diff --git a/core/src/mindustry/ui/LiquidDisplay.java b/core/src/mindustry/ui/LiquidDisplay.java
index 7ce5c0504e..6c645e6218 100644
--- a/core/src/mindustry/ui/LiquidDisplay.java
+++ b/core/src/mindustry/ui/LiquidDisplay.java
@@ -24,13 +24,13 @@ public class LiquidDisplay extends Table{
 
             if(amount != 0){
                 Table t = new Table().left().bottom();
-                t.add(Strings.autoFixed(amount, 1));
+                t.add(Strings.autoFixed(amount, 1)).style(Styles.outlineLabel);
                 add(t);
             }
         }}).size(8 * 4).padRight(3  + (amount != 0 && Strings.autoFixed(amount, 1).length() > 2 ? 8 : 0));
 
         if(perSecond){
-            add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.lightGray);
+            add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.lightGray).style(Styles.outlineLabel);
         }
 
         add(liquid.localizedName);
diff --git a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
index 378359f631..020f345598 100644
--- a/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
+++ b/core/src/mindustry/ui/fragments/ScriptConsoleFragment.java
@@ -53,7 +53,7 @@ public class ScriptConsoleFragment extends Table{
                 clearChatInput();
             }
 
-            return shown && Vars.net.active();
+            return shown && !Vars.net.active();
         });
 
         update(() -> {
diff --git a/core/src/mindustry/world/blocks/production/Separator.java b/core/src/mindustry/world/blocks/production/Separator.java
index 64ab3783c2..7361b8f4bb 100644
--- a/core/src/mindustry/world/blocks/production/Separator.java
+++ b/core/src/mindustry/world/blocks/production/Separator.java
@@ -1,6 +1,6 @@
 package mindustry.world.blocks.production;
 
-import arc.graphics.*;
+import arc.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.ArcAnnotate.*;
@@ -15,15 +15,11 @@ import mindustry.world.meta.values.*;
  * Extracts a random list of items from an input item and an input liquid.
  */
 public class Separator extends Block{
-    protected @NonNull ItemStack[] results;
-    protected float craftTime;
-    protected float spinnerRadius = 2.5f;
-    protected float spinnerLength = 1f;
-    protected float spinnerThickness = 1f;
-    protected float spinnerSpeed = 2f;
+    public @NonNull ItemStack[] results;
+    public float craftTime;
 
-    protected Color color = Color.valueOf("858585");
-    protected int liquidRegion;
+    public int liquidRegion, spinnerRegion;
+    public float spinnerSpeed = 3f;
 
     public Separator(String name){
         super(name);
@@ -33,6 +29,7 @@ public class Separator extends Block{
         hasLiquids = true;
 
         liquidRegion = reg("-liquid");
+        spinnerRegion = reg("-spinner");
         entityType = GenericCrafterEntity::new;
     }
 
@@ -70,10 +67,10 @@ public class Separator extends Block{
         Draw.alpha(tile.entity.liquids.total() / liquidCapacity);
         Draw.rect(reg(liquidRegion), tile.drawx(), tile.drawy());
 
-        Draw.color(color);
-        Lines.stroke(spinnerThickness);
-        Lines.spikes(tile.drawx(), tile.drawy(), spinnerRadius, spinnerLength, 3, entity.totalProgress * spinnerSpeed);
         Draw.reset();
+        if(Core.atlas.isFound(reg(spinnerRegion))){
+            Draw.rect(reg(spinnerRegion), tile.drawx(), tile.drawy(), entity.totalProgress * spinnerSpeed);
+        }
     }
 
     @Override