diff --git a/core/assets-raw/sprites/weapons/missiles.png b/core/assets-raw/sprites/weapons/missiles.png
new file mode 100644
index 0000000000..89e8713f23
Binary files /dev/null and b/core/assets-raw/sprites/weapons/missiles.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 6639ff66c9..a55ed1527e 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -20,84 +20,84 @@ force-projector-top
   index: -1
 mend-projector
   rotate: false
-  xy: 1133, 1037
+  xy: 1861, 1237
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mend-projector-top
   rotate: false
-  xy: 1199, 1037
+  xy: 1795, 1105
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mender
   rotate: false
-  xy: 1227, 195
+  xy: 1941, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 1193, 127
+  xy: 1975, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overdrive-projector
   rotate: false
-  xy: 1331, 1037
+  xy: 1861, 1105
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 overdrive-projector-top
   rotate: false
-  xy: 1397, 1037
+  xy: 1927, 1237
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shock-mine
   rotate: false
-  xy: 1397, 169
+  xy: 893, 90
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1023, 345
+  xy: 1587, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1023, 175
+  xy: 1723, 702
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1023, 141
+  xy: 1723, 668
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1023, 107
+  xy: 1723, 634
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1057, 411
+  xy: 1689, 617
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -125,28 +125,28 @@ armored-conveyor-0-1
   index: -1
 armored-conveyor-0-2
   rotate: false
-  xy: 1690, 903
+  xy: 1747, 1335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-3
   rotate: false
-  xy: 1307, 679
+  xy: 951, 1104
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 1391, 721
+  xy: 1545, 1069
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 2011, 1353
+  xy: 883, 898
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -181,21 +181,21 @@ armored-conveyor-2-1
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 1341, 679
+  xy: 1581, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 2011, 1319
+  xy: 1737, 838
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 1581, 1759
+  xy: 1737, 804
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -209,378 +209,378 @@ armored-conveyor-3-1
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 1433, 763
+  xy: 1771, 809
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 1467, 771
+  xy: 2009, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 1501, 771
+  xy: 2009, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 1535, 771
+  xy: 2009, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 1569, 771
+  xy: 1737, 770
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 1181, 637
+  xy: 1771, 775
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1091, 207
+  xy: 1057, 327
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1091, 173
+  xy: 1057, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1091, 139
+  xy: 1057, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1091, 105
+  xy: 1057, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1107, 445
+  xy: 1057, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1125, 411
+  xy: 1057, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1125, 377
+  xy: 1057, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1125, 343
+  xy: 1107, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1125, 309
+  xy: 1141, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1125, 275
+  xy: 1091, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1125, 241
+  xy: 1091, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1125, 207
+  xy: 1125, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1125, 173
+  xy: 1091, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1125, 139
+  xy: 1125, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1125, 105
+  xy: 1091, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1467, 737
+  xy: 1125, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1501, 737
+  xy: 1091, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1433, 729
+  xy: 1125, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1535, 737
+  xy: 1091, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 1261, 127
+  xy: 1825, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 1295, 437
+  xy: 1859, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 1295, 403
+  xy: 1893, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 1295, 369
+  xy: 1927, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 1295, 335
+  xy: 1961, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 1295, 301
+  xy: 1825, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1045, 71
+  xy: 1275, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1079, 71
+  xy: 1309, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1113, 71
+  xy: 1275, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1045, 37
+  xy: 1309, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1079, 37
+  xy: 1343, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1113, 37
+  xy: 1275, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1147, 59
+  xy: 1309, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1181, 59
+  xy: 1343, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1215, 59
+  xy: 1377, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1249, 59
+  xy: 1411, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1147, 25
+  xy: 1445, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1181, 25
+  xy: 1479, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1215, 25
+  xy: 1513, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1249, 25
+  xy: 1547, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 995, 5
+  xy: 1343, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1029, 3
+  xy: 1377, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1063, 3
+  xy: 1411, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1097, 3
+  xy: 1445, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1283, 59
+  xy: 1479, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 1545, 703
+  xy: 1125, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 distributor
   rotate: false
-  xy: 1879, 1303
+  xy: 1663, 1201
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1463, 559
+  xy: 1159, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1159, 331
+  xy: 1383, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -615,56 +615,56 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 1227, 127
+  xy: 1825, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1261, 297
+  xy: 1893, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1261, 263
+  xy: 1825, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1261, 229
+  xy: 1859, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1261, 195
+  xy: 1893, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1363, 305
+  xy: 1893, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1159, 93
+  xy: 893, 56
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 1317, 29
+  xy: 1581, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -699,14 +699,14 @@ blast-drill-top
   index: -1
 drill-top
   rotate: false
-  xy: 1133, 1103
+  xy: 1723, 1267
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 turbine-generator-liquid
   rotate: false
-  xy: 1133, 1103
+  xy: 1723, 1267
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -741,21 +741,21 @@ laser-drill-top
   index: -1
 mechanical-drill
   rotate: false
-  xy: 1661, 1069
+  xy: 1921, 1303
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill-rotator
   rotate: false
-  xy: 1001, 1037
+  xy: 1795, 1237
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-drill-top
   rotate: false
-  xy: 1067, 1037
+  xy: 1795, 1171
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -790,84 +790,84 @@ oil-extractor-top
   index: -1
 pneumatic-drill
   rotate: false
-  xy: 1199, 971
+  xy: 885, 1006
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-rotator
   rotate: false
-  xy: 1265, 971
+  xy: 721, 936
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-top
   rotate: false
-  xy: 1331, 971
+  xy: 787, 932
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor
   rotate: false
-  xy: 1249, 905
+  xy: 1579, 937
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 1315, 905
+  xy: 1645, 1003
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 1381, 905
+  xy: 1579, 871
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 1447, 905
+  xy: 1645, 937
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 1375, 679
+  xy: 1417, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1317, 645
+  xy: 1023, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1361, 577
+  xy: 1655, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1057, 139
+  xy: 1791, 707
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1227, 161
+  xy: 2009, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -881,189 +881,189 @@ place-arrow
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1023, 311
+  xy: 1621, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1023, 277
+  xy: 1655, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1023, 277
+  xy: 1655, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1023, 243
+  xy: 1689, 651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1023, 209
+  xy: 1723, 736
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1057, 309
+  xy: 1757, 702
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1057, 275
+  xy: 1757, 668
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1057, 241
+  xy: 1757, 634
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1057, 207
+  xy: 1757, 600
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1057, 207
+  xy: 1757, 600
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1057, 207
+  xy: 1757, 600
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1057, 207
+  xy: 1757, 600
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1057, 173
+  xy: 1791, 741
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1057, 105
+  xy: 1791, 673
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1091, 411
+  xy: 1791, 639
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1091, 377
+  xy: 1791, 605
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1091, 343
+  xy: 1057, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1091, 343
+  xy: 1057, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1091, 309
+  xy: 1057, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1091, 275
+  xy: 1057, 395
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1091, 241
+  xy: 1057, 361
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1159, 297
+  xy: 1485, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1159, 263
+  xy: 1587, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1193, 297
+  xy: 1621, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1227, 331
+  xy: 1655, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1159, 229
+  xy: 1689, 583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1193, 263
+  xy: 1723, 566
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1091,161 +1091,161 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1227, 229
+  xy: 1839, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-liquid
   rotate: false
-  xy: 1159, 127
+  xy: 1873, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-liquid
   rotate: false
-  xy: 1159, 127
+  xy: 1873, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-liquid
   rotate: false
-  xy: 1159, 127
+  xy: 1873, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1261, 433
+  xy: 1825, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1261, 399
+  xy: 1859, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1261, 365
+  xy: 1825, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1261, 331
+  xy: 1859, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1295, 233
+  xy: 1893, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1295, 199
+  xy: 1927, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1295, 165
+  xy: 1961, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1295, 131
+  xy: 1995, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1329, 437
+  xy: 1859, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1329, 403
+  xy: 1893, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1329, 369
+  xy: 1927, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1329, 335
+  xy: 1961, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1329, 199
+  xy: 1961, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1329, 165
+  xy: 1995, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1329, 131
+  xy: 1927, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1363, 441
+  xy: 1961, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1397, 441
+  xy: 1995, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1363, 407
+  xy: 1961, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump
   rotate: false
-  xy: 1595, 937
+  xy: 1017, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1259,21 +1259,21 @@ thermal-pump
   index: -1
 alpha-mech-pad
   rotate: false
-  xy: 869, 1138
+  xy: 937, 1138
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dart-ship-pad
   rotate: false
-  xy: 1747, 1303
+  xy: 1597, 1069
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 delta-mech-pad
   rotate: false
-  xy: 1813, 1303
+  xy: 1657, 1267
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1287,7 +1287,7 @@ glaive-ship-pad
   index: -1
 javelin-ship-pad
   rotate: false
-  xy: 1463, 1103
+  xy: 1813, 1369
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1301,21 +1301,21 @@ omega-mech-pad
   index: -1
 tau-mech-pad
   rotate: false
-  xy: 1925, 1039
+  xy: 1513, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 trident-ship-pad
   rotate: false
-  xy: 985, 905
+  xy: 1381, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 1173, 603
+  xy: 1349, 747
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1336,21 +1336,21 @@ battery-large-top
   index: -1
 battery-top
   rotate: false
-  xy: 943, 74
+  xy: 1349, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 1057, 377
+  xy: 1723, 600
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1057, 343
+  xy: 1757, 736
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1378,28 +1378,28 @@ differential-generator-top
   index: -1
 diode
   rotate: false
-  xy: 1453, 661
+  xy: 1091, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 1487, 669
+  xy: 1125, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1521, 635
+  xy: 1159, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1555, 635
+  xy: 1159, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1455,49 +1455,49 @@ impact-reactor-plasma-3
   index: -1
 power-node
   rotate: false
-  xy: 1329, 301
+  xy: 1995, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large
   rotate: false
-  xy: 1397, 971
+  xy: 853, 932
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-source
   rotate: false
-  xy: 1329, 267
+  xy: 1893, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1329, 233
+  xy: 1927, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 1661, 937
+  xy: 1083, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1397, 339
+  xy: 1927, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1397, 135
+  xy: 927, 90
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1511,14 +1511,14 @@ solar-panel-large
   index: -1
 surge-tower
   rotate: false
-  xy: 1859, 1039
+  xy: 1315, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-generator
   rotate: false
-  xy: 1925, 973
+  xy: 919, 874
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1546,14 +1546,14 @@ thorium-reactor-lights
   index: -1
 turbine-generator
   rotate: false
-  xy: 1051, 905
+  xy: 1447, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 turbine-generator-top
   rotate: false
-  xy: 1117, 905
+  xy: 1513, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1574,7 +1574,7 @@ alloy-smelter-top
   index: -1
 blast-mixer
   rotate: false
-  xy: 935, 1146
+  xy: 1977, 1597
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1595,119 +1595,119 @@ block-launcher
   index: -1
 coal-centrifuge
   rotate: false
-  xy: 1448, 1235
+  xy: 1520, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 1661, 1201
+  xy: 1267, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 1661, 1135
+  xy: 1333, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 1681, 1333
+  xy: 1399, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 1747, 1369
+  xy: 1465, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 1813, 1369
+  xy: 1531, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 1879, 1369
+  xy: 1597, 1201
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 graphite-press
   rotate: false
-  xy: 1397, 1103
+  xy: 1747, 1369
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 1463, 593
+  xy: 1159, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1361, 475
+  xy: 1159, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1227, 433
+  xy: 1241, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 kiln
   rotate: false
-  xy: 1529, 1103
+  xy: 1879, 1369
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 kiln-top
   rotate: false
-  xy: 935, 1080
+  xy: 1945, 1369
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 silicon-smelter-top
   rotate: false
-  xy: 935, 1080
+  xy: 1945, 1369
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 1193, 229
+  xy: 1207, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1227, 263
+  xy: 1241, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1193, 161
+  xy: 1907, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1721,203 +1721,203 @@ multi-press
   index: -1
 phase-weaver
   rotate: false
-  xy: 935, 1014
+  xy: 1795, 1039
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-bottom
   rotate: false
-  xy: 1595, 1003
+  xy: 1861, 1039
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-weave
   rotate: false
-  xy: 1661, 1003
+  xy: 1927, 1039
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-compressor
   rotate: false
-  xy: 1001, 971
+  xy: 819, 1064
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-compressor-top
   rotate: false
-  xy: 1067, 971
+  xy: 819, 998
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 1363, 373
+  xy: 1995, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1397, 407
+  xy: 1995, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-mixer
   rotate: false
-  xy: 1463, 971
+  xy: 919, 940
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 1793, 1171
+  xy: 1183, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 1859, 1237
+  xy: 1249, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-spinner
   rotate: false
-  xy: 1727, 1039
+  xy: 1315, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 silicon-smelter
   rotate: false
-  xy: 1793, 1105
+  xy: 1381, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press
   rotate: false
-  xy: 1925, 1237
+  xy: 1513, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame0
   rotate: false
-  xy: 1727, 973
+  xy: 985, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame1
   rotate: false
-  xy: 1793, 1039
+  xy: 1051, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-frame2
   rotate: false
-  xy: 1859, 1105
+  xy: 1117, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-liquid
   rotate: false
-  xy: 1925, 1171
+  xy: 1183, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-press-top
   rotate: false
-  xy: 1793, 973
+  xy: 1249, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 981, 697
+  xy: 931, 174
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 1031, 747
+  xy: 931, 124
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-boulder1
   rotate: false
-  xy: 1363, 271
+  xy: 1961, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 1397, 305
+  xy: 1995, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 1397, 203
+  xy: 1961, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1363, 135
+  xy: 1995, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock1
   rotate: false
-  xy: 1031, 697
+  xy: 981, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrock2
   rotate: false
-  xy: 1081, 747
+  xy: 1031, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 1349, 755
+  xy: 1307, 697
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 1349, 713
+  xy: 1265, 663
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 1391, 755
+  xy: 1307, 655
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -1938,7 +1938,7 @@ white-tree-dead
   index: -1
 container
   rotate: false
-  xy: 1001, 1169
+  xy: 1069, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1987,21 +1987,21 @@ launch-pad-light
   index: -1
 launchpod
   rotate: false
-  xy: 918, 1212
+  xy: 869, 1138
   size: 66, 64
   orig: 66, 64
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1351, 63
+  xy: 1615, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 1351, 29
+  xy: 1649, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2022,14 +2022,14 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 943, 40
+  xy: 1349, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-2
   rotate: false
-  xy: 1977, 1597
+  xy: 563, 26
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2050,14 +2050,14 @@ block-4
   index: -1
 hail-heat
   rotate: false
-  xy: 1131, 605
+  xy: 981, 447
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 1595, 1069
+  xy: 1855, 1303
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2078,35 +2078,35 @@ ripple-heat
   index: -1
 salvo-heat
   rotate: false
-  xy: 721, 936
+  xy: 1215, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 salvo-panel-left
   rotate: false
-  xy: 787, 936
+  xy: 1281, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 salvo-panel-right
   rotate: false
-  xy: 853, 940
+  xy: 1347, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scorch-heat
   rotate: false
-  xy: 1397, 271
+  xy: 1825, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 811, 808
+  xy: 1645, 871
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2162,70 +2162,70 @@ titan-factory-top
   index: -1
 command-center
   rotate: false
-  xy: 1514, 1235
+  xy: 1003, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 crawler-factory
   rotate: false
-  xy: 1595, 1135
+  xy: 1135, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dagger-factory
   rotate: false
-  xy: 1595, 1135
+  xy: 1135, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 draug-factory
   rotate: false
-  xy: 1595, 1135
+  xy: 1135, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phantom-factory
   rotate: false
-  xy: 1595, 1135
+  xy: 1135, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spirit-factory
   rotate: false
-  xy: 1595, 1135
+  xy: 1135, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wraith-factory
   rotate: false
-  xy: 1595, 1135
+  xy: 1135, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 crawler-factory-top
   rotate: false
-  xy: 1657, 1267
+  xy: 1201, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dagger-factory-top
   rotate: false
-  xy: 1945, 1369
+  xy: 1597, 1135
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 draug-factory-top
   rotate: false
-  xy: 1067, 1103
+  xy: 1681, 1333
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2260,21 +2260,21 @@ naval-factory
   index: -1
 phantom-factory-top
   rotate: false
-  xy: 1463, 1037
+  xy: 1927, 1171
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rally-point
   rotate: false
-  xy: 1529, 971
+  xy: 951, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 repair-point-base
   rotate: false
-  xy: 1397, 373
+  xy: 1859, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2295,7 +2295,7 @@ revenant-factory-top
   index: -1
 spirit-factory-top
   rotate: false
-  xy: 1859, 1171
+  xy: 1447, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2309,77 +2309,77 @@ titan-factory
   index: -1
 wraith-factory-top
   rotate: false
-  xy: 877, 808
+  xy: 1711, 937
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 1569, 737
+  xy: 1125, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-large
   rotate: false
-  xy: 1067, 1169
+  xy: 1135, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 1521, 669
+  xy: 1175, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-large
   rotate: false
-  xy: 1945, 1303
+  xy: 1663, 1135
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-large-open
   rotate: false
-  xy: 1001, 1103
+  xy: 1663, 1069
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 1555, 669
+  xy: 1159, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1261, 161
+  xy: 1927, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-large
   rotate: false
-  xy: 1529, 1037
+  xy: 1927, 1105
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1295, 267
+  xy: 1859, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall-large
   rotate: false
-  xy: 1133, 971
+  xy: 885, 1072
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2407,84 +2407,84 @@ scrap-wall-huge3
   index: -1
 scrap-wall-large1
   rotate: false
-  xy: 1727, 1237
+  xy: 1479, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large2
   rotate: false
-  xy: 1727, 1171
+  xy: 985, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large3
   rotate: false
-  xy: 1793, 1237
+  xy: 1051, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall-large4
   rotate: false
-  xy: 1727, 1105
+  xy: 1117, 971
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1363, 203
+  xy: 1859, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1397, 237
+  xy: 1893, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1363, 169
+  xy: 1927, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1363, 169
+  xy: 1927, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1011, 73
+  xy: 1165, 19
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large
   rotate: false
-  xy: 1925, 1105
+  xy: 1381, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 1011, 39
+  xy: 1199, 19
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large
   rotate: false
-  xy: 1727, 907
+  xy: 985, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2498,35 +2498,35 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1283, 25
+  xy: 1513, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large
   rotate: false
-  xy: 853, 874
+  xy: 1315, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 bullet
   rotate: false
-  xy: 1182, 851
+  xy: 775, 878
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 bullet-back
   rotate: false
-  xy: 1236, 851
+  xy: 829, 878
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 casing
   rotate: false
-  xy: 645, 1424
+  xy: 1107, 529
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -2540,7 +2540,7 @@ circle-end
   index: -1
 circle-mid
   rotate: false
-  xy: 1457, 224
+  xy: 2029, 588
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
@@ -2554,7 +2554,7 @@ circle-shadow
   index: -1
 error
   rotate: false
-  xy: 881, 258
+  xy: 1161, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -2575,7 +2575,7 @@ laser-end
   index: -1
 minelaser
   rotate: false
-  xy: 1457, 425
+  xy: 848, 1757
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2603,7 +2603,7 @@ missile-back
   index: -1
 particle
   rotate: false
-  xy: 1307, 713
+  xy: 1307, 739
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -2631,21 +2631,21 @@ shell-back
   index: -1
 transfer
   rotate: false
-  xy: 848, 1757
+  xy: 2037, 1319
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1317, 63
+  xy: 1547, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 1603, 800
+  xy: 1586, 1296
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
@@ -2666,7 +2666,7 @@ block-air-factory-full
   index: -1
 block-arc-full
   rotate: false
-  xy: 1081, 479
+  xy: 1383, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2680,56 +2680,56 @@ block-blast-drill-full
   index: -1
 block-char-full
   rotate: false
-  xy: 893, 8
+  xy: 1383, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 1073, 445
+  xy: 1451, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conduit-full
   rotate: false
-  xy: 927, 6
+  xy: 1383, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 961, 6
+  xy: 1417, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 961, 6
+  xy: 1417, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-craters-full
   rotate: false
-  xy: 1603, 753
+  xy: 1485, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cryofluidmixer-full
   rotate: false
-  xy: 563, 26
+  xy: 629, 26
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-cultivator-full
   rotate: false
-  xy: 629, 26
+  xy: 695, 26
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2743,28 +2743,28 @@ block-cyclone-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 1637, 753
+  xy: 1417, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 1671, 753
+  xy: 1451, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 1123, 563
+  xy: 1519, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 1123, 529
+  xy: 1451, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2778,7 +2778,7 @@ block-fuse-full
   index: -1
 block-grass-full
   rotate: false
-  xy: 1123, 495
+  xy: 1485, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2792,49 +2792,49 @@ block-ground-factory-full
   index: -1
 block-hail-full
   rotate: false
-  xy: 1157, 569
+  xy: 1485, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1157, 535
+  xy: 1519, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 1157, 501
+  xy: 1519, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 1191, 569
+  xy: 1349, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 1191, 535
+  xy: 1383, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 1191, 501
+  xy: 1417, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 1207, 603
+  xy: 1451, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2848,7 +2848,7 @@ block-impact-reactor-full
   index: -1
 block-lancer-full
   rotate: false
-  xy: 695, 26
+  xy: 761, 26
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2862,7 +2862,7 @@ block-laser-drill-full
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 1215, 637
+  xy: 1485, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2876,7 +2876,7 @@ block-liquid-tank-full
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 1249, 641
+  xy: 1519, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2904,7 +2904,7 @@ block-mass-driver-full
   index: -1
 block-mechanical-drill-full
   rotate: false
-  xy: 761, 26
+  xy: 827, 26
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2918,14 +2918,14 @@ block-meltdown-full
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 1283, 641
+  xy: 1023, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1351, 645
+  xy: 1023, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2946,91 +2946,91 @@ block-oil-extractor-full
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 1385, 645
+  xy: 1023, 353
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1225, 569
+  xy: 1023, 319
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1225, 535
+  xy: 1023, 285
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1225, 501
+  xy: 1023, 251
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1241, 603
+  xy: 1023, 217
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1275, 607
+  xy: 1023, 183
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1259, 569
+  xy: 1023, 149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-phase-weaver-full
   rotate: false
-  xy: 827, 26
+  xy: 1591, 1267
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1259, 535
+  xy: 1023, 115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pneumatic-drill-full
   rotate: false
-  xy: 1591, 1267
+  xy: 992, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1259, 501
+  xy: 1073, 505
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1293, 573
+  xy: 1123, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1293, 539
+  xy: 1157, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3044,77 +3044,77 @@ block-ripple-full
   index: -1
 block-rock-full
   rotate: false
-  xy: 1490, 855
+  xy: 1993, 1103
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1293, 505
+  xy: 1553, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1309, 607
+  xy: 1553, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-salvo-full
   rotate: false
-  xy: 986, 1235
+  xy: 1058, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1343, 611
+  xy: 1553, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1377, 611
+  xy: 1553, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1327, 573
+  xy: 1587, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scatter-full
   rotate: false
-  xy: 1052, 1235
+  xy: 1124, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1327, 539
+  xy: 1621, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1327, 505
+  xy: 1587, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1327, 505
+  xy: 1587, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3135,56 +3135,56 @@ scrap-wall-huge1
   index: -1
 block-scrap-wall-large-full
   rotate: false
-  xy: 1118, 1235
+  xy: 1190, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1361, 543
+  xy: 1587, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1361, 509
+  xy: 1621, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1395, 577
+  xy: 1587, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1395, 543
+  xy: 1621, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 1395, 509
+  xy: 1655, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snowrock-full
   rotate: false
-  xy: 1540, 855
+  xy: 1993, 1053
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1411, 611
+  xy: 1621, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3198,189 +3198,189 @@ block-spectre-full
   index: -1
 block-spore-cluster-full
   rotate: false
-  xy: 1081, 555
+  xy: 1131, 647
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1429, 577
+  xy: 1655, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-press-full
   rotate: false
-  xy: 1184, 1235
+  xy: 1256, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1429, 543
+  xy: 1655, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1429, 509
+  xy: 1689, 753
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-swarmer-full
   rotate: false
-  xy: 1250, 1235
+  xy: 1322, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1023, 413
+  xy: 1689, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1023, 379
+  xy: 1689, 685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1023, 379
+  xy: 1689, 685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-water-extractor-full
   rotate: false
-  xy: 1316, 1235
+  xy: 1388, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-wave-full
   rotate: false
-  xy: 1382, 1235
+  xy: 1454, 1235
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1603, 719
+  xy: 1091, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1637, 719
+  xy: 1125, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1671, 719
+  xy: 1091, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1409, 687
+  xy: 1125, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1419, 653
+  xy: 1091, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1443, 695
+  xy: 1125, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 1477, 703
+  xy: 1091, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 1511, 703
+  xy: 1125, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-2-0
   rotate: false
-  xy: 1133, 1169
+  xy: 1201, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-1
   rotate: false
-  xy: 1199, 1169
+  xy: 1267, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-2
   rotate: false
-  xy: 1265, 1169
+  xy: 1333, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-3
   rotate: false
-  xy: 1331, 1169
+  xy: 1399, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-4
   rotate: false
-  xy: 1397, 1169
+  xy: 1465, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-5
   rotate: false
-  xy: 1463, 1169
+  xy: 1531, 1169
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-6
   rotate: false
-  xy: 1529, 1169
+  xy: 1003, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cracks-2-7
   rotate: false
-  xy: 1595, 1201
+  xy: 1069, 1103
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -3562,7 +3562,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1453, 627
+  xy: 1159, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3576,714 +3576,714 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1487, 635
+  xy: 1159, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 981, 405
+  xy: 1031, 497
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1497, 601
+  xy: 1159, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-small
   rotate: false
-  xy: 2023, 1949
+  xy: 1029, 55
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-tiny
   rotate: false
-  xy: 1590, 869
+  xy: 1777, 1051
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 1308, 797
+  xy: 1411, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 1031, 455
+  xy: 1081, 547
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1531, 601
+  xy: 1159, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal-small
   rotate: false
-  xy: 2023, 1923
+  xy: 2023, 1949
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-tiny
   rotate: false
-  xy: 863, 790
+  xy: 2011, 1369
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 1358, 797
+  xy: 1461, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 1081, 513
+  xy: 1131, 605
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1531, 567
+  xy: 1193, 427
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 811, 782
+  xy: 2023, 1923
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 1141, 449
+  xy: 985, 1120
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 1408, 797
+  xy: 1511, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-graphite-large
   rotate: false
-  xy: 981, 363
+  xy: 981, 405
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1565, 601
+  xy: 1193, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 1689, 1471
+  xy: 951, 1011
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 848, 1609
+  xy: 1579, 1085
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 1458, 805
+  xy: 881, 724
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 981, 321
+  xy: 981, 363
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1565, 533
+  xy: 1193, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 1431, 449
+  xy: 1545, 1043
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 786, 1424
+  xy: 1561, 821
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1508, 805
+  xy: 881, 674
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 981, 279
+  xy: 981, 321
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1497, 499
+  xy: 1193, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 837, 782
+  xy: 2009, 925
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 937, 1479
+  xy: 2029, 1369
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1558, 805
+  xy: 881, 624
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 981, 237
+  xy: 981, 279
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1565, 499
+  xy: 1193, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 1689, 1445
+  xy: 1689, 1471
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-tiny
   rotate: false
-  xy: 481, 10
+  xy: 1561, 803
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1590, 887
+  xy: 881, 574
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 981, 195
+  xy: 981, 237
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1531, 465
+  xy: 1057, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 1431, 423
+  xy: 995, 85
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 982, 1358
+  xy: 848, 1609
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1640, 887
+  xy: 881, 524
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 981, 153
+  xy: 981, 195
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1689, 1401
+  xy: 1125, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1431, 397
+  xy: 1689, 1445
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 1723, 1315
+  xy: 786, 1424
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1608, 837
+  xy: 881, 474
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 981, 111
+  xy: 981, 153
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1191, 467
+  xy: 1193, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1431, 371
+  xy: 1581, 549
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 833, 918
+  xy: 937, 1479
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1608, 787
+  xy: 881, 424
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 1181, 755
+  xy: 981, 111
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1259, 467
+  xy: 1057, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 1431, 345
+  xy: 1607, 549
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 265, 43
+  xy: 982, 1358
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1658, 837
+  xy: 881, 374
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1181, 713
+  xy: 1695, 829
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1327, 471
+  xy: 1125, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 1431, 319
+  xy: 1633, 549
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 985, 887
+  xy: 795, 1112
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1658, 787
+  xy: 881, 324
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 1181, 671
+  xy: 1131, 563
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1429, 475
+  xy: 1173, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1431, 293
+  xy: 1659, 549
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 795, 1112
+  xy: 265, 43
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 931, 758
+  xy: 881, 274
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 1223, 759
+  xy: 1695, 787
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1159, 433
+  xy: 1173, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1431, 267
+  xy: 481, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 1696, 1645
+  xy: 961, 856
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 931, 708
+  xy: 881, 224
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 1265, 759
+  xy: 1181, 739
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1193, 433
+  xy: 1207, 629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1431, 241
+  xy: 507, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 1696, 1627
+  xy: 883, 880
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 931, 658
+  xy: 881, 174
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 1223, 717
+  xy: 1181, 697
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1193, 399
+  xy: 1241, 629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1431, 215
+  xy: 533, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 1579, 719
+  xy: 901, 880
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 931, 608
+  xy: 881, 124
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lancer
   rotate: false
-  xy: 869, 1072
+  xy: 1789, 1303
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 1223, 675
+  xy: 1223, 739
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1227, 399
+  xy: 1451, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 1431, 189
+  xy: 293, 822
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 1723, 1417
+  xy: 1696, 1645
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 931, 358
+  xy: 931, 524
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1265, 717
+  xy: 1223, 697
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1227, 365
+  xy: 1553, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 1431, 163
+  xy: 2018, 1767
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 1723, 1399
+  xy: 1696, 1627
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 931, 308
+  xy: 931, 474
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 1265, 675
+  xy: 1265, 747
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1159, 195
+  xy: 1791, 571
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 1431, 137
+  xy: 2018, 1741
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 866, 1609
+  xy: 1241, 679
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 931, 258
+  xy: 931, 424
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 1307, 755
+  xy: 1265, 705
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1193, 195
+  xy: 1805, 789
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 1431, 111
+  xy: 2018, 1715
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 786, 1406
+  xy: 1173, 569
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 931, 208
+  xy: 931, 374
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4304,7 +4304,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1363, 339
+  xy: 1825, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4318,21 +4318,21 @@ ripple
   index: -1
 salvo
   rotate: false
-  xy: 819, 1006
+  xy: 1149, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scatter
   rotate: false
-  xy: 919, 948
+  xy: 1413, 1037
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 1363, 237
+  xy: 1791, 537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4346,112 +4346,112 @@ spectre
   index: -1
 splash-0
   rotate: false
-  xy: 1193, 93
+  xy: 927, 56
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-1
   rotate: false
-  xy: 1227, 93
+  xy: 893, 22
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-10
   rotate: false
-  xy: 977, 74
+  xy: 1097, 19
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-11
   rotate: false
-  xy: 977, 40
+  xy: 1131, 19
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-2
   rotate: false
-  xy: 1261, 93
+  xy: 927, 22
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-3
   rotate: false
-  xy: 1295, 97
+  xy: 961, 77
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-4
   rotate: false
-  xy: 1329, 97
+  xy: 961, 43
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-5
   rotate: false
-  xy: 1363, 101
+  xy: 961, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-6
   rotate: false
-  xy: 1397, 101
+  xy: 995, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-7
   rotate: false
-  xy: 1497, 431
+  xy: 995, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-8
   rotate: false
-  xy: 1531, 431
+  xy: 1029, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-9
   rotate: false
-  xy: 1565, 431
+  xy: 1063, 19
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 swarmer
   rotate: false
-  xy: 1859, 973
+  xy: 1447, 905
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unit-crawler-full
   rotate: false
-  xy: 981, 547
+  xy: 1031, 639
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 1031, 597
+  xy: 1081, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-draug-full
   rotate: false
-  xy: 1081, 647
+  xy: 1131, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4470,9 +4470,16 @@ unit-fortress-full
   orig: 100, 80
   offset: 0, 0
   index: -1
+unit-ghoul-full
+  rotate: false
+  xy: 918, 1204
+  size: 72, 72
+  orig: 72, 72
+  offset: 0, 0
+  index: -1
 unit-phantom-full
   rotate: false
-  xy: 1124, 847
+  xy: 1776, 843
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -4486,182 +4493,182 @@ unit-reaper-full
   index: -1
 unit-spirit-full
   rotate: false
-  xy: 1131, 697
+  xy: 981, 539
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-titan-full
   rotate: false
-  xy: 1183, 905
+  xy: 1579, 1003
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unit-vanguard-full
   rotate: false
-  xy: 981, 497
+  xy: 1031, 589
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-wraith-full
   rotate: false
-  xy: 1031, 547
+  xy: 1081, 639
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 1513, 905
+  xy: 1711, 1003
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1463, 525
+  xy: 1159, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1497, 567
+  xy: 1159, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1497, 533
+  xy: 1193, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1531, 533
+  xy: 1193, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1565, 567
+  xy: 1193, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1463, 491
+  xy: 1193, 257
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1531, 499
+  xy: 1193, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1497, 465
+  xy: 1193, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1565, 465
+  xy: 1091, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1157, 467
+  xy: 1159, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1225, 467
+  xy: 1023, 81
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1293, 471
+  xy: 1091, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1395, 475
+  xy: 1193, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1463, 457
+  xy: 1173, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1159, 399
+  xy: 1207, 663
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1159, 365
+  xy: 1207, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1193, 365
+  xy: 1417, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1193, 331
+  xy: 1519, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1227, 297
+  xy: 1757, 566
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1159, 161
+  xy: 1689, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blank
   rotate: false
-  xy: 1724, 934
+  xy: 804, 1439
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -4675,35 +4682,35 @@ circle
   index: -1
 shape-3
   rotate: false
-  xy: 943, 817
+  xy: 1711, 872
   size: 63, 63
   orig: 63, 63
   offset: 0, 0
   index: -1
 alpha
   rotate: false
-  xy: 885, 1022
+  xy: 1973, 1925
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-base
   rotate: false
-  xy: 819, 1080
+  xy: 811, 828
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-cell
   rotate: false
-  xy: 1973, 1925
+  xy: 811, 778
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-leg
   rotate: false
-  xy: 1290, 855
+  xy: 1987, 1319
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4738,105 +4745,105 @@ chaos-array-leg
   index: -1
 crawler
   rotate: false
-  xy: 1058, 797
+  xy: 1885, 873
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 1108, 797
+  xy: 1935, 873
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-cell
   rotate: false
-  xy: 1158, 797
+  xy: 1834, 823
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 1208, 801
+  xy: 1884, 823
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 1258, 801
+  xy: 1934, 823
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 881, 758
+  xy: 1985, 873
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 881, 708
+  xy: 1984, 823
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart
   rotate: false
-  xy: 881, 658
+  xy: 861, 828
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart-cell
   rotate: false
-  xy: 881, 608
+  xy: 861, 778
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta
   rotate: false
-  xy: 881, 558
+  xy: 911, 824
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-base
   rotate: false
-  xy: 881, 508
+  xy: 911, 774
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-cell
   rotate: false
-  xy: 881, 458
+  xy: 961, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-leg
   rotate: false
-  xy: 881, 408
+  xy: 1011, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug
   rotate: false
-  xy: 881, 358
+  xy: 1061, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug-cell
   rotate: false
-  xy: 881, 308
+  xy: 1111, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4878,7 +4885,7 @@ eruptor
   index: -1
 eruptor-base
   rotate: false
-  xy: 1199, 1103
+  xy: 1729, 1201
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -4892,7 +4899,7 @@ eruptor-cell
   index: -1
 eruptor-leg
   rotate: false
-  xy: 1265, 1103
+  xy: 1729, 1135
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -4906,7 +4913,7 @@ fortress
   index: -1
 fortress-base
   rotate: false
-  xy: 1331, 1103
+  xy: 1729, 1069
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -4920,9 +4927,9 @@ fortress-cell
   index: -1
 fortress-leg
   rotate: false
-  xy: 481, 28
-  size: 80, 64
-  orig: 80, 64
+  xy: 481, 32
+  size: 80, 60
+  orig: 80, 60
   offset: 0, 0
   index: -1
 ghoul
@@ -4941,35 +4948,35 @@ ghoul-cell
   index: -1
 glaive
   rotate: false
-  xy: 1991, 1107
+  xy: 91, 9
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 glaive-cell
   rotate: false
-  xy: 1991, 1049
+  xy: 1977, 1539
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 javelin
   rotate: false
-  xy: 931, 558
+  xy: 931, 724
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-cell
   rotate: false
-  xy: 931, 508
+  xy: 931, 674
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-shield
   rotate: false
-  xy: 931, 458
+  xy: 931, 624
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4990,56 +4997,56 @@ lich-cell
   index: -1
 omega
   rotate: false
-  xy: 1991, 991
+  xy: 1835, 981
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-armor
   rotate: false
-  xy: 1265, 1037
+  xy: 1861, 1171
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 omega-base
   rotate: false
-  xy: 1991, 933
+  xy: 1835, 923
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-cell
   rotate: false
-  xy: 1991, 875
+  xy: 1893, 981
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-leg
   rotate: false
-  xy: 91, 9
+  xy: 1893, 923
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 phantom
   rotate: false
-  xy: 1977, 1539
+  xy: 717, 878
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 phantom-cell
   rotate: false
-  xy: 717, 878
+  xy: 149, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 power-cell
   rotate: false
-  xy: 775, 878
+  xy: 207, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5074,140 +5081,140 @@ revenant-cell
   index: -1
 spirit
   rotate: false
-  xy: 981, 597
+  xy: 981, 639
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spirit-cell
   rotate: false
-  xy: 1031, 647
+  xy: 1031, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau
   rotate: false
-  xy: 149, 3
+  xy: 1951, 981
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-base
   rotate: false
-  xy: 1081, 697
+  xy: 1081, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-cell
   rotate: false
-  xy: 207, 3
+  xy: 1951, 923
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-leg
   rotate: false
-  xy: 1131, 747
+  xy: 981, 589
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titan
   rotate: false
-  xy: 1793, 907
+  xy: 1051, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-base
   rotate: false
-  xy: 1859, 907
+  xy: 1117, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-cell
   rotate: false
-  xy: 1925, 907
+  xy: 1183, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 titan-leg
   rotate: false
-  xy: 919, 882
+  xy: 1249, 839
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 trident
   rotate: false
-  xy: 1008, 847
+  xy: 1579, 813
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 trident-cell
   rotate: false
-  xy: 1066, 847
+  xy: 1637, 813
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 vanguard
   rotate: false
-  xy: 1081, 597
+  xy: 1131, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-cell
   rotate: false
-  xy: 981, 447
+  xy: 1031, 539
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wraith
   rotate: false
-  xy: 1031, 497
+  xy: 1081, 589
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery
   rotate: false
-  xy: 1340, 847
+  xy: 1993, 1261
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 artillery-equip
   rotate: false
-  xy: 1390, 847
+  xy: 1993, 1203
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 blaster
   rotate: false
-  xy: 1440, 855
+  xy: 1993, 1153
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chain-blaster
   rotate: false
-  xy: 1008, 797
+  xy: 1835, 873
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chaos
   rotate: false
-  xy: 1991, 1165
+  xy: 1777, 901
   size: 56, 136
   orig: 56, 136
   offset: 0, 0
@@ -5221,70 +5228,70 @@ eradication
   index: -1
 eruption
   rotate: false
-  xy: 881, 200
+  xy: 1211, 781
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun
   rotate: false
-  xy: 881, 150
+  xy: 1261, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower
   rotate: false
-  xy: 881, 92
+  xy: 1311, 781
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster
   rotate: false
-  xy: 893, 42
+  xy: 1361, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles
   rotate: false
-  xy: 931, 408
+  xy: 931, 574
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles
   rotate: false
-  xy: 931, 158
+  xy: 931, 324
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun
   rotate: false
-  xy: 931, 108
+  xy: 931, 274
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles
   rotate: false
-  xy: 981, 747
+  xy: 931, 224
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun
   rotate: false
-  xy: 981, 647
+  xy: 981, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-blaster
   rotate: false
-  xy: 1131, 647
+  xy: 981, 489
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index e7cbe729d4..bf094b23a7 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 5aa6cff9d0..4694aa0f1f 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 85adc0fe5e..f912639f1d 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -67,6 +67,7 @@ public class UnitTypes implements ContentList{
             hitsize = 8f;
             mass = 1.75f;
             health = 120;
+            sway = 0.25f;
             weapons.add(new Weapon(){{
                 reload = 12f;
                 shootCone = 180f;
@@ -136,7 +137,7 @@ public class UnitTypes implements ContentList{
             range = 140f;
             weapons.add(new Weapon(){{
                 y = 1.5f;
-                reload = 28f;
+                reload = 15f;
                 alternate = true;
                 ejectEffect = Fx.shellEjectSmall;
                 bullet = Bullets.standardCopper;
@@ -144,6 +145,31 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
+        ghoul = new UnitType("ghoul"){{
+            health = 220;
+            speed = 2f;
+            mass = 3f;
+            accel = 0.08f;
+            drag = 0.016f;
+            flying = true;
+            targetAir = false;
+            engineOffset = 7.8f;
+            range = 140f;
+            faceTarget = false;
+            weapons.add(new Weapon(){{
+                shootY = 0f;
+                shootX = 0f;
+                reload = 6f;
+                shootCone = 180f;
+                alternate = true;
+                ejectEffect = Fx.none;
+                inaccuracy = 40f;
+                ignoreRotation = true;
+                bullet = Bullets.bombExplosive;
+                shootSound = Sounds.none;
+            }});
+        }};
+
         reaper = new UnitType("reaper"){{
             speed = 1.1f;
             accel = 0.08f;
@@ -235,50 +261,6 @@ public class UnitTypes implements ContentList{
         
         /*
 
-        fortress = new UnitType("fortress", GroundUnit::new){{
-            maxVelocity = 0.78f;
-            speed = 0.15f;
-            drag = 0.4f;
-            mass = 5f;
-            hitsize = 10f;
-            rotatespeed = 0.06f;
-            targetAir = false;
-            health = 750;
-            weapons.add(new Weapon("artillery"){{
-                length = 1f;
-                reload = 60f;
-                width = 10f;
-                alternate = true;
-                recoil = 4f;
-                shake = 2f;
-                ejectEffect = Fx.shellEjectMedium;
-                bullet = Bullets.artilleryUnit;
-                shootSound = Sounds.artillery;
-            }});
-        }};
-
-        eruptor = new UnitType("eruptor", GroundUnit::new){{
-            maxVelocity = 0.81f;
-            speed = 0.16f;
-            drag = 0.4f;
-            mass = 5f;
-            hitsize = 9f;
-            rotatespeed = 0.05f;
-            targetAir = false;
-            health = 600;
-            immunities = ObjectSet.with(StatusEffects.burning, StatusEffects.melting);
-            weapons.add(new Weapon("eruption"){{
-                length = 3f;
-                reload = 10f;
-                alternate = true;
-                ejectEffect = Fx.none;
-                bullet = Bullets.eruptorShot;
-                recoil = 1f;
-                width = 7f;
-                shootSound = Sounds.flame;
-            }});
-        }};
-
         chaosArray = new UnitType("chaos-array", GroundUnit::new){{
             maxVelocity = 0.68f;
             speed = 0.12f;
@@ -328,49 +310,6 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
-        wraith = new UnitType("wraith", FlyingUnit::new){{
-            speed = 0.3f;
-            maxVelocity = 1.9f;
-            drag = 0.01f;
-            mass = 1.5f;
-            flying = true;
-            health = 75;
-            engineOffset = 5.5f;
-            range = 140f;
-            weapons.add(new Weapon(){{
-                length = 1.5f;
-                reload = 28f;
-                alternate = true;
-                ejectEffect = Fx.shellEjectSmall;
-                bullet = Bullets.standardCopper;
-                shootSound = Sounds.shoot;
-            }});
-        }};
-
-        ghoul = new UnitType("ghoul", FlyingUnit::new){{
-            health = 220;
-            speed = 0.2f;
-            maxVelocity = 1.4f;
-            mass = 3f;
-            drag = 0.01f;
-            flying = true;
-            targetAir = false;
-            engineOffset = 7.8f;
-            range = 140f;
-            weapons.add(new Weapon(){{
-                length = 0f;
-                width = 2f;
-                reload = 12f;
-                alternate = true;
-                ejectEffect = Fx.none;
-                velocityRnd = 1f;
-                inaccuracy = 40f;
-                ignoreRotation = true;
-                bullet = Bullets.bombExplosive;
-                shootSound = Sounds.none;
-            }});
-        }};
-
         revenant = new UnitType("revenant", HoverUnit::new){{
             health = 1000;
             mass = 5f;
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index b699ab7db1..fdf1cb6a95 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -564,7 +564,7 @@ public class DesktopInput extends InputHandler{
 
         movement.set(xa, ya).nor().scl(speed);
         float mouseAngle = Angles.mouseAngle(unit.x(), unit.y());
-        boolean aimCursor = omni && isShooting && unit.type().hasWeapons();
+        boolean aimCursor = omni && isShooting && unit.type().hasWeapons() && unit.type().faceTarget;
 
         if(aimCursor){
             unit.lookAt(mouseAngle);
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index c79a93ffe9..070ef02291 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -35,6 +35,7 @@ public class UnitType extends UnlockableContent{
     public float health = 200f, range = -1;
     public boolean targetAir = true, targetGround = true;
     public boolean faceTarget = true, isCounted = true;
+    public float sway = 1f;
 
     public int itemCapacity = 30;
     public int drillTier = -1;
@@ -136,7 +137,7 @@ public class UnitType extends UnlockableContent{
             drawLegs(legs);
 
             float ft = Mathf.sin(legs.walkTime(), 3f, 3f);
-            legOffset.trns(legs.baseRotation(), 0f, ft * 0.18f);
+            legOffset.trns(legs.baseRotation(), 0f, ft * 0.18f * sway);
             unit.trns(legOffset.x, legOffset.y);
         }