diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index a97ef7aa5c..775a7d4051 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: 1325, 363
+  xy: 1157, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -32,30 +32,37 @@ overdrive-projector-top
   orig: 64, 64
   offset: 0, 0
   index: -1
+shock-mine
+  rotate: false
+  xy: 1429, 270
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 bridge-arrow
   rotate: false
-  xy: 1503, 1113
+  xy: 1055, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1445, 1073
+  xy: 987, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1479, 1073
+  xy: 1021, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1513, 1079
+  xy: 1055, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -83,7 +90,7 @@ armored-conveyor-0-1
   index: -1
 armored-conveyor-0-2
   rotate: false
-  xy: 1201, 782
+  xy: 1267, 848
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -132,14 +139,14 @@ armored-conveyor-2-0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 1229, 870
+  xy: 1295, 936
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 1229, 836
+  xy: 1295, 902
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -181,175 +188,175 @@ armored-conveyor-3-3
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 1133, 749
+  xy: 1133, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 1133, 715
+  xy: 1133, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 1167, 748
+  xy: 1133, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 1133, 681
+  xy: 1133, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1269, 797
+  xy: 1201, 746
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1269, 763
+  xy: 1235, 746
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1269, 729
+  xy: 1201, 712
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1269, 695
+  xy: 1269, 746
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1269, 661
+  xy: 1235, 712
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1269, 627
+  xy: 1201, 678
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1269, 593
+  xy: 1303, 746
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1257, 559
+  xy: 1269, 712
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1257, 525
+  xy: 1235, 678
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1257, 491
+  xy: 1201, 644
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1257, 457
+  xy: 1303, 712
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1257, 423
+  xy: 1269, 678
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1257, 389
+  xy: 1235, 644
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1257, 355
+  xy: 1201, 610
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1291, 559
+  xy: 1303, 678
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1291, 525
+  xy: 1269, 644
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1291, 491
+  xy: 1235, 610
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1291, 457
+  xy: 1201, 576
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1291, 423
+  xy: 1303, 644
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1123, 229
+  xy: 1429, 236
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1123, 195
+  xy: 1429, 202
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -363,119 +370,119 @@ titanium-conveyor-0-3
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1567, 1275
+  xy: 1157, 165
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1601, 1275
+  xy: 1191, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1635, 1275
+  xy: 1225, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1669, 1275
+  xy: 1259, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1703, 1275
+  xy: 1293, 168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1737, 1275
+  xy: 1327, 168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1577, 1241
+  xy: 1361, 168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1611, 1241
+  xy: 1395, 168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1645, 1241
+  xy: 1429, 168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1679, 1241
+  xy: 1157, 131
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1713, 1241
+  xy: 1191, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1747, 1241
+  xy: 1225, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1603, 1207
+  xy: 1259, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1637, 1207
+  xy: 1293, 134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1671, 1207
+  xy: 1327, 134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1705, 1207
+  xy: 1361, 134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 1021, 259
+  xy: 1189, 439
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -489,21 +496,28 @@ mass-driver-base
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1393, 533
+  xy: 1191, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1393, 499
+  xy: 1191, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1393, 465
+  xy: 1225, 303
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+underflow-gate
+  rotate: false
+  xy: 1429, 134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -650,56 +664,56 @@ pneumatic-drill-top
   index: -1
 water-extractor
   rotate: false
-  xy: 1179, 969
+  xy: 1245, 1035
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 1245, 1035
+  xy: 1311, 1101
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 1311, 1101
+  xy: 1377, 1167
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 1377, 1167
+  xy: 1443, 1233
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 1201, 714
+  xy: 1247, 814
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1303, 899
+  xy: 1525, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1661, 1411
+  xy: 1729, 1377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 919, 318
+  xy: 1185, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -713,182 +727,175 @@ place-arrow
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1537, 1113
+  xy: 1089, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1537, 1113
+  xy: 1089, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1571, 1113
+  xy: 919, 216
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1331, 805
+  xy: 953, 210
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1581, 1079
+  xy: 893, 182
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1121, 375
+  xy: 1117, 369
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1155, 374
+  xy: 1151, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1189, 374
+  xy: 1131, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1189, 374
+  xy: 1131, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1189, 374
+  xy: 1131, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1189, 374
+  xy: 1131, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1223, 374
+  xy: 1165, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 953, 312
+  xy: 1199, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 987, 293
+  xy: 1167, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1021, 293
+  xy: 1167, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1055, 293
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-plated-conduit-top-3
-  rotate: false
-  xy: 1055, 293
+  xy: 1167, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1055, 293
+  xy: 1167, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1089, 293
+  xy: 1167, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1365, 839
+  xy: 1167, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1365, 805
+  xy: 1167, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1359, 533
+  xy: 1337, 610
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1325, 465
+  xy: 1337, 576
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1359, 499
+  xy: 1359, 542
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1325, 431
+  xy: 1359, 508
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1359, 465
+  xy: 1359, 474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -916,112 +923,119 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1359, 397
+  xy: 1157, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1359, 363
+  xy: 1157, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1393, 567
+  xy: 1157, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1393, 431
+  xy: 1191, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1393, 397
+  xy: 1225, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1393, 363
+  xy: 1191, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1325, 329
+  xy: 1225, 235
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+plated-conduit-top-3
+  rotate: false
+  xy: 1225, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1359, 329
+  xy: 1259, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1393, 329
+  xy: 1259, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 919, 250
+  xy: 1259, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 953, 244
+  xy: 1293, 304
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 987, 225
+  xy: 1293, 270
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1021, 225
+  xy: 1327, 304
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1055, 225
+  xy: 1293, 236
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1089, 225
+  xy: 1327, 270
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 919, 216
+  xy: 1361, 304
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1070,28 +1084,28 @@ omega-mech-pad
   index: -1
 tau-mech-pad
   rotate: false
-  xy: 1311, 1167
+  xy: 1377, 1233
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 trident-ship-pad
   rotate: false
-  xy: 1047, 837
+  xy: 1113, 903
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 1167, 714
+  xy: 1133, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-battery-full
   rotate: false
-  xy: 1167, 714
+  xy: 1133, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1119,14 +1133,14 @@ battery-large-top
   index: -1
 battery-top
   rotate: false
-  xy: 1201, 748
+  xy: 1179, 815
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1547, 1079
+  xy: 1089, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1147,14 +1161,14 @@ differential-generator-top
   index: -1
 diode-arrow
   rotate: false
-  xy: 1055, 259
+  xy: 1189, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1337, 771
+  xy: 1291, 542
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1208,9 +1222,16 @@ impact-reactor-plasma-3
   orig: 128, 128
   offset: 0, 0
   index: -1
+power-source
+  rotate: false
+  xy: 1259, 201
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 rtg-generator-top
   rotate: false
-  xy: 893, 182
+  xy: 1361, 236
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1231,7 +1252,7 @@ thorium-reactor-lights
   index: -1
 turbine-generator-top
   rotate: false
-  xy: 1113, 903
+  xy: 1179, 969
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1357,84 +1378,84 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 953, 210
+  xy: 1293, 202
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 987, 191
+  xy: 1327, 236
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1021, 191
+  xy: 1361, 270
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 1047, 969
+  xy: 1113, 1035
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-spinner
   rotate: false
-  xy: 1113, 1035
+  xy: 1179, 1101
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press
   rotate: false
-  xy: 1245, 1167
+  xy: 1311, 1233
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame0
   rotate: false
-  xy: 1311, 1233
+  xy: 981, 837
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame1
   rotate: false
-  xy: 981, 837
+  xy: 1047, 903
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame2
   rotate: false
-  xy: 1047, 903
+  xy: 1113, 969
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-liquid
   rotate: false
-  xy: 1113, 969
+  xy: 1179, 1035
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-top
   rotate: false
-  xy: 1179, 1035
+  xy: 1245, 1101
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 1605, 1173
+  xy: 1567, 1275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1448,7 +1469,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 1133, 647
+  xy: 1171, 781
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1525,14 +1546,14 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 883, 282
+  xy: 1361, 202
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 1047, 771
+  xy: 1113, 837
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1651,7 +1672,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1089, 191
+  xy: 1327, 202
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1672,7 +1693,7 @@ revenant-factory-top
   index: -1
 spirit-factory-top
   rotate: false
-  xy: 1179, 1101
+  xy: 1245, 1167
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1686,7 +1707,7 @@ titan-factory
   index: -1
 wraith-factory-top
   rotate: false
-  xy: 1113, 837
+  xy: 1179, 903
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1700,14 +1721,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1089, 259
+  xy: 1223, 542
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 insulator-wall
   rotate: false
-  xy: 1303, 703
+  xy: 1257, 508
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1733,51 +1754,58 @@ scrap-wall-huge3
   orig: 96, 96
   offset: 0, 0
   index: -1
-scrap-wall-large2
+scrap-wall-large1
   rotate: false
   xy: 1179, 1167
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-scrap-wall-large3
+scrap-wall-large2
   rotate: false
   xy: 1245, 1233
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-scrap-wall-large4
+scrap-wall-large3
   rotate: false
   xy: 981, 903
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+scrap-wall-large4
+  rotate: false
+  xy: 1047, 969
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 scrap-wall2
   rotate: false
-  xy: 883, 248
+  xy: 1395, 236
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1123, 297
+  xy: 1395, 202
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1123, 263
+  xy: 1429, 304
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1123, 263
+  xy: 1429, 304
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1791,7 +1819,7 @@ bullet
   index: -1
 bullet-back
   rotate: false
-  xy: 1113, 783
+  xy: 1179, 849
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
@@ -1896,7 +1924,7 @@ shell
   index: -1
 shell-back
   rotate: false
-  xy: 1179, 816
+  xy: 1245, 882
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
@@ -1910,7 +1938,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1739, 1207
+  xy: 1395, 134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1924,14 +1952,14 @@ white
   index: -1
 arc
   rotate: false
-  xy: 1167, 782
+  xy: 1233, 848
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-arc-full
   rotate: false
-  xy: 1167, 680
+  xy: 1213, 814
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1945,49 +1973,49 @@ block-blast-drill-full
   index: -1
 block-bridge-conduit-full
   rotate: false
-  xy: 1133, 613
+  xy: 1205, 780
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1133, 613
+  xy: 1205, 780
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-bridge-conveyor-full
   rotate: false
-  xy: 1167, 646
+  xy: 1239, 780
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1167, 646
+  xy: 1239, 780
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-char-full
   rotate: false
-  xy: 1201, 680
+  xy: 1281, 814
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliff-full
   rotate: false
-  xy: 1201, 646
+  xy: 1273, 780
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 1167, 612
+  xy: 1491, 1435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2008,14 +2036,14 @@ coal-centrifuge
   index: -1
 block-combustion-generator-full
   rotate: false
-  xy: 1201, 612
+  xy: 1491, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 1201, 612
+  xy: 1491, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2036,7 +2064,7 @@ command-center
   index: -1
 block-conduit-full
   rotate: false
-  xy: 1133, 579
+  xy: 1491, 1367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2057,28 +2085,28 @@ container
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 1167, 578
+  xy: 229, 219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1167, 578
+  xy: 229, 219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-copper-wall-full
   rotate: false
-  xy: 1201, 578
+  xy: 1369, 1067
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 1201, 578
+  xy: 1369, 1067
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2141,7 +2169,7 @@ core-shard
   index: -1
 block-craters-full
   rotate: false
-  xy: 1121, 545
+  xy: 1369, 1033
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2183,77 +2211,77 @@ block-dagger-factory-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 1121, 511
+  xy: 1403, 1075
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-1-full
   rotate: false
-  xy: 1121, 477
+  xy: 1403, 1041
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-2-full
   rotate: false
-  xy: 1121, 443
+  xy: 1443, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-3-full
   rotate: false
-  xy: 1121, 409
+  xy: 1477, 1141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-4-full
   rotate: false
-  xy: 1155, 544
+  xy: 1511, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-5-full
   rotate: false
-  xy: 1155, 510
+  xy: 1545, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-panel-6-full
   rotate: false
-  xy: 1189, 544
+  xy: 1569, 1181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 1155, 476
+  xy: 1579, 1147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-tainted-water-full
   rotate: false
-  xy: 1189, 510
+  xy: 1898, 1525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-water-full
   rotate: false
-  xy: 1155, 442
+  xy: 1932, 1517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-deepwater-full
   rotate: false
-  xy: 1189, 476
+  xy: 1133, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2274,14 +2302,14 @@ differential-generator
   index: -1
 block-diode-full
   rotate: false
-  xy: 1189, 442
+  xy: 1121, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode
   rotate: false
-  xy: 1189, 442
+  xy: 1121, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2302,14 +2330,14 @@ distributor
   index: -1
 block-door-full
   rotate: false
-  xy: 1155, 408
+  xy: 1121, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 1155, 408
+  xy: 1121, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2337,14 +2365,14 @@ block-draug-factory-full
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 1189, 408
+  xy: 1121, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 1223, 544
+  xy: 1121, 439
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2400,70 +2428,70 @@ graphite-press
   index: -1
 block-grass-full
   rotate: false
-  xy: 1223, 510
+  xy: 1121, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hail-full
   rotate: false
-  xy: 1223, 476
+  xy: 1155, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1223, 442
+  xy: 1155, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 1223, 408
+  xy: 1155, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 1491, 1435
+  xy: 1155, 439
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 1491, 1401
+  xy: 1155, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 1491, 1367
+  xy: 1301, 868
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 229, 219
+  xy: 1335, 1009
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-illuminator-full
   rotate: false
-  xy: 1303, 1001
+  xy: 1369, 999
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1303, 1001
+  xy: 1369, 999
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2477,70 +2505,70 @@ block-impact-reactor-full
   index: -1
 block-incinerator-full
   rotate: false
-  xy: 1303, 967
+  xy: 1403, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 1303, 967
+  xy: 1403, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-inverted-sorter-full
   rotate: false
-  xy: 1337, 1009
+  xy: 1335, 975
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1337, 1009
+  xy: 1335, 975
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-source-full
   rotate: false
-  xy: 1337, 975
+  xy: 1369, 965
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1337, 975
+  xy: 1369, 965
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-item-void-full
   rotate: false
-  xy: 1377, 1075
+  xy: 1403, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1377, 1075
+  xy: 1403, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-junction-full
   rotate: false
-  xy: 1411, 1075
+  xy: 1329, 941
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1411, 1075
+  xy: 1329, 941
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2603,35 +2631,35 @@ launch-pad-large
   index: -1
 block-liquid-junction-full
   rotate: false
-  xy: 1898, 1525
+  xy: 1329, 907
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1898, 1525
+  xy: 1329, 907
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 1932, 1517
+  xy: 1363, 931
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-liquid-source-full
   rotate: false
-  xy: 1569, 1181
+  xy: 1363, 897
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 1569, 1181
+  xy: 1363, 897
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2645,21 +2673,21 @@ block-liquid-tank-full
   index: -1
 block-liquid-void-full
   rotate: false
-  xy: 1235, 802
+  xy: 1307, 780
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1235, 802
+  xy: 1307, 780
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 1235, 768
+  xy: 1507, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2680,14 +2708,14 @@ block-mechanical-drill-full
   index: -1
 block-mechanical-pump-full
   rotate: false
-  xy: 1235, 734
+  xy: 1541, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1235, 734
+  xy: 1541, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2701,14 +2729,14 @@ block-meltdown-full
   index: -1
 block-melter-full
   rotate: false
-  xy: 1235, 700
+  xy: 1575, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1235, 700
+  xy: 1575, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2729,70 +2757,70 @@ mend-projector
   index: -1
 block-mender-full
   rotate: false
-  xy: 1235, 666
+  xy: 1609, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender
   rotate: false
-  xy: 1235, 666
+  xy: 1609, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-message-full
   rotate: false
-  xy: 1235, 632
+  xy: 1643, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1235, 632
+  xy: 1643, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-2-full
   rotate: false
-  xy: 1235, 598
+  xy: 1677, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-3-full
   rotate: false
-  xy: 1269, 943
+  xy: 1403, 939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-5-full
   rotate: false
-  xy: 1303, 933
+  xy: 1397, 905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 1337, 941
+  xy: 1525, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-metal-floor-full
   rotate: false
-  xy: 1269, 909
+  xy: 1525, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1337, 907
+  xy: 1559, 1445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2820,42 +2848,42 @@ block-oil-extractor-full
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 1263, 875
+  xy: 1559, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1263, 841
+  xy: 1593, 1445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1297, 865
+  xy: 1559, 1377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1297, 831
+  xy: 1627, 1445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1507, 1477
+  xy: 1593, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1541, 1479
+  xy: 1661, 1445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2876,21 +2904,21 @@ overdrive-projector
   index: -1
 block-overflow-gate-full
   rotate: false
-  xy: 1575, 1479
+  xy: 1627, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 1575, 1479
+  xy: 1627, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1609, 1479
+  xy: 1593, 1377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2904,42 +2932,42 @@ block-phantom-factory-full
   index: -1
 block-phase-conduit-full
   rotate: false
-  xy: 1643, 1479
+  xy: 1661, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1643, 1479
+  xy: 1661, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-conveyor-full
   rotate: false
-  xy: 1677, 1479
+  xy: 1627, 1377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1677, 1479
+  xy: 1627, 1377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-wall-full
   rotate: false
-  xy: 1435, 1133
+  xy: 1661, 1377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1435, 1133
+  xy: 1661, 1377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2988,14 +3016,14 @@ plastanium-compressor
   index: -1
 block-plastanium-wall-full
   rotate: false
-  xy: 1469, 1141
+  xy: 1533, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1469, 1141
+  xy: 1533, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3016,7 +3044,7 @@ plastanium-wall-large
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1503, 1147
+  xy: 1533, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3030,14 +3058,14 @@ block-pneumatic-drill-full
   index: -1
 block-power-node-full
   rotate: false
-  xy: 1537, 1147
+  xy: 1567, 1343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 1537, 1147
+  xy: 1567, 1343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3058,42 +3086,35 @@ power-node-large
   index: -1
 block-power-source-full
   rotate: false
-  xy: 1571, 1147
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-power-source
-  rotate: false
-  xy: 1571, 1147
+  xy: 1601, 1343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-power-void-full
   rotate: false
-  xy: 1337, 873
+  xy: 1567, 1309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1337, 873
+  xy: 1567, 1309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1331, 839
+  xy: 1635, 1343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1525, 1443
+  xy: 1601, 1309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3114,7 +3135,7 @@ pyratite-mixer
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1525, 1409
+  xy: 1635, 1309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3142,7 +3163,7 @@ block-rock-full
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1525, 1375
+  xy: 1669, 1343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3163,14 +3184,14 @@ rotary-pump
   index: -1
 block-router-full
   rotate: false
-  xy: 1559, 1445
+  xy: 1669, 1309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1559, 1445
+  xy: 1669, 1309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3191,14 +3212,14 @@ rtg-generator
   index: -1
 block-salt-full
   rotate: false
-  xy: 1559, 1411
+  xy: 1695, 1445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1593, 1445
+  xy: 1695, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3212,28 +3233,28 @@ block-salvo-full
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1559, 1377
+  xy: 1695, 1377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1627, 1445
+  xy: 1703, 1343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-water-full
   rotate: false
-  xy: 1593, 1411
+  xy: 1703, 1309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1661, 1445
+  xy: 1711, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3247,21 +3268,21 @@ block-scatter-full
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1627, 1411
+  xy: 1729, 1445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1593, 1377
+  xy: 1729, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1593, 1377
+  xy: 1729, 1411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3301,13 +3322,6 @@ block-scrap-wall-large-full
   orig: 64, 64
   offset: 0, 0
   index: -1
-scrap-wall-large1
-  rotate: false
-  xy: 751, 614
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 block-separator-full
   rotate: false
   xy: 751, 548
@@ -3324,42 +3338,35 @@ separator
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1627, 1377
+  xy: 1737, 1343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1661, 1377
+  xy: 1737, 1309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1533, 1341
+  xy: 1397, 871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shock-mine-full
   rotate: false
-  xy: 1533, 1307
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shock-mine
-  rotate: false
-  xy: 1533, 1307
+  xy: 919, 318
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1567, 1343
+  xy: 953, 312
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3380,14 +3387,14 @@ silicon-smelter
   index: -1
 block-slag-full
   rotate: false
-  xy: 1601, 1343
+  xy: 987, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 1567, 1309
+  xy: 1021, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3408,21 +3415,21 @@ block-snowrock-full
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1635, 1343
+  xy: 1055, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-solar-panel-full
   rotate: false
-  xy: 1601, 1309
+  xy: 1089, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1601, 1309
+  xy: 1089, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3443,21 +3450,21 @@ solar-panel-large
   index: -1
 block-sorter-full
   rotate: false
-  xy: 1635, 1309
+  xy: 1511, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1635, 1309
+  xy: 1511, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spawn-full
   rotate: false
-  xy: 1669, 1343
+  xy: 1545, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3485,7 +3492,7 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1669, 1309
+  xy: 1579, 1113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3506,14 +3513,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1695, 1445
+  xy: 1431, 905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1695, 1411
+  xy: 1431, 871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3534,14 +3541,14 @@ surge-tower
   index: -1
 block-surge-wall-full
   rotate: false
-  xy: 1695, 1377
+  xy: 919, 284
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1695, 1377
+  xy: 919, 284
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3569,21 +3576,21 @@ block-swarmer-full
   index: -1
 block-tainted-water-full
   rotate: false
-  xy: 1703, 1343
+  xy: 953, 278
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tar-full
   rotate: false
-  xy: 1703, 1309
+  xy: 987, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1711, 1479
+  xy: 1021, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3632,14 +3639,14 @@ thorium-reactor
   index: -1
 block-thorium-wall-full
   rotate: false
-  xy: 1729, 1445
+  xy: 1055, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 1729, 1445
+  xy: 1055, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3681,28 +3688,28 @@ block-titan-factory-full
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1729, 1411
+  xy: 1089, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1729, 1411
+  xy: 1089, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-wall-full
   rotate: false
-  xy: 1729, 1377
+  xy: 919, 250
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall
   rotate: false
-  xy: 1729, 1377
+  xy: 919, 250
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3737,28 +3744,21 @@ turbine-generator
   index: -1
 block-underflow-gate-full
   rotate: false
-  xy: 1737, 1343
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-underflow-gate
-  rotate: false
-  xy: 1737, 1343
+  xy: 953, 244
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-unloader-full
   rotate: false
-  xy: 1737, 1309
+  xy: 987, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1737, 1309
+  xy: 987, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3786,7 +3786,7 @@ block-water-extractor-full
   index: -1
 block-water-full
   rotate: false
-  xy: 1469, 1107
+  xy: 1021, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3821,56 +3821,56 @@ block-wraith-factory-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1291, 389
+  xy: 1269, 610
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1291, 355
+  xy: 1235, 576
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1513, 1045
+  xy: 1303, 610
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1547, 1045
+  xy: 1269, 576
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1581, 1045
+  xy: 1303, 576
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 919, 284
+  xy: 1189, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 953, 278
+  xy: 1189, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 987, 259
+  xy: 1189, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4108,7 +4108,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1303, 771
+  xy: 1257, 542
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4122,7 +4122,7 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1303, 737
+  xy: 1223, 508
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4134,9 +4134,16 @@ item-blast-compound-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-blast-compound-medium
+  rotate: false
+  xy: 1291, 508
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-blast-compound-small
   rotate: false
-  xy: 1577, 1215
+  xy: 583, 1412
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4162,9 +4169,16 @@ item-coal-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-coal-medium
+  rotate: false
+  xy: 1223, 440
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-coal-small
   rotate: false
-  xy: 583, 1412
+  xy: 155, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4190,16 +4204,23 @@ item-copper-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-copper-medium
+  rotate: false
+  xy: 1257, 440
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-copper-small
   rotate: false
-  xy: 1303, 805
+  xy: 181, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 1559, 1257
+  xy: 1283, 884
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4218,16 +4239,23 @@ item-graphite-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-graphite-medium
+  rotate: false
+  xy: 1291, 440
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-graphite-small
   rotate: false
-  xy: 155, 227
+  xy: 1559, 1249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 1217, 818
+  xy: 852, 1543
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4246,16 +4274,23 @@ item-lead-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-lead-medium
+  rotate: false
+  xy: 1291, 406
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-lead-small
   rotate: false
-  xy: 181, 227
+  xy: 927, 190
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 852, 1543
+  xy: 877, 1445
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4274,16 +4309,23 @@ item-metaglass-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-metaglass-medium
+  rotate: false
+  xy: 1253, 372
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-metaglass-small
   rotate: false
-  xy: 927, 190
+  xy: 1099, 575
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 877, 1445
+  xy: 903, 1347
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4302,6 +4344,13 @@ item-phase-fabric-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-phase-fabric-medium
+  rotate: false
+  xy: 1233, 337
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-phase-fabric-small
   rotate: false
   xy: 1934, 1925
@@ -4311,7 +4360,7 @@ item-phase-fabric-small
   index: -1
 item-phase-fabric-tiny
   rotate: false
-  xy: 903, 1347
+  xy: 921, 1347
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4330,6 +4379,13 @@ item-plastanium-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-plastanium-medium
+  rotate: false
+  xy: 1301, 338
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-plastanium-small
   rotate: false
   xy: 395, 588
@@ -4339,7 +4395,7 @@ item-plastanium-small
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 921, 1347
+  xy: 939, 1281
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4358,6 +4414,13 @@ item-pyratite-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-pyratite-medium
+  rotate: false
+  xy: 1335, 338
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-pyratite-small
   rotate: false
   xy: 219, 1164
@@ -4367,7 +4430,7 @@ item-pyratite-small
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 939, 1281
+  xy: 634, 1579
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4386,6 +4449,13 @@ item-sand-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-sand-medium
+  rotate: false
+  xy: 1325, 508
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-sand-small
   rotate: false
   xy: 553, 748
@@ -4395,7 +4465,7 @@ item-sand-small
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 634, 1579
+  xy: 1, 5
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4414,6 +4484,13 @@ item-scrap-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-scrap-medium
+  rotate: false
+  xy: 1325, 440
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-scrap-small
   rotate: false
   xy: 263, 227
@@ -4423,7 +4500,7 @@ item-scrap-small
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 1, 5
+  xy: 1301, 850
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4442,6 +4519,13 @@ item-silicon-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-silicon-medium
+  rotate: false
+  xy: 1355, 372
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-silicon-small
   rotate: false
   xy: 1966, 1525
@@ -4451,7 +4535,7 @@ item-silicon-small
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 1099, 583
+  xy: 207, 235
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4470,6 +4554,13 @@ item-spore-pod-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-spore-pod-medium
+  rotate: false
+  xy: 883, 316
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-spore-pod-small
   rotate: false
   xy: 1715, 1537
@@ -4479,7 +4570,7 @@ item-spore-pod-small
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 1435, 1115
+  xy: 953, 192
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4498,6 +4589,13 @@ item-surge-alloy-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-surge-alloy-medium
+  rotate: false
+  xy: 883, 248
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-surge-alloy-small
   rotate: false
   xy: 883, 222
@@ -4507,7 +4605,7 @@ item-surge-alloy-small
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 1235, 580
+  xy: 1715, 1519
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4526,16 +4624,23 @@ item-thorium-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-thorium-medium
+  rotate: false
+  xy: 1123, 263
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-thorium-small
   rotate: false
-  xy: 1605, 1147
+  xy: 1371, 871
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 207, 235
+  xy: 1627, 1291
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4554,16 +4659,23 @@ item-titanium-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+item-titanium-medium
+  rotate: false
+  xy: 1123, 195
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 item-titanium-small
   rotate: false
-  xy: 1639, 1181
+  xy: 1601, 1283
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 953, 192
+  xy: 1986, 1933
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4589,6 +4701,13 @@ liquid-cryofluid-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+liquid-cryofluid-medium
+  rotate: false
+  xy: 1337, 712
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-cryofluid-small
   rotate: false
   xy: 1960, 1925
@@ -4598,7 +4717,7 @@ liquid-cryofluid-small
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 1715, 1519
+  xy: 271, 1172
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4617,6 +4736,13 @@ liquid-oil-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+liquid-oil-medium
+  rotate: false
+  xy: 1337, 644
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-oil-small
   rotate: false
   xy: 395, 562
@@ -4626,7 +4752,7 @@ liquid-oil-small
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 1605, 1129
+  xy: 605, 756
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4645,6 +4771,13 @@ liquid-slag-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+liquid-slag-medium
+  rotate: false
+  xy: 1359, 406
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-slag-small
   rotate: false
   xy: 245, 1164
@@ -4654,7 +4787,7 @@ liquid-slag-small
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 1665, 1189
+  xy: 957, 1281
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4673,6 +4806,13 @@ liquid-water-large
   orig: 40, 40
   offset: 0, 0
   index: -1
+liquid-water-medium
+  rotate: false
+  xy: 1403, 338
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-water-small
   rotate: false
   xy: 579, 748
@@ -4682,7 +4822,7 @@ liquid-water-small
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 1986, 1933
+  xy: 634, 1561
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4710,7 +4850,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1055, 191
+  xy: 1395, 304
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4738,7 +4878,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 883, 316
+  xy: 1395, 270
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4752,7 +4892,7 @@ spectre
   index: -1
 swarmer
   rotate: false
-  xy: 1245, 1101
+  xy: 1311, 1167
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -4773,287 +4913,147 @@ unit-vanguard-full
   index: -1
 wave
   rotate: false
-  xy: 1443, 1233
+  xy: 1047, 771
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1337, 737
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-blast-compound-medium
-  rotate: false
-  xy: 1337, 737
+  xy: 1223, 474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1303, 669
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-coal-medium
-  rotate: false
-  xy: 1303, 669
+  xy: 1257, 474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1337, 703
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-copper-medium
-  rotate: false
-  xy: 1337, 703
+  xy: 1291, 474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1303, 635
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-graphite-medium
-  rotate: false
-  xy: 1303, 635
+  xy: 1223, 406
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1337, 669
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-lead-medium
-  rotate: false
-  xy: 1337, 669
+  xy: 1257, 406
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1303, 601
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-metaglass-medium
-  rotate: false
-  xy: 1303, 601
+  xy: 1219, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1337, 635
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-phase-fabric-medium
-  rotate: false
-  xy: 1337, 635
+  xy: 1287, 372
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1337, 601
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-plastanium-medium
-  rotate: false
-  xy: 1337, 601
+  xy: 1267, 338
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1371, 771
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-pyratite-medium
-  rotate: false
-  xy: 1371, 771
+  xy: 1321, 372
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1371, 737
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-sand-medium
-  rotate: false
-  xy: 1371, 737
+  xy: 1325, 542
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1371, 703
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-scrap-medium
-  rotate: false
-  xy: 1371, 703
+  xy: 1325, 474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1371, 669
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-silicon-medium
-  rotate: false
-  xy: 1371, 669
+  xy: 1325, 406
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1371, 635
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-spore-pod-medium
-  rotate: false
-  xy: 1371, 635
+  xy: 1369, 338
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1371, 601
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-surge-alloy-medium
-  rotate: false
-  xy: 1371, 601
+  xy: 883, 282
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1325, 567
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-thorium-medium
-  rotate: false
-  xy: 1325, 567
+  xy: 1123, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1325, 533
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-item-titanium-medium
-  rotate: false
-  xy: 1325, 533
+  xy: 1123, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1359, 567
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-cryofluid-medium
-  rotate: false
-  xy: 1359, 567
+  xy: 1337, 746
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1325, 499
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-oil-medium
-  rotate: false
-  xy: 1325, 499
+  xy: 1337, 678
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1325, 397
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-slag-medium
-  rotate: false
-  xy: 1325, 397
+  xy: 1359, 440
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1359, 431
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-liquid-water-medium
-  rotate: false
-  xy: 1359, 431
+  xy: 1389, 372
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5074,14 +5074,14 @@ circle
   index: -1
 shape-3
   rotate: false
-  xy: 1179, 904
+  xy: 1245, 970
   size: 63, 63
   orig: 63, 63
   offset: 0, 0
   index: -1
 alpha
   rotate: false
-  xy: 1179, 854
+  xy: 1245, 920
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5333,14 +5333,14 @@ omega-leg
   index: -1
 phantom
   rotate: false
-  xy: 1245, 977
+  xy: 1311, 1043
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 power-cell
   rotate: false
-  xy: 1311, 1043
+  xy: 1377, 1109
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5368,7 +5368,7 @@ spirit
   index: -1
 tau
   rotate: false
-  xy: 1377, 1109
+  xy: 1443, 1175
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5389,21 +5389,21 @@ tau-leg
   index: -1
 titan
   rotate: false
-  xy: 1377, 1233
+  xy: 981, 771
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-leg
   rotate: false
-  xy: 981, 771
+  xy: 1047, 837
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 trident
   rotate: false
-  xy: 1443, 1175
+  xy: 1113, 779
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -8156,13 +8156,6 @@ editor-pebbles1
   orig: 32, 32
   offset: 0, 0
   index: -1
-pebbles-icon-editor
-  rotate: false
-  xy: 1219, 73
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 editor-pebbles2
   rotate: false
   xy: 1253, 73
@@ -8303,13 +8296,6 @@ editor-spawn
   orig: 32, 32
   offset: 0, 0
   index: -1
-spawn-icon-editor
-  rotate: false
-  xy: 1729, 73
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 editor-spore-moss1
   rotate: false
   xy: 1763, 73
@@ -8401,13 +8387,6 @@ editor-tendrils1
   orig: 32, 32
   offset: 0, 0
   index: -1
-tendrils-icon-editor
-  rotate: false
-  xy: 1967, 61
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 editor-tendrils2
   rotate: false
   xy: 2001, 61
@@ -8688,6 +8667,13 @@ overflow-gate-icon-editor
   orig: 32, 32
   offset: 0, 0
   index: -1
+pebbles-icon-editor
+  rotate: false
+  xy: 1637, 39
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 phantom-factory-icon-editor
   rotate: false
   xy: 1397, 175
@@ -8697,21 +8683,21 @@ phantom-factory-icon-editor
   index: -1
 phase-conduit-icon-editor
   rotate: false
-  xy: 1637, 39
+  xy: 1671, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-icon-editor
   rotate: false
-  xy: 1671, 39
+  xy: 1705, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-icon-editor
   rotate: false
-  xy: 1705, 39
+  xy: 1739, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8746,7 +8732,7 @@ plastanium-compressor-icon-editor
   index: -1
 plastanium-wall-icon-editor
   rotate: false
-  xy: 1739, 39
+  xy: 1773, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8760,7 +8746,7 @@ plastanium-wall-large-icon-editor
   index: -1
 plated-conduit-icon-editor
   rotate: false
-  xy: 1773, 39
+  xy: 1807, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8774,7 +8760,7 @@ pneumatic-drill-icon-editor
   index: -1
 power-node-icon-editor
   rotate: false
-  xy: 1807, 39
+  xy: 1841, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8788,28 +8774,28 @@ power-node-large-icon-editor
   index: -1
 power-source-icon-editor
   rotate: false
-  xy: 1841, 39
+  xy: 1875, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void-icon-editor
   rotate: false
-  xy: 1875, 39
+  xy: 1909, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-editor
   rotate: false
-  xy: 1909, 39
+  xy: 1059, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-editor
   rotate: false
-  xy: 1059, 5
+  xy: 1093, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8823,7 +8809,7 @@ pyratite-mixer-icon-editor
   index: -1
 repair-point-icon-editor
   rotate: false
-  xy: 1093, 5
+  xy: 1127, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8851,7 +8837,7 @@ rock-icon-editor
   index: -1
 rocks-icon-editor
   rotate: false
-  xy: 1127, 5
+  xy: 1161, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8865,7 +8851,7 @@ rotary-pump-icon-editor
   index: -1
 router-icon-editor
   rotate: false
-  xy: 1161, 5
+  xy: 1195, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8879,7 +8865,7 @@ rtg-generator-icon-editor
   index: -1
 saltrocks-icon-editor
   rotate: false
-  xy: 1195, 5
+  xy: 1229, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8893,14 +8879,14 @@ salvo-icon-editor
   index: -1
 sand-boulder-icon-editor
   rotate: false
-  xy: 1229, 5
+  xy: 1263, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks-icon-editor
   rotate: false
-  xy: 1263, 5
+  xy: 1297, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8914,7 +8900,7 @@ scatter-icon-editor
   index: -1
 scorch-icon-editor
   rotate: false
-  xy: 1297, 5
+  xy: 1331, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8935,7 +8921,7 @@ scrap-wall-huge-icon-editor
   index: -1
 scrap-wall-icon-editor
   rotate: false
-  xy: 1331, 5
+  xy: 1365, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8956,28 +8942,28 @@ separator-icon-editor
   index: -1
 shale-boulder-icon-editor
   rotate: false
-  xy: 1365, 5
+  xy: 1399, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks-icon-editor
   rotate: false
-  xy: 1399, 5
+  xy: 1433, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shock-mine-icon-editor
   rotate: false
-  xy: 1433, 5
+  xy: 1467, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrubs-icon-editor
   rotate: false
-  xy: 1467, 5
+  xy: 1501, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8991,7 +8977,7 @@ silicon-smelter-icon-editor
   index: -1
 snow-icon-editor
   rotate: false
-  xy: 1501, 5
+  xy: 1535, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9012,14 +8998,14 @@ snowrock-icon-editor
   index: -1
 snowrocks-icon-editor
   rotate: false
-  xy: 1535, 5
+  xy: 1569, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-icon-editor
   rotate: false
-  xy: 1569, 5
+  xy: 1603, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9033,7 +9019,14 @@ solar-panel-large-icon-editor
   index: -1
 sorter-icon-editor
   rotate: false
-  xy: 1603, 5
+  xy: 1637, 5
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+spawn-icon-editor
+  rotate: false
+  xy: 1671, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9075,7 +9068,7 @@ spore-press-icon-editor
   index: -1
 sporerocks-icon-editor
   rotate: false
-  xy: 1637, 5
+  xy: 1705, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9089,7 +9082,7 @@ surge-tower-icon-editor
   index: -1
 surge-wall-icon-editor
   rotate: false
-  xy: 1671, 5
+  xy: 1739, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9108,6 +9101,13 @@ swarmer-icon-editor
   orig: 64, 64
   offset: 0, 0
   index: -1
+tendrils-icon-editor
+  rotate: false
+  xy: 1773, 5
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 thermal-generator-icon-editor
   rotate: false
   xy: 685, 45
@@ -9131,7 +9131,7 @@ thorium-reactor-icon-editor
   index: -1
 thorium-wall-icon-editor
   rotate: false
-  xy: 1705, 5
+  xy: 1807, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9159,14 +9159,14 @@ titan-factory-icon-editor
   index: -1
 titanium-conveyor-icon-editor
   rotate: false
-  xy: 1739, 5
+  xy: 1841, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-icon-editor
   rotate: false
-  xy: 1773, 5
+  xy: 1875, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9187,14 +9187,14 @@ turbine-generator-icon-editor
   index: -1
 underflow-gate-icon-editor
   rotate: false
-  xy: 1807, 5
+  xy: 1909, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-icon-editor
   rotate: false
-  xy: 1841, 5
+  xy: 1943, 27
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 11dcbaa7fa..d9bfb79639 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png
index 9cb8347fbb..33e68ab6d8 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png
index e176f772b2..697fe00c48 100644
Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ
diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png
index 70c7e67892..382c58dd04 100644
Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ
diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png
index 9c08c17bf7..e2146e8186 100644
Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ
diff --git a/core/assets/sprites/sprites6.png b/core/assets/sprites/sprites6.png
index e849883d55..1557b6d4ce 100644
Binary files a/core/assets/sprites/sprites6.png and b/core/assets/sprites/sprites6.png differ
diff --git a/core/src/mindustry/entities/units/AIController.java b/core/src/mindustry/entities/units/AIController.java
index bdb1279765..4cf22a0350 100644
--- a/core/src/mindustry/entities/units/AIController.java
+++ b/core/src/mindustry/entities/units/AIController.java
@@ -1,5 +1,6 @@
 package mindustry.entities.units;
 
+import arc.math.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.entities.*;
@@ -17,6 +18,10 @@ public class AIController implements UnitController{
     protected Teamc target;
     protected Interval timer = new Interval(4);
 
+    {
+        timer.reset(0, Mathf.random(40f));
+    }
+
     protected void targetClosestAllyFlag(BlockFlag flag){
         Tile target = Geometry.findClosest(unit.x(), unit.y(), indexer.getAllied(unit.team(), flag));
         if(target != null) this.target = target.entity;
diff --git a/tools/build.gradle b/tools/build.gradle
index 2719592d54..6159c9e9e0 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -77,7 +77,7 @@ def antialias = { File file ->
             suma.set(0)
 
             for(int val : p){
-                Color.argb8888ToColor(color, val)
+                color.argb8888(val)
                 suma.r += color.r * color.a
                 suma.g += color.g * color.a
                 suma.b += color.b * color.a
@@ -91,7 +91,7 @@ def antialias = { File file ->
             sum.set(0)
 
             for(int val : p){
-                Color.argb8888ToColor(color, val)
+                color.argb8888(val)
                 float a = color.a
                 color.lerp(suma, (float) (1f - a))
                 sum.r += color.r
@@ -103,8 +103,7 @@ def antialias = { File file ->
 
             fm = (float)(1f / total)
             sum.mul(fm, fm, fm, fm)
-            int result = Color.argb8888(sum)
-            out.setRGB(x, y, result)
+            out.setRGB(x, y, sum.argb8888())
             sum.set(0)
         }
     }
@@ -315,7 +314,7 @@ task pack(dependsOn: classes){
 
         //antialias everything except UI elements
         fileTree(dir: '../core/assets-raw/sprites_out/', include: "**/*.png").visit{ file ->
-            if(file.isDirectory() || file.toString().replace("\\", "/").contains("zones/") || (file.toString().replace("\\", "/").contains("/ui/") && file.toString().startsWith("icon-"))) return
+            if(file.isDirectory() || (file.toString().replace("\\", "/").contains("/ui/") && file.toString().startsWith("icon-"))) return
 
             executor.submit{
                 antialias(file.file)