diff --git a/core/assets-raw/sprites/units/titan-base.png b/core/assets-raw/sprites/units/titan-base.png
index 27138867ff..75543a4485 100644
Binary files a/core/assets-raw/sprites/units/titan-base.png and b/core/assets-raw/sprites/units/titan-base.png differ
diff --git a/core/assets-raw/sprites/units/titan-cell.png b/core/assets-raw/sprites/units/titan-cell.png
index c7c376406b..865ff568fd 100644
Binary files a/core/assets-raw/sprites/units/titan-cell.png and b/core/assets-raw/sprites/units/titan-cell.png differ
diff --git a/core/assets-raw/sprites/units/titan-leg.png b/core/assets-raw/sprites/units/titan-leg.png
index be3a3ee575..b0903e2fa8 100644
Binary files a/core/assets-raw/sprites/units/titan-leg.png and b/core/assets-raw/sprites/units/titan-leg.png differ
diff --git a/core/assets-raw/sprites/units/titan.png b/core/assets-raw/sprites/units/titan.png
index b3505074ce..dd5ab163a2 100644
Binary files a/core/assets-raw/sprites/units/titan.png and b/core/assets-raw/sprites/units/titan.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 18a4dbec11..e888fe8d2a 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -34,14 +34,14 @@ mend-projector-top
   index: -1
 mender
   rotate: false
-  xy: 1047, 323
+  xy: 1071, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 1081, 357
+  xy: 969, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -62,42 +62,42 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1183, 323
+  xy: 1309, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1255, 697
+  xy: 1087, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1425, 697
+  xy: 1257, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 911, 664
+  xy: 1291, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 911, 630
+  xy: 1325, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 945, 664
+  xy: 1359, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -125,441 +125,441 @@ armored-conveyor-0-1
   index: -1
 armored-conveyor-0-2
   rotate: false
-  xy: 1547, 1759
+  xy: 935, 484
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-3
   rotate: false
-  xy: 1662, 1629
+  xy: 1547, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 1581, 1759
+  xy: 1662, 1629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 1998, 845
+  xy: 935, 450
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 2013, 600
+  xy: 1581, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 2013, 566
+  xy: 935, 416
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 843, 670
+  xy: 935, 382
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 843, 636
+  xy: 935, 348
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 843, 602
+  xy: 935, 314
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 843, 568
+  xy: 935, 280
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 843, 534
+  xy: 935, 246
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 843, 500
+  xy: 935, 212
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 843, 466
+  xy: 2013, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 843, 432
+  xy: 679, 144
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 843, 398
+  xy: 935, 178
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 843, 364
+  xy: 615, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 843, 330
+  xy: 649, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 843, 296
+  xy: 683, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 945, 392
+  xy: 1219, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 911, 324
+  xy: 1253, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 945, 358
+  xy: 1253, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 911, 290
+  xy: 1287, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 945, 324
+  xy: 1287, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 911, 256
+  xy: 1321, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 945, 290
+  xy: 1321, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 911, 222
+  xy: 1355, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 945, 256
+  xy: 1355, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 911, 188
+  xy: 1393, 731
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 945, 222
+  xy: 1393, 697
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 945, 188
+  xy: 1427, 731
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 979, 663
+  xy: 1393, 663
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 979, 629
+  xy: 1427, 697
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1013, 663
+  xy: 1427, 663
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 979, 595
+  xy: 1393, 629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1013, 629
+  xy: 1427, 629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1047, 663
+  xy: 1389, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 979, 561
+  xy: 1423, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 1047, 289
+  xy: 1003, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 1081, 323
+  xy: 1037, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 1115, 357
+  xy: 1071, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 1149, 391
+  xy: 1105, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 1183, 425
+  xy: 1139, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 1217, 459
+  xy: 1173, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1353, 493
+  xy: 1207, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1387, 527
+  xy: 1241, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1421, 561
+  xy: 1275, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1115, 221
+  xy: 1309, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1149, 255
+  xy: 1343, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1183, 289
+  xy: 1105, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1217, 323
+  xy: 1139, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1251, 357
+  xy: 1173, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1285, 391
+  xy: 1207, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1319, 425
+  xy: 1241, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1353, 459
+  xy: 1275, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1387, 493
+  xy: 1309, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1421, 527
+  xy: 1343, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1149, 221
+  xy: 1139, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1183, 255
+  xy: 1173, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1217, 289
+  xy: 1207, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1251, 323
+  xy: 1241, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1285, 357
+  xy: 1275, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1319, 391
+  xy: 1309, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 1013, 527
+  xy: 1563, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -573,14 +573,14 @@ distributor
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1149, 629
+  xy: 1631, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1183, 527
+  xy: 1041, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -615,56 +615,56 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 1149, 425
+  xy: 1037, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1319, 595
+  xy: 1037, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1353, 629
+  xy: 1071, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1387, 663
+  xy: 1105, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 979, 221
+  xy: 1139, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1183, 357
+  xy: 1207, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1251, 391
+  xy: 1105, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 1421, 493
+  xy: 1207, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -811,63 +811,63 @@ pneumatic-drill-top
   index: -1
 water-extractor
   rotate: false
-  xy: 1801, 777
+  xy: 1867, 777
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 1867, 777
+  xy: 1933, 1171
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 1933, 1171
+  xy: 1933, 1105
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 1933, 1105
+  xy: 1933, 1039
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 855, 126
+  xy: 853, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 877, 196
+  xy: 1121, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1391, 731
+  xy: 1291, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 945, 528
+  xy: 1083, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1115, 391
+  xy: 1003, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -881,189 +881,189 @@ place-arrow
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1289, 697
+  xy: 1121, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1323, 697
+  xy: 1155, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1323, 697
+  xy: 1155, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1357, 697
+  xy: 1189, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1391, 697
+  xy: 1223, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 911, 562
+  xy: 1015, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 945, 596
+  xy: 1015, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 911, 528
+  xy: 1049, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 945, 562
+  xy: 1049, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 945, 562
+  xy: 1049, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 945, 562
+  xy: 1049, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 945, 562
+  xy: 1049, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 911, 494
+  xy: 1083, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 911, 460
+  xy: 1117, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 945, 494
+  xy: 1117, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 911, 426
+  xy: 1151, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 945, 460
+  xy: 1151, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 945, 460
+  xy: 1151, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 911, 392
+  xy: 1185, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 945, 426
+  xy: 1185, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 911, 358
+  xy: 1219, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1285, 629
+  xy: 1143, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1013, 323
+  xy: 1245, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1047, 357
+  xy: 1279, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1081, 391
+  xy: 1313, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1115, 425
+  xy: 1347, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1149, 459
+  xy: 969, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1091,133 +1091,133 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 979, 255
+  xy: 1003, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1183, 459
+  xy: 1071, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1217, 493
+  xy: 1105, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1251, 527
+  xy: 969, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1285, 561
+  xy: 1003, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1285, 527
+  xy: 1003, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1319, 561
+  xy: 1037, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1353, 595
+  xy: 1071, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1387, 629
+  xy: 1105, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1421, 663
+  xy: 1139, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1013, 221
+  xy: 1173, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1047, 255
+  xy: 1207, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1081, 289
+  xy: 969, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1217, 425
+  xy: 1105, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1251, 459
+  xy: 1139, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1285, 493
+  xy: 1173, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1319, 527
+  xy: 1207, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1353, 561
+  xy: 1241, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1387, 595
+  xy: 1003, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1287,14 +1287,14 @@ tau-mech-pad
   index: -1
 trident-ship-pad
   rotate: false
-  xy: 1537, 773
+  xy: 1603, 773
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 843, 262
+  xy: 717, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1315,21 +1315,21 @@ battery-large-top
   index: -1
 battery-top
   rotate: false
-  xy: 843, 228
+  xy: 751, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 911, 596
+  xy: 981, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 945, 630
+  xy: 981, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1357,28 +1357,28 @@ differential-generator-top
   index: -1
 diode
   rotate: false
-  xy: 1047, 561
+  xy: 1597, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 1081, 595
+  xy: 1597, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1047, 527
+  xy: 1529, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1081, 561
+  xy: 1563, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1434,7 +1434,7 @@ impact-reactor-plasma-3
   index: -1
 power-node
   rotate: false
-  xy: 1115, 323
+  xy: 1003, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1448,14 +1448,14 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 1149, 357
+  xy: 1037, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1183, 391
+  xy: 1071, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1469,14 +1469,14 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1217, 391
+  xy: 1241, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1217, 357
+  xy: 1071, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1525,14 +1525,14 @@ thorium-reactor-lights
   index: -1
 turbine-generator
   rotate: false
-  xy: 1603, 773
+  xy: 1669, 777
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 turbine-generator-top
   rotate: false
-  xy: 1669, 777
+  xy: 1735, 777
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -1630,21 +1630,21 @@ graphite-press
   index: -1
 incinerator
   rotate: false
-  xy: 1115, 595
+  xy: 1597, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1183, 561
+  xy: 1389, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1149, 493
+  xy: 1007, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1672,21 +1672,21 @@ silicon-smelter-top
   index: -1
 liquid-source
   rotate: false
-  xy: 1251, 561
+  xy: 969, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1285, 595
+  xy: 1003, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1013, 289
+  xy: 1037, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1735,21 +1735,21 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1421, 629
+  xy: 1037, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1047, 221
+  xy: 1071, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1081, 255
+  xy: 1105, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1833,77 +1833,77 @@ spore-press-top
   index: -1
 rock1
   rotate: false
-  xy: 615, 42
+  xy: 629, 92
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 679, 78
+  xy: 665, 42
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-boulder1
   rotate: false
-  xy: 1251, 425
+  xy: 1275, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 1285, 459
+  xy: 1037, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 1115, 255
+  xy: 1241, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1149, 289
+  xy: 1275, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock1
   rotate: false
-  xy: 715, 28
+  xy: 715, 42
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrock2
   rotate: false
-  xy: 801, 804
+  xy: 729, 92
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 765, 28
+  xy: 893, 236
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 807, 28
+  xy: 893, 194
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 849, 28
+  xy: 939, 556
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -1966,14 +1966,14 @@ launch-pad-large
   index: -1
 unloader
   rotate: false
-  xy: 1183, 221
+  xy: 1241, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 1217, 255
+  xy: 1275, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1994,7 +1994,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 843, 194
+  xy: 785, 20
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2071,14 +2071,14 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 1353, 527
+  xy: 1105, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 1933, 973
+  xy: 1933, 907
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -2246,7 +2246,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1149, 323
+  xy: 1173, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2281,14 +2281,14 @@ titan-factory
   index: -1
 wraith-factory-top
   rotate: false
-  xy: 1933, 907
+  xy: 1933, 841
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 1013, 595
+  xy: 1389, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2302,7 +2302,7 @@ copper-wall-large
   index: -1
 door
   rotate: false
-  xy: 1115, 629
+  xy: 1631, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2323,14 +2323,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1149, 663
+  xy: 1631, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1013, 255
+  xy: 969, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2344,7 +2344,7 @@ phase-wall-large
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1251, 493
+  xy: 969, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2407,35 +2407,35 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1387, 561
+  xy: 1139, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1421, 595
+  xy: 1173, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1081, 221
+  xy: 1207, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1081, 221
+  xy: 1207, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1285, 425
+  xy: 1139, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2449,7 +2449,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1319, 459
+  xy: 1173, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2470,35 +2470,35 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1353, 425
+  xy: 1343, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large
   rotate: false
-  xy: 1471, 773
+  xy: 1537, 773
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 bullet
   rotate: false
-  xy: 743, 792
+  xy: 743, 676
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 bullet-back
   rotate: false
-  xy: 743, 738
+  xy: 743, 622
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 casing
   rotate: false
-  xy: 2039, 714
+  xy: 1461, 747
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -2512,7 +2512,7 @@ circle-end
   index: -1
 circle-mid
   rotate: false
-  xy: 1455, 496
+  xy: 2033, 1722
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
@@ -2526,7 +2526,7 @@ circle-shadow
   index: -1
 error
   rotate: false
-  xy: 1471, 723
+  xy: 801, 754
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -2575,7 +2575,7 @@ missile-back
   index: -1
 particle
   rotate: false
-  xy: 813, 70
+  xy: 893, 278
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -2596,21 +2596,21 @@ shell
   index: -1
 shell-back
   rotate: false
-  xy: 615, 4
+  xy: 935, 518
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 735, 178
+  xy: 765, 42
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1387, 459
+  xy: 1173, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2638,7 +2638,7 @@ block-air-factory-full
   index: -1
 block-arc-full
   rotate: false
-  xy: 843, 160
+  xy: 819, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2652,42 +2652,42 @@ block-blast-drill-full
   index: -1
 block-char-full
   rotate: false
-  xy: 855, 92
+  xy: 2013, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 851, 774
+  xy: 985, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conduit-full
   rotate: false
-  xy: 847, 740
+  xy: 985, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 847, 706
+  xy: 1019, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 847, 706
+  xy: 1019, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-craters-full
   rotate: false
-  xy: 881, 740
+  xy: 985, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2715,28 +2715,28 @@ block-cyclone-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 881, 706
+  xy: 1019, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 877, 672
+  xy: 1053, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 877, 638
+  xy: 985, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 877, 604
+  xy: 1019, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2750,7 +2750,7 @@ block-fuse-full
   index: -1
 block-grass-full
   rotate: false
-  xy: 877, 570
+  xy: 1053, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2764,49 +2764,49 @@ block-ground-factory-full
   index: -1
 block-hail-full
   rotate: false
-  xy: 877, 536
+  xy: 1087, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 877, 502
+  xy: 1019, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 877, 468
+  xy: 1053, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 877, 434
+  xy: 1087, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 877, 400
+  xy: 1121, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 877, 366
+  xy: 1053, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 877, 332
+  xy: 1087, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2834,7 +2834,7 @@ block-laser-drill-full
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 877, 298
+  xy: 1121, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2848,7 +2848,7 @@ block-liquid-tank-full
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 877, 264
+  xy: 1155, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2890,14 +2890,14 @@ block-meltdown-full
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 877, 230
+  xy: 1087, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 877, 162
+  xy: 1155, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2918,49 +2918,49 @@ block-oil-extractor-full
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 889, 128
+  xy: 1189, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 889, 94
+  xy: 1121, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 891, 60
+  xy: 1155, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 891, 26
+  xy: 1189, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 915, 732
+  xy: 1223, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 949, 732
+  xy: 1155, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 983, 731
+  xy: 1189, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2974,7 +2974,7 @@ block-phase-weaver-full
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1017, 731
+  xy: 1223, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2988,21 +2988,21 @@ block-pneumatic-drill-full
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1051, 731
+  xy: 1257, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1085, 731
+  xy: 1189, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1119, 731
+  xy: 1223, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3023,14 +3023,14 @@ block-rock-full
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1153, 731
+  xy: 1257, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1187, 731
+  xy: 1291, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3044,21 +3044,21 @@ block-salvo-full
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1221, 731
+  xy: 1223, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1255, 731
+  xy: 1257, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1289, 731
+  xy: 1291, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3072,21 +3072,21 @@ block-scatter-full
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1323, 731
+  xy: 1325, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1357, 731
+  xy: 1257, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1357, 731
+  xy: 1257, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3114,49 +3114,49 @@ block-scrap-wall-large-full
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1425, 731
+  xy: 1325, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 915, 698
+  xy: 1359, 773
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 949, 698
+  xy: 1291, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 983, 697
+  xy: 1325, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 1017, 697
+  xy: 1359, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snowrock-full
   rotate: false
-  xy: 1973, 1925
+  xy: 1999, 829
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1051, 697
+  xy: 1325, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3177,7 +3177,7 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1085, 697
+  xy: 1359, 705
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3191,14 +3191,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1119, 697
+  xy: 1359, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1153, 697
+  xy: 985, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3212,21 +3212,21 @@ block-swarmer-full
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1187, 697
+  xy: 1019, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1221, 697
+  xy: 1053, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1221, 697
+  xy: 1053, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3247,56 +3247,56 @@ block-wave-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1047, 629
+  xy: 1423, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1081, 663
+  xy: 1461, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 979, 527
+  xy: 1461, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1013, 561
+  xy: 1495, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1047, 595
+  xy: 1495, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1081, 629
+  xy: 1529, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 1115, 663
+  xy: 1529, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 979, 493
+  xy: 1563, 689
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3534,7 +3534,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 979, 459
+  xy: 1461, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3548,21 +3548,21 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1013, 493
+  xy: 1495, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 579, 98
+  xy: 637, 150
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 979, 425
+  xy: 1491, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3583,21 +3583,21 @@ item-blast-compound-tiny
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 1721, 727
+  xy: 797, 654
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 943, 808
+  xy: 901, 782
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1047, 493
+  xy: 1559, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3618,28 +3618,28 @@ item-coal-tiny
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 1771, 727
+  xy: 851, 692
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 901, 782
+  xy: 943, 808
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1115, 561
+  xy: 1627, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 911, 162
+  xy: 1689, 1471
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3653,28 +3653,28 @@ item-copper-tiny
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 1821, 727
+  xy: 847, 642
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-graphite-large
   rotate: false
-  xy: 943, 766
+  xy: 901, 740
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1183, 629
+  xy: 1491, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 1689, 1471
+  xy: 2011, 1437
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3688,28 +3688,28 @@ item-graphite-tiny
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 1871, 727
+  xy: 797, 604
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 985, 765
+  xy: 943, 766
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 979, 391
+  xy: 1559, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 2011, 1437
+  xy: 1655, 1241
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3723,28 +3723,28 @@ item-lead-tiny
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1571, 673
+  xy: 793, 554
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 1027, 765
+  xy: 901, 698
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1047, 459
+  xy: 1627, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 1655, 1241
+  xy: 1309, 339
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3758,357 +3758,357 @@ item-metaglass-tiny
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1621, 665
+  xy: 793, 504
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 1069, 765
+  xy: 943, 724
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1115, 527
+  xy: 1015, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 2021, 758
+  xy: 1343, 373
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-tiny
   rotate: false
-  xy: 985, 832
+  xy: 1696, 1645
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1671, 677
+  xy: 793, 454
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 1111, 765
+  xy: 1971, 734
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1183, 595
+  xy: 1083, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 979, 195
+  xy: 1207, 203
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 1696, 1645
+  xy: 1696, 1627
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1721, 677
+  xy: 793, 404
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 1153, 765
+  xy: 943, 682
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1251, 663
+  xy: 1151, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1251, 297
+  xy: 1241, 237
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 1696, 1627
+  xy: 713, 160
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1771, 677
+  xy: 793, 354
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 1195, 765
+  xy: 901, 656
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1013, 391
+  xy: 1219, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1285, 331
+  xy: 1275, 271
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 855, 74
+  xy: 713, 142
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1821, 677
+  xy: 793, 304
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 1237, 765
+  xy: 897, 614
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1081, 459
+  xy: 1287, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 1319, 365
+  xy: 1689, 1445
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 873, 74
+  xy: 985, 832
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1871, 677
+  xy: 793, 254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1279, 765
+  xy: 943, 640
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1149, 527
+  xy: 1355, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 1353, 399
+  xy: 1309, 313
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 1251, 279
+  xy: 1433, 509
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1921, 727
+  xy: 847, 592
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 1321, 765
+  xy: 897, 572
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1251, 629
+  xy: 1457, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1387, 433
+  xy: 1381, 501
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 923, 118
+  xy: 1377, 405
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 1921, 677
+  xy: 843, 542
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 1363, 765
+  xy: 939, 598
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 979, 323
+  xy: 1525, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1421, 467
+  xy: 1377, 475
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 2021, 714
+  xy: 866, 1609
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 1971, 734
+  xy: 843, 492
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 1971, 592
+  xy: 893, 530
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1047, 391
+  xy: 1593, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1217, 229
+  xy: 1407, 501
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 1031, 203
+  xy: 786, 1406
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 1971, 684
+  xy: 843, 442
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 729, 136
+  xy: 893, 488
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1115, 459
+  xy: 973, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 937, 162
+  xy: 1377, 449
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 866, 1609
+  xy: 955, 1479
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 1671, 627
+  xy: 843, 392
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4122,140 +4122,140 @@ lancer
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 729, 94
+  xy: 893, 446
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1251, 595
+  xy: 1109, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 923, 136
+  xy: 1403, 475
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 786, 1406
+  xy: 982, 1340
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 1921, 627
+  xy: 843, 192
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 771, 112
+  xy: 893, 404
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 979, 289
+  xy: 1211, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 1689, 1445
+  xy: 1377, 423
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 955, 1479
+  xy: 985, 814
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 1971, 634
+  xy: 785, 154
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 813, 112
+  xy: 893, 362
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1217, 527
+  xy: 1003, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 2021, 732
+  xy: 1403, 449
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 982, 1340
+  xy: 1395, 405
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 579, 140
+  xy: 835, 142
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 771, 70
+  xy: 893, 320
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1353, 663
+  xy: 969, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 1005, 195
+  xy: 1403, 423
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 985, 814
+  xy: 884, 1609
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 629, 142
+  xy: 579, 92
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4276,7 +4276,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1115, 289
+  xy: 1139, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4304,7 +4304,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 1319, 493
+  xy: 1071, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4325,21 +4325,21 @@ swarmer
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 793, 554
+  xy: 1521, 723
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-draug-full
   rotate: false
-  xy: 793, 504
+  xy: 1571, 723
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-phantom-full
   rotate: false
-  xy: 743, 846
+  xy: 743, 730
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -4353,175 +4353,175 @@ unit-reaper-full
   index: -1
 unit-spirit-full
   rotate: false
-  xy: 793, 454
+  xy: 1621, 723
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-titan-full
   rotate: false
-  xy: 1735, 777
+  xy: 1801, 777
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unit-vanguard-full
   rotate: false
-  xy: 793, 404
+  xy: 1671, 727
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-wraith-full
   rotate: false
-  xy: 793, 354
+  xy: 1721, 727
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 1933, 1039
+  xy: 1933, 973
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1183, 663
+  xy: 1457, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1013, 459
+  xy: 1525, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1081, 527
+  xy: 1593, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1149, 595
+  xy: 1457, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1217, 663
+  xy: 1525, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1013, 425
+  xy: 1593, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1081, 493
+  xy: 981, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1149, 561
+  xy: 1049, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1217, 629
+  xy: 1117, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 979, 357
+  xy: 1185, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1047, 425
+  xy: 1253, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1115, 493
+  xy: 1321, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1217, 595
+  xy: 1423, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1285, 663
+  xy: 1491, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1013, 357
+  xy: 1559, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1081, 425
+  xy: 1627, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1217, 561
+  xy: 1075, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1319, 663
+  xy: 1177, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1183, 493
+  xy: 969, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1319, 629
+  xy: 1037, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4542,7 +4542,7 @@ circle
   index: -1
 shape-3
   rotate: false
-  xy: 1933, 842
+  xy: 1933, 776
   size: 63, 63
   orig: 63, 63
   offset: 0, 0
@@ -4605,56 +4605,56 @@ chaos-array-leg
   index: -1
 crawler
   rotate: false
-  xy: 743, 588
+  xy: 743, 522
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 743, 538
+  xy: 743, 472
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-cell
   rotate: false
-  xy: 743, 488
+  xy: 743, 422
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 743, 438
+  xy: 743, 372
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 743, 388
+  xy: 743, 322
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 743, 338
+  xy: 743, 272
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 743, 288
+  xy: 1998, 779
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart
   rotate: false
-  xy: 743, 238
+  xy: 743, 222
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4668,42 +4668,42 @@ dart-cell
   index: -1
 delta
   rotate: false
-  xy: 133, 11
+  xy: 735, 172
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-base
   rotate: false
-  xy: 183, 11
+  xy: 133, 11
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-cell
   rotate: false
-  xy: 233, 11
+  xy: 183, 11
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-leg
   rotate: false
-  xy: 801, 854
+  xy: 233, 11
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug
   rotate: false
-  xy: 851, 858
+  xy: 801, 854
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug-cell
   rotate: false
-  xy: 743, 188
+  xy: 801, 804
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4778,13 +4778,6 @@ fortress-base
   orig: 64, 64
   offset: 0, 0
   index: -1
-titan-base
-  rotate: false
-  xy: 1405, 1161
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
 fortress-cell
   rotate: false
   xy: 1405, 1095
@@ -4829,21 +4822,21 @@ glaive-cell
   index: -1
 javelin
   rotate: false
-  xy: 1721, 627
+  xy: 843, 342
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-cell
   rotate: false
-  xy: 1771, 627
+  xy: 843, 292
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-shield
   rotate: false
-  xy: 1821, 627
+  xy: 843, 242
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4864,7 +4857,7 @@ lich-cell
   index: -1
 omega
   rotate: false
-  xy: 1933, 784
+  xy: 685, 692
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -4878,42 +4871,42 @@ omega-armor
   index: -1
 omega-base
   rotate: false
-  xy: 1991, 784
+  xy: 685, 634
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-cell
   rotate: false
-  xy: 685, 692
+  xy: 685, 576
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-leg
   rotate: false
-  xy: 685, 634
+  xy: 685, 518
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 phantom
   rotate: false
-  xy: 685, 576
+  xy: 685, 460
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 phantom-cell
   rotate: false
-  xy: 685, 518
+  xy: 685, 402
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 power-cell
   rotate: false
-  xy: 685, 460
+  xy: 685, 344
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -4948,42 +4941,42 @@ revenant-cell
   index: -1
 spirit
   rotate: false
-  xy: 851, 808
+  xy: 779, 104
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spirit-cell
   rotate: false
-  xy: 797, 754
+  xy: 829, 92
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau
   rotate: false
-  xy: 685, 402
+  xy: 685, 286
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-base
   rotate: false
-  xy: 793, 654
+  xy: 829, 42
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-cell
   rotate: false
-  xy: 685, 344
+  xy: 685, 228
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-leg
   rotate: false
-  xy: 793, 604
+  xy: 1471, 723
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4995,51 +4988,58 @@ titan
   orig: 64, 64
   offset: 0, 0
   index: -1
-titan-cell
+titan-base
   rotate: false
   xy: 1339, 807
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-titan-leg
+titan-cell
   rotate: false
   xy: 1405, 765
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+titan-leg
+  rotate: false
+  xy: 1471, 773
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 trident
   rotate: false
-  xy: 685, 286
+  xy: 743, 846
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 trident-cell
   rotate: false
-  xy: 685, 228
+  xy: 743, 788
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 vanguard
   rotate: false
-  xy: 793, 304
+  xy: 1771, 727
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-cell
   rotate: false
-  xy: 793, 204
+  xy: 1871, 727
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wraith
   rotate: false
-  xy: 793, 154
+  xy: 1921, 726
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5060,21 +5060,21 @@ blaster-equip
   index: -1
 bomber-equip
   rotate: false
-  xy: 743, 688
+  xy: 1973, 1925
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 743, 688
+  xy: 1973, 1925
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 743, 638
+  xy: 743, 572
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5095,70 +5095,70 @@ eradication-equip
   index: -1
 eruption-equip
   rotate: false
-  xy: 1521, 715
+  xy: 851, 850
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 1571, 723
+  xy: 851, 800
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 1621, 715
+  xy: 851, 742
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 1671, 727
+  xy: 801, 704
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles-equip
   rotate: false
-  xy: 1871, 627
+  xy: 793, 204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun-equip
   rotate: false
-  xy: 679, 128
+  xy: 587, 142
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles-equip
   rotate: false
-  xy: 629, 92
+  xy: 615, 42
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 665, 28
+  xy: 679, 92
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 797, 704
+  xy: 779, 54
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-blaster-equip
   rotate: false
-  xy: 793, 254
+  xy: 1821, 727
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 55e4d7bbdc..36f52cb659 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 c197f7d9e1..be00effaf8 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/src/mindustry/entities/def/WeaponsComp.java b/core/src/mindustry/entities/def/WeaponsComp.java
index 9f4677505d..b11086c611 100644
--- a/core/src/mindustry/entities/def/WeaponsComp.java
+++ b/core/src/mindustry/entities/def/WeaponsComp.java
@@ -24,6 +24,12 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
     @ReadOnly transient float range, aimX, aimY;
     @ReadOnly transient boolean isRotate, isShooting;
 
+    void setWeaponRotation(float rotation){
+        for(WeaponMount mount : mounts){
+            mount.rotation = rotation;
+        }
+    }
+
     boolean inRange(Position other){
         return within(other, range);
     }
@@ -83,7 +89,7 @@ abstract class WeaponsComp implements Teamc, Posc, Rotc{
                 mount.targetRotation = Angles.angle(axisX, axisY, mount.aimX, mount.aimY) - rotation();
                 mount.rotation = Angles.moveToward(mount.rotation, mount.targetRotation, weapon.rotateSpeed * Time.delta());
             }else{
-                mount.rotation = this.rotation;
+                mount.rotation = 0;
                 mount.targetRotation = angleTo(mount.aimX, mount.aimY);
             }
 
diff --git a/core/src/mindustry/world/Build.java b/core/src/mindustry/world/Build.java
index f868084615..b66273f9fd 100644
--- a/core/src/mindustry/world/Build.java
+++ b/core/src/mindustry/world/Build.java
@@ -93,7 +93,8 @@ public class Build{
                 return true;
             }
 
-            if(!contactsGround(tile.x, tile.y, type)){
+            //TODO should water blocks be placeable here?
+            if(/*!type.requiresWater && */!contactsGround(tile.x, tile.y, type)){
                 return false;
             }
 
diff --git a/gradle.properties b/gradle.properties
index 0e20cf8135..db6841059f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=f3c9d742fecd62da79f37eb84c8351a9e0b16758
+archash=2d1ea50ebc73ce8d87b275727efb785fd3e95b84