diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties
index 212e03a927..68da37f11c 100644
--- a/annotations/src/main/resources/classids.properties
+++ b/annotations/src/main/resources/classids.properties
@@ -12,6 +12,7 @@ mindustry.entities.comp.PuddleComp=6
 mindustry.entities.comp.TileComp=7
 mindustry.type.Weather.WeatherComp=8
 mindustry.world.blocks.storage.LaunchPad.LaunchPayloadComp=9
+oculon=16
 phantom=10
 titan=11
 vanguard=12
diff --git a/core/assets-raw/sprites/units/alpha-cell.png b/core/assets-raw/sprites/units/alpha-cell.png
index 8930e79cf5..d791541089 100644
Binary files a/core/assets-raw/sprites/units/alpha-cell.png and b/core/assets-raw/sprites/units/alpha-cell.png differ
diff --git a/core/assets-raw/sprites/units/alpha.png b/core/assets-raw/sprites/units/alpha.png
index 7e1d6cddd2..7018a18ec4 100644
Binary files a/core/assets-raw/sprites/units/alpha.png and b/core/assets-raw/sprites/units/alpha.png differ
diff --git a/core/assets-raw/sprites/units/dart-cell.png b/core/assets-raw/sprites/units/dart-cell.png
deleted file mode 100644
index d791541089..0000000000
Binary files a/core/assets-raw/sprites/units/dart-cell.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/dart.png b/core/assets-raw/sprites/units/dart.png
deleted file mode 100644
index 7018a18ec4..0000000000
Binary files a/core/assets-raw/sprites/units/dart.png and /dev/null differ
diff --git a/core/assets-raw/sprites/units/alpha-base.png b/core/assets-raw/sprites/units/oculon-base.png
similarity index 100%
rename from core/assets-raw/sprites/units/alpha-base.png
rename to core/assets-raw/sprites/units/oculon-base.png
diff --git a/core/assets-raw/sprites/units/oculon-cell.png b/core/assets-raw/sprites/units/oculon-cell.png
new file mode 100644
index 0000000000..8930e79cf5
Binary files /dev/null and b/core/assets-raw/sprites/units/oculon-cell.png differ
diff --git a/core/assets-raw/sprites/units/alpha-leg.png b/core/assets-raw/sprites/units/oculon-leg.png
similarity index 100%
rename from core/assets-raw/sprites/units/alpha-leg.png
rename to core/assets-raw/sprites/units/oculon-leg.png
diff --git a/core/assets-raw/sprites/units/oculon.png b/core/assets-raw/sprites/units/oculon.png
new file mode 100644
index 0000000000..7e1d6cddd2
Binary files /dev/null and b/core/assets-raw/sprites/units/oculon.png differ
diff --git a/core/assets-raw/sprites/weapons/mount-weapon.png b/core/assets-raw/sprites/weapons/mount-weapon.png
new file mode 100644
index 0000000000..8979a1440a
Binary files /dev/null and b/core/assets-raw/sprites/weapons/mount-weapon.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index b631bba128..e5252001a6 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: 1209, 271
+  xy: 1429, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 1243, 339
+  xy: 1429, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -62,42 +62,42 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1481, 245
+  xy: 1447, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1471, 619
+  xy: 1157, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1165, 551
+  xy: 1191, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1157, 517
+  xy: 1191, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1157, 483
+  xy: 1191, 493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1157, 449
+  xy: 1175, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -146,420 +146,420 @@ armored-conveyor-1-0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 1123, 537
+  xy: 1123, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 1547, 1759
+  xy: 1165, 629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 1662, 1629
+  xy: 1207, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 253, 848
+  xy: 1249, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 287, 848
+  xy: 1291, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 1123, 503
+  xy: 1547, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 1581, 1759
+  xy: 1662, 1629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 1123, 469
+  xy: 253, 848
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 1123, 435
+  xy: 287, 848
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 616, 1207
+  xy: 1123, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 1123, 401
+  xy: 1325, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 1165, 755
+  xy: 1581, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 1165, 721
+  xy: 1123, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 1165, 687
+  xy: 1359, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 1165, 653
+  xy: 1393, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1225, 475
+  xy: 1267, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1225, 441
+  xy: 1259, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1191, 407
+  xy: 1259, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1225, 407
+  xy: 1259, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1539, 755
+  xy: 1309, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1539, 721
+  xy: 1301, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1539, 687
+  xy: 1301, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1539, 653
+  xy: 1343, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1539, 619
+  xy: 1377, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1539, 585
+  xy: 1411, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1539, 551
+  xy: 1445, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1157, 381
+  xy: 1479, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1191, 373
+  xy: 1513, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1225, 373
+  xy: 1555, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 2009, 1019
+  xy: 1547, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 2009, 985
+  xy: 1209, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 2009, 951
+  xy: 1209, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1081, 369
+  xy: 1209, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1073, 335
+  xy: 1209, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 1345, 279
+  xy: 1599, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 1379, 313
+  xy: 1599, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 1413, 347
+  xy: 1235, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 1379, 279
+  xy: 1269, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 1413, 313
+  xy: 1303, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 1447, 347
+  xy: 1345, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1337, 109
+  xy: 1549, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1371, 143
+  xy: 1583, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1405, 177
+  xy: 1379, 177
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1439, 211
+  xy: 1413, 211
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1371, 109
+  xy: 1447, 245
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1405, 143
+  xy: 1481, 279
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1439, 177
+  xy: 1515, 313
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1473, 211
+  xy: 1549, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1405, 109
+  xy: 1583, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1439, 143
+  xy: 1379, 143
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1473, 177
+  xy: 1413, 177
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1507, 211
+  xy: 1447, 211
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1439, 109
+  xy: 1481, 245
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1473, 143
+  xy: 1515, 279
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1507, 177
+  xy: 1549, 313
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1541, 211
+  xy: 1583, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1473, 109
+  xy: 1413, 143
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1507, 143
+  xy: 1447, 177
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1541, 177
+  xy: 1481, 211
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 1065, 127
+  xy: 1243, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -573,14 +573,14 @@ distributor
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1369, 517
+  xy: 1277, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1531, 483
+  xy: 1311, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -615,56 +615,56 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 1243, 271
+  xy: 1463, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1311, 313
+  xy: 1565, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1345, 347
+  xy: 1565, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1311, 279
+  xy: 1607, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1345, 313
+  xy: 1607, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1201, 135
+  xy: 1447, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1549, 245
+  xy: 1515, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 1541, 109
+  xy: 1583, 313
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -839,35 +839,35 @@ water-extractor-top
   index: -1
 block-border
   rotate: false
-  xy: 1199, 679
+  xy: 1123, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1301, 653
+  xy: 1107, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1471, 721
+  xy: 1233, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1403, 551
+  xy: 1175, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1243, 305
+  xy: 1463, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -881,189 +881,189 @@ place-arrow
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1505, 653
+  xy: 1157, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1471, 585
+  xy: 1157, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1471, 585
+  xy: 1157, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1505, 619
+  xy: 1157, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1505, 585
+  xy: 1191, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1233, 543
+  xy: 1175, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1267, 551
+  xy: 1175, 315
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1301, 551
+  xy: 1175, 281
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1335, 551
+  xy: 1175, 247
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1335, 551
+  xy: 1175, 247
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1335, 551
+  xy: 1175, 247
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1335, 551
+  xy: 1175, 247
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1369, 551
+  xy: 1175, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1437, 551
+  xy: 1175, 145
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1471, 551
+  xy: 1167, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1505, 551
+  xy: 1233, 603
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1191, 509
+  xy: 1225, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1191, 509
+  xy: 1225, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1191, 475
+  xy: 1225, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1225, 509
+  xy: 1225, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1191, 441
+  xy: 1267, 637
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1531, 449
+  xy: 1311, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1531, 381
+  xy: 1311, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1141, 333
+  xy: 1311, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1141, 299
+  xy: 1311, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1141, 265
+  xy: 1369, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1133, 231
+  xy: 1403, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1091,154 +1091,154 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1209, 339
+  xy: 1361, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-liquid
   rotate: false
-  xy: 1175, 271
+  xy: 1395, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-liquid
   rotate: false
-  xy: 1175, 271
+  xy: 1395, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-liquid
   rotate: false
-  xy: 1175, 271
+  xy: 1395, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1277, 347
+  xy: 1497, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1277, 313
+  xy: 1497, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1311, 347
+  xy: 1531, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1277, 279
+  xy: 1531, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1447, 313
+  xy: 1345, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1481, 347
+  xy: 1345, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1447, 279
+  xy: 1345, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1481, 313
+  xy: 1345, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1515, 347
+  xy: 1345, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1481, 279
+  xy: 1345, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1515, 313
+  xy: 1345, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1515, 279
+  xy: 1345, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1167, 231
+  xy: 1413, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1167, 197
+  xy: 1379, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1167, 163
+  xy: 1413, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1167, 129
+  xy: 1447, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1167, 95
+  xy: 1379, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1201, 237
+  xy: 1413, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1315,7 +1315,7 @@ trident-ship-pad
   index: -1
 battery
   rotate: false
-  xy: 1165, 619
+  xy: 1427, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1336,21 +1336,21 @@ battery-large-top
   index: -1
 battery-top
   rotate: false
-  xy: 1165, 585
+  xy: 1461, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 1157, 415
+  xy: 1175, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1199, 543
+  xy: 1175, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1378,28 +1378,28 @@ differential-generator-top
   index: -1
 diode
   rotate: false
-  xy: 1065, 93
+  xy: 1243, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 1099, 231
+  xy: 1243, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1267, 517
+  xy: 1277, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1301, 517
+  xy: 1277, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1455,7 +1455,7 @@ impact-reactor-plasma-3
   index: -1
 power-node
   rotate: false
-  xy: 1549, 347
+  xy: 1345, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1469,14 +1469,14 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 1549, 313
+  xy: 1379, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1549, 279
+  xy: 1379, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1490,14 +1490,14 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1235, 169
+  xy: 1481, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1515, 245
+  xy: 1481, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1651,21 +1651,21 @@ graphite-press
   index: -1
 incinerator
   rotate: false
-  xy: 1335, 517
+  xy: 1277, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1395, 415
+  xy: 1243, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1497, 449
+  xy: 1311, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1693,21 +1693,21 @@ silicon-smelter-top
   index: -1
 liquid-source
   rotate: false
-  xy: 1133, 129
+  xy: 1505, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1133, 95
+  xy: 1539, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1209, 305
+  xy: 1395, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1756,14 +1756,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1201, 203
+  xy: 1447, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1235, 237
+  xy: 1481, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1847,77 +1847,77 @@ spore-press-top
   index: -1
 rock1
   rotate: false
-  xy: 931, 224
+  xy: 931, 174
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 931, 174
+  xy: 931, 124
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-boulder1
   rotate: false
-  xy: 1201, 101
+  xy: 1515, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 1235, 135
+  xy: 1379, 313
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 1413, 245
+  xy: 1379, 279
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1447, 245
+  xy: 1413, 313
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock1
   rotate: false
-  xy: 981, 689
+  xy: 981, 631
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrock2
   rotate: false
-  xy: 1031, 739
+  xy: 981, 581
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 1123, 655
+  xy: 1165, 663
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 1123, 613
+  xy: 1207, 705
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 1123, 571
+  xy: 1249, 747
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -1994,14 +1994,14 @@ launchpod
   index: -1
 unloader
   rotate: false
-  xy: 1565, 483
+  xy: 1447, 143
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 1565, 449
+  xy: 1481, 177
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2022,7 +2022,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 1199, 747
+  xy: 1495, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2050,7 +2050,7 @@ block-4
   index: -1
 hail-heat
   rotate: false
-  xy: 1031, 347
+  xy: 1031, 439
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -2099,7 +2099,7 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 1277, 245
+  xy: 1447, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2274,7 +2274,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1235, 203
+  xy: 1413, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2316,7 +2316,7 @@ wraith-factory-top
   index: -1
 copper-wall
   rotate: false
-  xy: 1073, 301
+  xy: 1209, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2330,7 +2330,7 @@ copper-wall-large
   index: -1
 door
   rotate: false
-  xy: 1099, 197
+  xy: 1243, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2351,14 +2351,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1099, 163
+  xy: 1243, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1379, 347
+  xy: 1607, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2372,7 +2372,7 @@ phase-wall-large
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1413, 279
+  xy: 1345, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2435,35 +2435,35 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1311, 245
+  xy: 1481, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1345, 245
+  xy: 1515, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1379, 245
+  xy: 1549, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1379, 245
+  xy: 1549, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1371, 177
+  xy: 1481, 313
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2477,7 +2477,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1405, 211
+  xy: 1515, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2498,7 +2498,7 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1507, 109
+  xy: 1515, 245
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2540,7 +2540,7 @@ circle-end
   index: -1
 circle-mid
   rotate: false
-  xy: 1573, 602
+  xy: 1617, 316
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
@@ -2554,7 +2554,7 @@ circle-shadow
   index: -1
 error
   rotate: false
-  xy: 1061, 789
+  xy: 911, 774
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -2603,7 +2603,7 @@ missile-back
   index: -1
 particle
   rotate: false
-  xy: 1123, 697
+  xy: 1123, 621
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -2638,7 +2638,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1541, 143
+  xy: 1549, 279
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2666,7 +2666,7 @@ block-air-factory-full
   index: -1
 block-arc-full
   rotate: false
-  xy: 1199, 713
+  xy: 616, 1207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2680,42 +2680,42 @@ block-blast-drill-full
   index: -1
 block-char-full
   rotate: false
-  xy: 1199, 645
+  xy: 1529, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 1199, 611
+  xy: 2009, 1011
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conduit-full
   rotate: false
-  xy: 1233, 747
+  xy: 2009, 977
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 1233, 713
+  xy: 2009, 943
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1233, 713
+  xy: 2009, 943
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-craters-full
   rotate: false
-  xy: 1233, 679
+  xy: 1031, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2743,28 +2743,28 @@ block-cyclone-full
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 1233, 645
+  xy: 1695, 787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 1233, 611
+  xy: 1729, 787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 1199, 577
+  xy: 1073, 447
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 1233, 577
+  xy: 1073, 413
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2778,7 +2778,7 @@ block-fuse-full
   index: -1
 block-grass-full
   rotate: false
-  xy: 1267, 755
+  xy: 1073, 379
   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: 1267, 721
+  xy: 1073, 345
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1301, 755
+  xy: 1073, 311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 1267, 687
+  xy: 1073, 277
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 1301, 721
+  xy: 1073, 243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 1335, 755
+  xy: 1073, 209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 1267, 653
+  xy: 1073, 175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 1301, 687
+  xy: 1073, 141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2862,7 +2862,7 @@ block-laser-drill-full
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 1335, 721
+  xy: 1065, 107
   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: 1369, 755
+  xy: 1107, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2918,14 +2918,14 @@ block-meltdown-full
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 1267, 619
+  xy: 1107, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1335, 687
+  xy: 1107, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2946,49 +2946,49 @@ block-oil-extractor-full
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 1369, 721
+  xy: 1107, 315
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1403, 755
+  xy: 1107, 281
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1267, 585
+  xy: 1107, 247
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1301, 619
+  xy: 1107, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1335, 653
+  xy: 1107, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1369, 687
+  xy: 1107, 145
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1403, 721
+  xy: 1141, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3002,7 +3002,7 @@ block-phase-weaver-full
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 1437, 755
+  xy: 1141, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3016,21 +3016,21 @@ block-pneumatic-drill-full
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 1301, 585
+  xy: 1141, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1335, 619
+  xy: 1141, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1369, 653
+  xy: 1141, 315
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3051,14 +3051,14 @@ block-rock-full
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1403, 687
+  xy: 1141, 281
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1437, 721
+  xy: 1141, 247
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3072,21 +3072,21 @@ block-salvo-full
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 1471, 755
+  xy: 1141, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1335, 585
+  xy: 1141, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1369, 619
+  xy: 1141, 145
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3100,21 +3100,21 @@ block-scatter-full
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1403, 653
+  xy: 1199, 629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1437, 687
+  xy: 1241, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1437, 687
+  xy: 1241, 671
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3142,35 +3142,35 @@ block-scrap-wall-large-full
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1505, 755
+  xy: 1283, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1369, 585
+  xy: 1275, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1403, 619
+  xy: 1317, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1437, 653
+  xy: 1351, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 1471, 687
+  xy: 1385, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3184,7 +3184,7 @@ block-snowrock-full
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1505, 721
+  xy: 1419, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3205,7 +3205,7 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1403, 585
+  xy: 1453, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3219,14 +3219,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1437, 619
+  xy: 1487, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1471, 653
+  xy: 1521, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3240,21 +3240,21 @@ block-swarmer-full
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1505, 687
+  xy: 1099, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1437, 585
+  xy: 1133, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1437, 585
+  xy: 1133, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3275,56 +3275,56 @@ block-wave-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1073, 267
+  xy: 1209, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1115, 367
+  xy: 1209, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1107, 333
+  xy: 1209, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1107, 299
+  xy: 1209, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1107, 265
+  xy: 1209, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1065, 229
+  xy: 1243, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 1065, 195
+  xy: 1243, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 1065, 161
+  xy: 1243, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3562,7 +3562,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1099, 129
+  xy: 1243, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3576,21 +3576,21 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1099, 95
+  xy: 1243, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 981, 247
+  xy: 1031, 397
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1437, 517
+  xy: 1277, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3611,21 +3611,21 @@ item-blast-compound-tiny
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 1311, 789
+  xy: 1161, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 1031, 305
+  xy: 1031, 355
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1505, 517
+  xy: 1277, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3646,28 +3646,28 @@ item-coal-tiny
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 1361, 789
+  xy: 1211, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 981, 205
+  xy: 1031, 313
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1259, 483
+  xy: 1277, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 881, 98
+  xy: 1545, 1043
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3681,28 +3681,28 @@ item-copper-tiny
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 1411, 789
+  xy: 1261, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-graphite-large
   rotate: false
-  xy: 981, 163
+  xy: 1031, 271
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1293, 483
+  xy: 1335, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 1545, 1043
+  xy: 881, 98
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3716,28 +3716,28 @@ item-graphite-tiny
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 1461, 789
+  xy: 1311, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 981, 121
+  xy: 1031, 229
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1293, 449
+  xy: 1369, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 2009, 925
+  xy: 1515, 219
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3751,28 +3751,28 @@ item-lead-tiny
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1511, 789
+  xy: 1361, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 1031, 263
+  xy: 1031, 187
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1259, 381
+  xy: 1403, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 1565, 423
+  xy: 1549, 253
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3786,28 +3786,28 @@ item-metaglass-tiny
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 881, 724
+  xy: 1411, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 1023, 221
+  xy: 1031, 145
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1327, 449
+  xy: 1437, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 1689, 1445
+  xy: 1583, 287
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3821,28 +3821,28 @@ item-phase-fabric-tiny
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 881, 674
+  xy: 1461, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 1023, 179
+  xy: 1081, 739
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1293, 381
+  xy: 1471, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 907, 98
+  xy: 1481, 151
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3856,28 +3856,28 @@ item-plastanium-tiny
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 881, 624
+  xy: 1511, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 1023, 137
+  xy: 1081, 697
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1361, 449
+  xy: 1505, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1565, 397
+  xy: 1689, 1445
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3891,28 +3891,28 @@ item-pyratite-tiny
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 881, 574
+  xy: 881, 724
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 1023, 95
+  xy: 1081, 655
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1327, 381
+  xy: 1539, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1689, 1419
+  xy: 907, 98
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3926,28 +3926,28 @@ item-sand-tiny
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 881, 524
+  xy: 881, 674
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 1081, 739
+  xy: 1081, 613
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1395, 449
+  xy: 1581, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 933, 98
+  xy: 1515, 193
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3961,28 +3961,28 @@ item-scrap-tiny
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 881, 474
+  xy: 881, 624
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1081, 697
+  xy: 1081, 571
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1361, 381
+  xy: 1573, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 1745, 846
+  xy: 1689, 1419
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3996,28 +3996,28 @@ item-silicon-tiny
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 881, 424
+  xy: 881, 574
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 1081, 655
+  xy: 1081, 529
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1463, 483
+  xy: 1293, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1745, 820
+  xy: 933, 98
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4031,28 +4031,28 @@ item-spore-pod-tiny
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 881, 374
+  xy: 881, 524
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 1081, 613
+  xy: 1081, 487
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1429, 415
+  xy: 1293, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 481, 6
+  xy: 1745, 846
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4066,28 +4066,28 @@ item-surge-alloy-tiny
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 881, 324
+  xy: 881, 474
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 1081, 571
+  xy: 1123, 747
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1497, 483
+  xy: 1327, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 507, 6
+  xy: 481, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4101,28 +4101,28 @@ item-thorium-tiny
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 881, 274
+  xy: 881, 424
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 1081, 529
+  xy: 1123, 705
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1463, 415
+  xy: 1311, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 533, 6
+  xy: 507, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4136,7 +4136,7 @@ item-titanium-tiny
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 881, 224
+  xy: 881, 374
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4150,21 +4150,21 @@ lancer
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 1081, 487
+  xy: 1165, 747
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1497, 415
+  xy: 1311, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 893, 72
+  xy: 533, 6
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4178,112 +4178,112 @@ liquid-cryofluid-tiny
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 931, 574
+  xy: 931, 724
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1081, 445
+  xy: 1123, 663
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1531, 415
+  xy: 1311, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 893, 46
+  xy: 959, 98
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 1689, 1401
+  xy: 2009, 925
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 931, 524
+  xy: 931, 674
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 1081, 403
+  xy: 1165, 705
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1133, 163
+  xy: 1471, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 919, 72
+  xy: 893, 72
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 959, 106
+  xy: 1689, 1401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 931, 474
+  xy: 931, 624
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 1123, 739
+  xy: 1207, 747
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1175, 305
+  xy: 1361, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 919, 46
+  xy: 893, 46
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 893, 28
+  xy: 1745, 828
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 931, 424
+  xy: 931, 574
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4304,7 +4304,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1201, 169
+  xy: 1379, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4332,7 +4332,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 1235, 101
+  xy: 1413, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4346,84 +4346,84 @@ spectre
   index: -1
 splash-0
   rotate: false
-  xy: 1269, 211
+  xy: 1549, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-1
   rotate: false
-  xy: 1269, 177
+  xy: 1583, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-10
   rotate: false
-  xy: 1303, 109
+  xy: 1413, 245
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-11
   rotate: false
-  xy: 1337, 143
+  xy: 1447, 279
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-2
   rotate: false
-  xy: 1303, 211
+  xy: 1379, 245
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-3
   rotate: false
-  xy: 1269, 143
+  xy: 1413, 279
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-4
   rotate: false
-  xy: 1303, 177
+  xy: 1447, 313
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-5
   rotate: false
-  xy: 1337, 211
+  xy: 1481, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-6
   rotate: false
-  xy: 1269, 109
+  xy: 1515, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-7
   rotate: false
-  xy: 1303, 143
+  xy: 1549, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-8
   rotate: false
-  xy: 1337, 177
+  xy: 1583, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-9
   rotate: false
-  xy: 1371, 211
+  xy: 1379, 211
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4437,35 +4437,28 @@ swarmer
   index: -1
 unit-alpha-full
   rotate: false
-  xy: 1973, 1925
-  size: 58, 48
-  orig: 58, 48
+  xy: 981, 331
+  size: 48, 48
+  orig: 48, 48
   offset: 0, 0
   index: -1
 unit-crawler-full
   rotate: false
-  xy: 981, 539
+  xy: 981, 281
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 1031, 589
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-unit-dart-full
-  rotate: false
-  xy: 981, 489
+  xy: 981, 231
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-draug-full
   rotate: false
-  xy: 1031, 539
+  xy: 981, 181
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4491,6 +4484,13 @@ unit-ghoul-full
   orig: 72, 72
   offset: 0, 0
   index: -1
+unit-oculon-full
+  rotate: false
+  xy: 1973, 1925
+  size: 58, 48
+  orig: 58, 48
+  offset: 0, 0
+  index: -1
 unit-phantom-full
   rotate: false
   xy: 1987, 1311
@@ -4507,7 +4507,7 @@ unit-reaper-full
   index: -1
 unit-spirit-full
   rotate: false
-  xy: 981, 439
+  xy: 981, 131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4521,14 +4521,14 @@ unit-titan-full
   index: -1
 unit-vanguard-full
   rotate: false
-  xy: 1031, 489
+  xy: 1031, 731
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-wraith-full
   rotate: false
-  xy: 981, 389
+  xy: 1031, 681
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4542,140 +4542,140 @@ wave
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1403, 517
+  xy: 1277, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1471, 517
+  xy: 1277, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1539, 517
+  xy: 1277, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1259, 449
+  xy: 1201, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1259, 415
+  xy: 1335, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1327, 483
+  xy: 1369, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1293, 415
+  xy: 1403, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1361, 483
+  xy: 1437, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1327, 415
+  xy: 1471, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1395, 483
+  xy: 1505, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1361, 415
+  xy: 1539, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1429, 483
+  xy: 1573, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1429, 449
+  xy: 1277, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1395, 381
+  xy: 1293, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1463, 449
+  xy: 1327, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1429, 381
+  xy: 1327, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1463, 381
+  xy: 1311, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1497, 381
+  xy: 1311, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1133, 197
+  xy: 1437, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1175, 339
+  xy: 1573, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4702,13 +4702,6 @@ shape-3
   offset: 0, 0
   index: -1
 alpha
-  rotate: false
-  xy: 91, 17
-  size: 58, 48
-  orig: 58, 48
-  offset: 0, 0
-  index: -1
-alpha-base
   rotate: false
   xy: 1993, 1153
   size: 48, 48
@@ -4722,13 +4715,6 @@ alpha-cell
   orig: 48, 48
   offset: 0, 0
   index: -1
-alpha-leg
-  rotate: false
-  xy: 1993, 1053
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
 chaos-array
   rotate: false
   xy: 978, 1627
@@ -4806,58 +4792,44 @@ dagger-leg
   orig: 48, 48
   offset: 0, 0
   index: -1
-dart
+delta
   rotate: false
   xy: 1985, 873
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-dart-cell
+delta-base
   rotate: false
   xy: 1984, 823
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-delta
-  rotate: false
-  xy: 861, 832
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-delta-base
-  rotate: false
-  xy: 861, 782
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
 delta-cell
   rotate: false
-  xy: 911, 824
+  xy: 1695, 821
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-leg
   rotate: false
-  xy: 911, 774
+  xy: 861, 832
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug
   rotate: false
-  xy: 961, 789
+  xy: 861, 782
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug-cell
   rotate: false
-  xy: 1011, 789
+  xy: 911, 824
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4976,21 +4948,21 @@ glaive-cell
   index: -1
 javelin
   rotate: false
-  xy: 881, 174
+  xy: 881, 324
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-cell
   rotate: false
-  xy: 881, 124
+  xy: 881, 274
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-shield
   rotate: false
-  xy: 931, 724
+  xy: 881, 224
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5009,6 +4981,34 @@ lich-cell
   orig: 216, 240
   offset: 0, 0
   index: -1
+oculon
+  rotate: false
+  xy: 91, 17
+  size: 58, 48
+  orig: 58, 48
+  offset: 0, 0
+  index: -1
+oculon-base
+  rotate: false
+  xy: 931, 424
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+oculon-cell
+  rotate: false
+  xy: 931, 374
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+oculon-leg
+  rotate: false
+  xy: 931, 324
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 omega
   rotate: false
   xy: 1835, 923
@@ -5095,14 +5095,14 @@ revenant-cell
   index: -1
 spirit
   rotate: false
-  xy: 981, 639
+  xy: 981, 531
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spirit-cell
   rotate: false
-  xy: 1031, 689
+  xy: 981, 481
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5116,7 +5116,7 @@ tau
   index: -1
 tau-base
   rotate: false
-  xy: 981, 589
+  xy: 981, 431
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5130,7 +5130,7 @@ tau-cell
   index: -1
 tau-leg
   rotate: false
-  xy: 1031, 639
+  xy: 981, 381
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5179,28 +5179,28 @@ trident-cell
   index: -1
 vanguard
   rotate: false
-  xy: 1031, 439
+  xy: 1031, 631
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-cell
   rotate: false
-  xy: 981, 339
+  xy: 1031, 581
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wraith
   rotate: false
-  xy: 981, 289
+  xy: 1031, 481
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery
   rotate: false
-  xy: 1695, 813
+  xy: 1993, 1045
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
@@ -5228,84 +5228,91 @@ eradication
   index: -1
 eruption
   rotate: false
-  xy: 1111, 781
+  xy: 961, 781
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun
   rotate: false
-  xy: 1161, 789
+  xy: 1011, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower
   rotate: false
-  xy: 1211, 781
+  xy: 1061, 781
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-weapon
   rotate: false
-  xy: 1261, 789
+  xy: 1111, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 large-weapon
   rotate: false
-  xy: 931, 674
+  xy: 881, 174
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles
   rotate: false
-  xy: 931, 624
+  xy: 881, 124
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles
   rotate: false
-  xy: 931, 374
+  xy: 931, 524
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mount-weapon
+  rotate: false
+  xy: 931, 474
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-weapon
   rotate: false
-  xy: 931, 324
+  xy: 931, 274
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles
   rotate: false
-  xy: 931, 274
+  xy: 931, 224
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-heal-weapon
   rotate: false
-  xy: 931, 124
+  xy: 981, 731
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-weapon
   rotate: false
-  xy: 981, 739
+  xy: 981, 681
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 weapon
   rotate: false
-  xy: 1031, 389
+  xy: 1031, 531
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 9374a3610b..4c32979d79 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 341fb1a2b8..5ec575fd6d 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/src/mindustry/content/Bullets.java b/core/src/mindustry/content/Bullets.java
index 7e046249b2..9ea1595a3d 100644
--- a/core/src/mindustry/content/Bullets.java
+++ b/core/src/mindustry/content/Bullets.java
@@ -619,9 +619,9 @@ public class Bullets implements ContentList{
             drag = 0.04f;
         }};
 
-        bombExplosive = new BombBulletType(10f, 20f, "shell"){{
-            bulletWidth = 9f;
-            bulletHeight = 13f;
+        bombExplosive = new BombBulletType(18f, 25f, "shell"){{
+            bulletWidth = 10f;
+            bulletHeight = 14f;
             hitEffect = Fx.flakExplosion;
             shootEffect = Fx.none;
             smokeEffect = Fx.none;
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 79d8c403d3..9c6a3d6a31 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -15,7 +15,7 @@ public class UnitTypes implements ContentList{
     public static @EntityDef({Unitc.class, Legsc.class}) UnitType titan, dagger, crawler, fortress, eruptor, chaosArray, eradicator;
 
     //ground + builder
-    public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType alpha;
+    public static @EntityDef({Unitc.class, Legsc.class, Builderc.class}) UnitType oculon;
 
     //air
     public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich;
@@ -27,7 +27,8 @@ public class UnitTypes implements ContentList{
     public static @EntityDef({Unitc.class, Builderc.class}) UnitType phantom, spirit;
 
     //air + building + mining
-    public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType dart;
+    //TODO implement other starter drones
+    public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma;
 
     //water
     public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType vanguard;
@@ -168,7 +169,7 @@ public class UnitTypes implements ContentList{
             weapons.add(new Weapon(){{
                 x = 3f;
                 shootY = 0f;
-                reload = 6f;
+                reload = 12f;
                 shootCone = 180f;
                 alternate = true;
                 ejectEffect = Fx.none;
@@ -210,7 +211,7 @@ public class UnitTypes implements ContentList{
             mass = 1.75f;
             health = 130;
             immunities = ObjectSet.with(StatusEffects.wet);
-            weapons.add(new Weapon("large-weapon"){{
+            weapons.add(new Weapon("mount-weapon"){{
                 reload = 10f;
                 x = 1.25f;
                 alternate = true;
@@ -254,14 +255,14 @@ public class UnitTypes implements ContentList{
             }});
         }};
 
-        dart = new UnitType("dart"){{
+        alpha = new UnitType("alpha"){{
             flying = true;
             mineSpeed = 2f;
             drag = 0.05f;
             mass = 2f;
-            speed = 2.9f;
+            speed = 2.4f;
             rotateSpeed = 15f;
-            accel = 0.15f;
+            accel = 0.1f;
             range = 70f;
             itemCapacity = 70;
             health = 400;
@@ -295,7 +296,7 @@ public class UnitTypes implements ContentList{
             hitsize = 8f;
         }};
 
-        alpha = new UnitType("alpha"){{
+        oculon = new UnitType("oculon"){{
             drillTier = -1;
             speed = 0.6f;
             hitsize = 9f;
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 802af73d67..7561b82c45 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -42,9 +42,7 @@ public class UnitType extends UnlockableContent{
     public int drillTier = -1;
     public float buildSpeed = 1f, mineSpeed = 1f;
 
-    public Color engineColor = Pal.engine;
     public float engineOffset = 5f, engineSize = 2.5f;
-
     public float strafePenalty = 0.5f;
     public float hitsize = 6f;
     public float itemOffsetY = 3f;
@@ -66,7 +64,6 @@ public class UnitType extends UnlockableContent{
         }else{
             //TODO fix for mods
             throw new RuntimeException("Unit has no type: " + name);
-            //constructor = () -> Nulls.unit;
         }
     }
 
@@ -154,8 +151,8 @@ public class UnitType extends UnlockableContent{
         Draw.z(z);
         drawEngine(unit);
         drawBody(unit);
-        drawWeapons(unit);
         if(drawCell) drawCell(unit);
+        drawWeapons(unit);
         if(drawItems) drawItems(unit);
         drawLight(unit);
 
diff --git a/core/src/mindustry/type/Weapon.java b/core/src/mindustry/type/Weapon.java
index d35ebca515..caf6cb7299 100644
--- a/core/src/mindustry/type/Weapon.java
+++ b/core/src/mindustry/type/Weapon.java
@@ -52,8 +52,6 @@ public class Weapon{
     public float shootCone = 1.5f;
     /** whether shooter rotation is ignored when shooting. */
     public boolean ignoreRotation = false;
-    /** if turnCursor is false for a mech, how far away will the weapon target. */
-    public float targetDistance = 1f;
     /** sound used for shooting */
     public Sound shootSound = Sounds.pew;
     /** displayed region (autoloaded) */
diff --git a/core/src/mindustry/world/blocks/storage/CoreBlock.java b/core/src/mindustry/world/blocks/storage/CoreBlock.java
index ed41bda77e..9704c83bc4 100644
--- a/core/src/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/mindustry/world/blocks/storage/CoreBlock.java
@@ -21,7 +21,7 @@ import mindustry.world.modules.*;
 import static mindustry.Vars.*;
 
 public class CoreBlock extends StorageBlock{
-    public UnitType unitType = UnitTypes.dart;
+    public UnitType unitType = UnitTypes.alpha;
 
     public CoreBlock(String name){
         super(name);
@@ -65,7 +65,7 @@ public class CoreBlock extends StorageBlock{
             ));
 
         bars.add("units", e ->
-        new Bar(
+            new Bar(
                 () -> Core.bundle.format("bar.units", teamIndex.count(e.team()), Units.getCap(e.team())),
                 () -> Pal.power,
                 () -> (float)teamIndex.count(e.team()) / Units.getCap(e.team())
diff --git a/core/src/mindustry/world/blocks/units/Reassembler.java b/core/src/mindustry/world/blocks/units/Reassembler.java
new file mode 100644
index 0000000000..6b44e2ae90
--- /dev/null
+++ b/core/src/mindustry/world/blocks/units/Reassembler.java
@@ -0,0 +1,21 @@
+package mindustry.world.blocks.units;
+
+import arc.util.ArcAnnotate.*;
+import mindustry.gen.*;
+import mindustry.world.*;
+
+public class Reassembler extends Block{
+
+    public Reassembler(String name){
+        super(name);
+    }
+
+    public class ReassemblerEntity extends TileEntity{
+        public @Nullable Unitc unit;
+
+        @Override
+        public void updateTile(){
+
+        }
+    }
+}
diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java
index 3d7aa27d67..9f48a2ccb0 100644
--- a/tools/src/mindustry/tools/Generators.java
+++ b/tools/src/mindustry/tools/Generators.java
@@ -266,7 +266,7 @@ public class Generators{
 
                         image.draw(weapon.region,
                         (int)(i * weapon.x / Draw.scl + image.width / 2 - weapon.region.getWidth() / 2),
-                        (int)(weapon.y / Draw.scl + image.height / 2f - weapon.region.getHeight() / 2f),
+                        (int)(-weapon.y / Draw.scl + image.height / 2f - weapon.region.getHeight() / 2f),
                         i > 0, false);
                     }
                 }