diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties
deleted file mode 100644
index 80aaeb7ed5..0000000000
--- a/annotations/src/main/resources/classids.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-#Maps entity names to IDs. Autogenerated.
-
-draug=0
-mindustry.entities.def.BulletComp=1
-mindustry.entities.def.DecalComp=2
-mindustry.entities.def.EffectComp=3
-mindustry.entities.def.FireComp=4
-mindustry.entities.def.PlayerComp=5
-mindustry.entities.def.PuddleComp=6
-mindustry.entities.def.TileComp=7
-mindustry.type.Weather.WeatherComp=8
-mindustry.world.blocks.storage.LaunchPad.LaunchPayloadComp=9
-phantom=10
-titan=11
-vanguard=12
-wraith=13
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/BuilderUnitEntity/0.json b/annotations/src/main/resources/revisions/BuilderUnitEntity/0.json
deleted file mode 100644
index 2b9663c159..0000000000
--- a/annotations/src/main/resources/revisions/BuilderUnitEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:requests,type:arc.struct.Queue<mindustry.entities.units.BuildRequest>,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Array<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:vel,type:arc.math.geom.Vec2,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/CommanderUnitWaterMoveEntity/0.json b/annotations/src/main/resources/revisions/CommanderUnitWaterMoveEntity/0.json
deleted file mode 100644
index 25aa74f6fe..0000000000
--- a/annotations/src/main/resources/revisions/CommanderUnitWaterMoveEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Array<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:vel,type:arc.math.geom.Vec2,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/FireEntity/0.json b/annotations/src/main/resources/revisions/FireEntity/0.json
deleted file mode 100644
index a5423a835b..0000000000
--- a/annotations/src/main/resources/revisions/FireEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:baseFlammability,type:float,size:4},{name:block,type:mindustry.world.Block,size:-1},{name:lifetime,type:float,size:4},{name:puddleFlammability,type:float,size:4},{name:tile,type:mindustry.world.Tile,size:-1},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/LaunchPayloadEntity/0.json b/annotations/src/main/resources/revisions/LaunchPayloadEntity/0.json
deleted file mode 100644
index 793c0f9572..0000000000
--- a/annotations/src/main/resources/revisions/LaunchPayloadEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:height,type:float,size:4},{name:stacks,type:arc.struct.Array<mindustry.type.ItemStack>,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/LaunchPayloadEntity/1.json b/annotations/src/main/resources/revisions/LaunchPayloadEntity/1.json
deleted file mode 100644
index 6314bc7ee4..0000000000
--- a/annotations/src/main/resources/revisions/LaunchPayloadEntity/1.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:1,fields:[{name:height,type:float,size:4},{name:lifetime,type:float,size:4},{name:stacks,type:arc.struct.Array<mindustry.type.ItemStack>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/LaunchPayloadEntity/2.json b/annotations/src/main/resources/revisions/LaunchPayloadEntity/2.json
deleted file mode 100644
index 4dc9173474..0000000000
--- a/annotations/src/main/resources/revisions/LaunchPayloadEntity/2.json
+++ /dev/null
@@ -1 +0,0 @@
-{version:2,fields:[{name:lifetime,type:float,size:4},{name:stacks,type:arc.struct.Array<mindustry.type.ItemStack>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/LegsUnitEntity/0.json b/annotations/src/main/resources/revisions/LegsUnitEntity/0.json
deleted file mode 100644
index 1351f965a9..0000000000
--- a/annotations/src/main/resources/revisions/LegsUnitEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:baseRotation,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Array<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:vel,type:arc.math.geom.Vec2,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/MinerUnitEntity/0.json b/annotations/src/main/resources/revisions/MinerUnitEntity/0.json
deleted file mode 100644
index d9c2fbd34f..0000000000
--- a/annotations/src/main/resources/revisions/MinerUnitEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Array<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:vel,type:arc.math.geom.Vec2,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/PuddleEntity/0.json b/annotations/src/main/resources/revisions/PuddleEntity/0.json
deleted file mode 100644
index 09114ed8ea..0000000000
--- a/annotations/src/main/resources/revisions/PuddleEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:accepting,type:float,size:4},{name:amount,type:float,size:4},{name:generation,type:int,size:4},{name:lastRipple,type:float,size:4},{name:liquid,type:mindustry.type.Liquid,size:-1},{name:tile,type:mindustry.world.Tile,size:-1},{name:updateTime,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/UnitEntity/0.json b/annotations/src/main/resources/revisions/UnitEntity/0.json
deleted file mode 100644
index 25aa74f6fe..0000000000
--- a/annotations/src/main/resources/revisions/UnitEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:rotation,type:float,size:4},{name:shield,type:float,size:4},{name:stack,type:mindustry.type.ItemStack,size:-1},{name:statuses,type:arc.struct.Array<mindustry.entities.units.StatusEntry>,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:vel,type:arc.math.geom.Vec2,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/annotations/src/main/resources/revisions/WeatherEntity/0.json b/annotations/src/main/resources/revisions/WeatherEntity/0.json
deleted file mode 100644
index 84ba06dbcd..0000000000
--- a/annotations/src/main/resources/revisions/WeatherEntity/0.json
+++ /dev/null
@@ -1 +0,0 @@
-{fields:[{name:intensity,type:float,size:4},{name:life,type:float,size:4},{name:opacity,type:float,size:4},{name:weather,type:mindustry.type.Weather,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}
\ No newline at end of file
diff --git a/core/assets-raw/sprites/units/alpha-leg.png b/core/assets-raw/sprites/units/alpha-leg.png
index 3be6f210e2..d1f2fae6d6 100644
Binary files a/core/assets-raw/sprites/units/alpha-leg.png and b/core/assets-raw/sprites/units/alpha-leg.png differ
diff --git a/core/assets-raw/sprites/units/alpha.png b/core/assets-raw/sprites/units/alpha.png
index a01baf8e22..1c0650dd0c 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/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index a55ed1527e..cf41c67142 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: 1941, 789
+  xy: 1497, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 1975, 789
+  xy: 1531, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -62,42 +62,42 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 893, 90
+  xy: 1227, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1587, 643
+  xy: 1157, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1723, 702
+  xy: 1327, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1723, 668
+  xy: 1091, 471
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1723, 634
+  xy: 1091, 437
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1689, 617
+  xy: 1091, 403
   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: 883, 898
+  xy: 1547, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 1547, 1759
+  xy: 1662, 1629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 1662, 1629
+  xy: 253, 848
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 253, 848
+  xy: 287, 848
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 287, 848
+  xy: 1581, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 1581, 1759
+  xy: 616, 1207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 1737, 838
+  xy: 2009, 1019
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 1737, 804
+  xy: 2009, 985
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 616, 1207
+  xy: 2009, 951
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 1771, 809
+  xy: 1399, 747
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 2009, 1019
+  xy: 1399, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 2009, 985
+  xy: 1399, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 2009, 951
+  xy: 1399, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 1737, 770
+  xy: 1885, 839
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 1771, 775
+  xy: 1919, 839
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1057, 327
+  xy: 1125, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1057, 293
+  xy: 1125, 309
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1057, 259
+  xy: 1125, 275
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1057, 225
+  xy: 1125, 241
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1057, 191
+  xy: 1125, 207
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1057, 157
+  xy: 1125, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1057, 123
+  xy: 1125, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1107, 495
+  xy: 1125, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1141, 495
+  xy: 1091, 63
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1091, 461
+  xy: 1125, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1091, 427
+  xy: 1057, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1125, 461
+  xy: 1125, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1091, 393
+  xy: 1091, 29
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1125, 427
+  xy: 1125, 3
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1091, 359
+  xy: 1689, 1401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1125, 393
+  xy: 1433, 747
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1091, 325
+  xy: 1467, 747
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1125, 359
+  xy: 1433, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1091, 291
+  xy: 1433, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 1825, 619
+  xy: 1735, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 1859, 653
+  xy: 1497, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 1893, 687
+  xy: 1531, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 1927, 721
+  xy: 1565, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 1961, 755
+  xy: 1599, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 1825, 585
+  xy: 1633, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1275, 621
+  xy: 1261, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1309, 621
+  xy: 1295, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1275, 587
+  xy: 1193, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1309, 587
+  xy: 1227, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1343, 611
+  xy: 1261, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1275, 553
+  xy: 1295, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1309, 553
+  xy: 1193, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1343, 577
+  xy: 1227, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1377, 585
+  xy: 1261, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1411, 585
+  xy: 1295, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1445, 585
+  xy: 1193, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1479, 585
+  xy: 1227, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1513, 585
+  xy: 1261, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1547, 585
+  xy: 1295, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1343, 543
+  xy: 1193, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1377, 551
+  xy: 1227, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1411, 551
+  xy: 1261, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1445, 551
+  xy: 1295, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1479, 551
+  xy: 1193, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 1125, 155
+  xy: 1535, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -573,14 +573,14 @@ distributor
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1159, 257
+  xy: 1705, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1383, 619
+  xy: 1395, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -615,56 +615,56 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 1825, 755
+  xy: 1599, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1893, 755
+  xy: 1565, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1825, 653
+  xy: 1599, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1859, 687
+  xy: 1633, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1893, 721
+  xy: 1667, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1893, 551
+  xy: 1193, 493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 893, 56
+  xy: 1295, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 1581, 575
+  xy: 1295, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -839,35 +839,35 @@ water-extractor-top
   index: -1
 block-border
   rotate: false
-  xy: 1417, 755
+  xy: 1952, 805
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1023, 421
+  xy: 1023, 217
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1655, 779
+  xy: 1057, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1791, 707
+  xy: 1091, 131
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 2009, 789
+  xy: 1565, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -881,189 +881,189 @@ place-arrow
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1621, 643
+  xy: 1191, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1655, 643
+  xy: 1225, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1655, 643
+  xy: 1225, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1689, 651
+  xy: 1259, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1723, 736
+  xy: 1293, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1757, 702
+  xy: 1091, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1757, 668
+  xy: 1091, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1757, 634
+  xy: 1091, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1757, 600
+  xy: 1091, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1757, 600
+  xy: 1091, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1757, 600
+  xy: 1091, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1757, 600
+  xy: 1091, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1791, 741
+  xy: 1091, 165
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1791, 673
+  xy: 1057, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1791, 639
+  xy: 1091, 97
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1791, 605
+  xy: 1023, 81
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1057, 463
+  xy: 1125, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1057, 463
+  xy: 1125, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1057, 429
+  xy: 1125, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1057, 395
+  xy: 1125, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1057, 361
+  xy: 1125, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1485, 619
+  xy: 1497, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1587, 609
+  xy: 1395, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1621, 609
+  xy: 1429, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1655, 609
+  xy: 1463, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1689, 583
+  xy: 1497, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1723, 566
+  xy: 1531, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1091,154 +1091,154 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1839, 789
+  xy: 1395, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-liquid
   rotate: false
-  xy: 1873, 789
+  xy: 1429, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-liquid
   rotate: false
-  xy: 1873, 789
+  xy: 1429, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-liquid
   rotate: false
-  xy: 1873, 789
+  xy: 1429, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1825, 721
+  xy: 1633, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1859, 755
+  xy: 1667, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1825, 687
+  xy: 1701, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1859, 721
+  xy: 1735, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1893, 653
+  xy: 1701, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1927, 687
+  xy: 1735, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1961, 721
+  xy: 1769, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1995, 755
+  xy: 1769, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1859, 585
+  xy: 1769, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1893, 619
+  xy: 1769, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-5
   rotate: false
-  xy: 1927, 653
+  xy: 1749, 771
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-6
   rotate: false
-  xy: 1961, 687
+  xy: 1159, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1961, 653
+  xy: 1159, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1995, 687
+  xy: 1159, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1927, 585
+  xy: 1159, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1961, 619
+  xy: 1159, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1995, 653
+  xy: 1159, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1961, 585
+  xy: 1159, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1315,7 +1315,7 @@ trident-ship-pad
   index: -1
 battery
   rotate: false
-  xy: 1349, 747
+  xy: 1953, 839
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1336,21 +1336,21 @@ battery-large-top
   index: -1
 battery-top
   rotate: false
-  xy: 1349, 713
+  xy: 1987, 839
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 1723, 600
+  xy: 1091, 369
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1757, 736
+  xy: 1091, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1378,28 +1378,28 @@ differential-generator-top
   index: -1
 diode
   rotate: false
-  xy: 1091, 121
+  xy: 1569, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 1125, 121
+  xy: 1569, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1159, 359
+  xy: 1671, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1159, 325
+  xy: 1671, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1455,7 +1455,7 @@ impact-reactor-plasma-3
   index: -1
 power-node
   rotate: false
-  xy: 1995, 721
+  xy: 1159, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1469,14 +1469,14 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 1893, 585
+  xy: 1159, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1927, 619
+  xy: 1159, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1490,14 +1490,14 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1927, 551
+  xy: 1227, 493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 927, 90
+  xy: 1261, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1651,21 +1651,21 @@ graphite-press
   index: -1
 incinerator
   rotate: false
-  xy: 1159, 291
+  xy: 1705, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1159, 53
+  xy: 961, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1241, 595
+  xy: 1361, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1693,21 +1693,21 @@ silicon-smelter-top
   index: -1
 liquid-source
   rotate: false
-  xy: 1207, 561
+  xy: 1633, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1241, 561
+  xy: 1667, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1907, 789
+  xy: 1463, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1756,14 +1756,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1995, 619
+  xy: 1159, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1995, 585
+  xy: 1159, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1847,77 +1847,77 @@ spore-press-top
   index: -1
 rock1
   rotate: false
-  xy: 931, 174
+  xy: 981, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 931, 124
+  xy: 1031, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-boulder1
   rotate: false
-  xy: 1961, 551
+  xy: 1193, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 1995, 551
+  xy: 1261, 493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 1961, 517
+  xy: 1261, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1995, 517
+  xy: 1193, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock1
   rotate: false
-  xy: 981, 689
+  xy: 1031, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrock2
   rotate: false
-  xy: 1031, 739
+  xy: 1081, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 1307, 697
+  xy: 1273, 663
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 1265, 663
+  xy: 1315, 663
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 1307, 655
+  xy: 1357, 655
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -1994,14 +1994,14 @@ launchpod
   index: -1
 unloader
   rotate: false
-  xy: 1615, 575
+  xy: 1227, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 1649, 575
+  xy: 1261, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2022,7 +2022,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 1349, 679
+  xy: 1884, 805
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2050,7 +2050,7 @@ block-4
   index: -1
 hail-heat
   rotate: false
-  xy: 981, 447
+  xy: 1231, 747
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -2099,7 +2099,7 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 1825, 517
+  xy: 1227, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2274,7 +2274,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1859, 551
+  xy: 1159, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2316,7 +2316,7 @@ wraith-factory-top
   index: -1
 copper-wall
   rotate: false
-  xy: 1125, 325
+  xy: 1467, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2330,7 +2330,7 @@ copper-wall-large
   index: -1
 door
   rotate: false
-  xy: 1175, 495
+  xy: 1603, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2351,14 +2351,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1159, 461
+  xy: 1603, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1927, 755
+  xy: 1701, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2372,7 +2372,7 @@ phase-wall-large
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1859, 619
+  xy: 1667, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2435,35 +2435,35 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1859, 517
+  xy: 1295, 493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1893, 517
+  xy: 1193, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1927, 517
+  xy: 1227, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1927, 517
+  xy: 1227, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1165, 19
+  xy: 1193, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2477,7 +2477,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1199, 19
+  xy: 1227, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2498,7 +2498,7 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1513, 551
+  xy: 1227, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2512,21 +2512,21 @@ titanium-wall-large
   index: -1
 bullet
   rotate: false
-  xy: 775, 878
+  xy: 1993, 1257
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 bullet-back
   rotate: false
-  xy: 829, 878
+  xy: 1993, 1203
   size: 52, 52
   orig: 52, 52
   offset: 0, 0
   index: -1
 casing
   rotate: false
-  xy: 1107, 529
+  xy: 1501, 763
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -2540,7 +2540,7 @@ circle-end
   index: -1
 circle-mid
   rotate: false
-  xy: 2029, 588
+  xy: 1329, 170
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
@@ -2554,7 +2554,7 @@ circle-shadow
   index: -1
 error
   rotate: false
-  xy: 1161, 789
+  xy: 1311, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -2575,7 +2575,7 @@ laser-end
   index: -1
 minelaser
   rotate: false
-  xy: 848, 1757
+  xy: 2043, 1153
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2603,14 +2603,14 @@ missile-back
   index: -1
 particle
   rotate: false
-  xy: 1307, 739
+  xy: 1231, 663
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 scale_marker
   rotate: false
-  xy: 149, 61
+  xy: 770, 1198
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
@@ -2631,14 +2631,14 @@ shell-back
   index: -1
 transfer
   rotate: false
-  xy: 2037, 1319
+  xy: 2043, 1103
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1547, 551
+  xy: 1261, 119
   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: 1383, 755
+  xy: 1918, 805
   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: 1383, 721
+  xy: 1986, 805
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-cliffs-full
   rotate: false
-  xy: 1451, 755
+  xy: 1511, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conduit-full
   rotate: false
-  xy: 1383, 687
+  xy: 1545, 755
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 1417, 721
+  xy: 1579, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1417, 721
+  xy: 1579, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-craters-full
   rotate: false
-  xy: 1485, 755
+  xy: 1613, 779
   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: 1417, 687
+  xy: 1647, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 1451, 721
+  xy: 1681, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dunerocks-full
   rotate: false
-  xy: 1519, 755
+  xy: 1715, 779
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 1451, 687
+  xy: 1579, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2778,7 +2778,7 @@ block-fuse-full
   index: -1
 block-grass-full
   rotate: false
-  xy: 1485, 721
+  xy: 1613, 745
   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: 1485, 687
+  xy: 1647, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-holostone-full
   rotate: false
-  xy: 1519, 721
+  xy: 1681, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 1519, 687
+  xy: 1715, 745
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 1349, 645
+  xy: 1023, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 1383, 653
+  xy: 1023, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icerocks-full
   rotate: false
-  xy: 1417, 653
+  xy: 1023, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ignarock-full
   rotate: false
-  xy: 1451, 653
+  xy: 1023, 353
   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: 1485, 653
+  xy: 1023, 319
   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: 1519, 653
+  xy: 1023, 285
   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: 1023, 455
+  xy: 1023, 251
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 1023, 387
+  xy: 1023, 183
   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: 1023, 353
+  xy: 1023, 149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 1023, 319
+  xy: 1023, 115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 1023, 285
+  xy: 1073, 505
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 1023, 251
+  xy: 1123, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 1023, 217
+  xy: 1173, 605
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 1023, 183
+  xy: 1223, 629
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 1023, 149
+  xy: 1257, 629
   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: 1023, 115
+  xy: 1291, 629
   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: 1073, 505
+  xy: 1057, 463
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 1123, 529
+  xy: 1057, 429
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 1157, 529
+  xy: 1057, 395
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3044,21 +3044,21 @@ block-ripple-full
   index: -1
 block-rock-full
   rotate: false
-  xy: 1993, 1103
+  xy: 1935, 873
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-rocks-full
   rotate: false
-  xy: 1553, 755
+  xy: 1057, 361
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-saltrocks-full
   rotate: false
-  xy: 1553, 721
+  xy: 1057, 327
   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: 1553, 687
+  xy: 1057, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 1553, 653
+  xy: 1057, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sandrocks-full
   rotate: false
-  xy: 1587, 779
+  xy: 1057, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3100,21 +3100,21 @@ block-scatter-full
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1621, 779
+  xy: 1057, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 1587, 745
+  xy: 1057, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1587, 745
+  xy: 1057, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3142,49 +3142,49 @@ block-scrap-wall-large-full
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 1587, 711
+  xy: 1107, 513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 1621, 745
+  xy: 1157, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shalerocks-full
   rotate: false
-  xy: 1587, 677
+  xy: 1207, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 1621, 711
+  xy: 1241, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 1655, 745
+  xy: 1275, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snowrock-full
   rotate: false
-  xy: 1993, 1053
+  xy: 775, 882
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snowrocks-full
   rotate: false
-  xy: 1621, 677
+  xy: 1191, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3198,14 +3198,14 @@ block-spectre-full
   index: -1
 block-spore-cluster-full
   rotate: false
-  xy: 1131, 647
+  xy: 875, 890
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1655, 711
+  xy: 1225, 561
   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: 1655, 677
+  xy: 1259, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1689, 753
+  xy: 1309, 595
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3240,21 +3240,21 @@ block-swarmer-full
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1689, 719
+  xy: 1293, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1689, 685
+  xy: 1327, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1689, 685
+  xy: 1327, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3275,56 +3275,56 @@ block-wave-full
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1091, 257
+  xy: 1433, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1125, 291
+  xy: 1467, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1091, 223
+  xy: 1467, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1125, 257
+  xy: 1501, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1091, 189
+  xy: 1535, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1125, 223
+  xy: 1501, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 1091, 155
+  xy: 1501, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 1125, 189
+  xy: 1535, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3562,7 +3562,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1159, 427
+  xy: 1637, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3576,21 +3576,21 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1159, 393
+  xy: 1637, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 1031, 497
+  xy: 981, 447
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1159, 189
+  xy: 1603, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3611,196 +3611,196 @@ item-blast-compound-tiny
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 1411, 789
+  xy: 881, 724
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 1081, 547
+  xy: 1031, 497
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1159, 121
+  xy: 1671, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal-small
   rotate: false
-  xy: 2023, 1949
+  xy: 1749, 745
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-tiny
   rotate: false
-  xy: 2011, 1369
+  xy: 267, 43
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 1461, 789
+  xy: 881, 674
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 1131, 605
+  xy: 1081, 547
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1193, 427
+  xy: 1739, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 2023, 1923
+  xy: 951, 1011
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 985, 1120
+  xy: 2011, 1369
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 1511, 789
+  xy: 881, 624
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-graphite-large
   rotate: false
-  xy: 981, 405
+  xy: 1131, 597
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1193, 359
+  xy: 1739, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 951, 1011
+  xy: 1545, 1043
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 1579, 1085
+  xy: 985, 1120
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 881, 724
+  xy: 881, 574
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 981, 363
+  xy: 1181, 647
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1193, 291
+  xy: 1535, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 1545, 1043
+  xy: 2009, 925
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 1561, 821
+  xy: 1579, 1085
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 881, 674
+  xy: 881, 524
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 981, 321
+  xy: 1231, 705
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1193, 223
+  xy: 1603, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 2009, 925
+  xy: 1325, 637
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 2029, 1369
+  xy: 1561, 821
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 881, 624
+  xy: 881, 474
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 981, 279
+  xy: 1273, 747
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1193, 155
+  xy: 1671, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3821,21 +3821,21 @@ item-phase-fabric-tiny
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 881, 574
+  xy: 881, 424
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 981, 237
+  xy: 981, 405
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1057, 89
+  xy: 1739, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3849,294 +3849,294 @@ item-plastanium-small
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 848, 1609
+  xy: 267, 25
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 881, 524
+  xy: 881, 374
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 981, 195
+  xy: 1273, 705
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1125, 87
+  xy: 927, 90
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1689, 1445
+  xy: 1063, 29
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 786, 1424
+  xy: 2029, 1369
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 881, 474
+  xy: 881, 324
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 981, 153
+  xy: 1315, 747
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1193, 87
+  xy: 927, 56
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1581, 549
+  xy: 1159, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 937, 1479
+  xy: 848, 1609
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 881, 424
+  xy: 881, 274
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 981, 111
+  xy: 981, 363
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1057, 55
+  xy: 927, 22
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 1607, 549
+  xy: 1329, 501
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 982, 1358
+  xy: 786, 1424
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 881, 374
+  xy: 881, 224
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1695, 829
+  xy: 1315, 705
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1125, 53
+  xy: 961, 43
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 1633, 549
+  xy: 1295, 127
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 795, 1112
+  xy: 937, 1479
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 881, 324
+  xy: 881, 174
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 1131, 563
+  xy: 981, 321
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1173, 655
+  xy: 995, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1659, 549
+  xy: 1261, 59
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 265, 43
+  xy: 481, 14
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 881, 274
+  xy: 881, 124
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 1695, 787
+  xy: 981, 279
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1173, 587
+  xy: 1361, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 481, 6
+  xy: 1689, 1445
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 961, 856
+  xy: 982, 1358
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 881, 224
+  xy: 931, 724
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 1181, 739
+  xy: 981, 237
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1207, 629
+  xy: 1429, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 507, 6
+  xy: 1329, 475
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 883, 880
+  xy: 795, 1112
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 881, 174
+  xy: 931, 674
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 1181, 697
+  xy: 981, 195
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1241, 629
+  xy: 1361, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 533, 6
+  xy: 1295, 101
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 901, 880
+  xy: 961, 856
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 881, 124
+  xy: 931, 624
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4150,21 +4150,21 @@ lancer
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 1223, 739
+  xy: 981, 153
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1451, 619
+  xy: 1463, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 293, 822
+  xy: 1329, 449
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4178,28 +4178,28 @@ liquid-cryofluid-tiny
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 931, 524
+  xy: 931, 374
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1223, 697
+  xy: 1357, 739
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1553, 619
+  xy: 1361, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 2018, 1767
+  xy: 1329, 423
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4213,77 +4213,77 @@ liquid-oil-tiny
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 931, 474
+  xy: 931, 324
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 1265, 747
+  xy: 1357, 697
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1791, 571
+  xy: 1599, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 2018, 1741
+  xy: 1329, 397
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 1241, 679
+  xy: 1723, 1417
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 931, 424
+  xy: 931, 274
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 1265, 705
+  xy: 981, 111
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1805, 789
+  xy: 1735, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 2018, 1715
+  xy: 1329, 371
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 1173, 569
+  xy: 1723, 1399
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 931, 374
+  xy: 931, 224
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4304,7 +4304,7 @@ meltdown
   index: -1
 repair-point
   rotate: false
-  xy: 1825, 551
+  xy: 1159, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4332,7 +4332,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 1791, 537
+  xy: 1193, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4346,84 +4346,84 @@ spectre
   index: -1
 splash-0
   rotate: false
-  xy: 927, 56
+  xy: 1193, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-1
   rotate: false
-  xy: 893, 22
+  xy: 1227, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-10
   rotate: false
-  xy: 1097, 19
+  xy: 1261, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-11
   rotate: false
-  xy: 1131, 19
+  xy: 1295, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-2
   rotate: false
-  xy: 927, 22
+  xy: 1261, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-3
   rotate: false
-  xy: 961, 77
+  xy: 1295, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-4
   rotate: false
-  xy: 961, 43
+  xy: 1193, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-5
   rotate: false
-  xy: 961, 9
+  xy: 1227, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-6
   rotate: false
-  xy: 995, 47
+  xy: 1261, 357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-7
   rotate: false
-  xy: 995, 13
+  xy: 1295, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-8
   rotate: false
-  xy: 1029, 21
+  xy: 1193, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-9
   rotate: false
-  xy: 1063, 19
+  xy: 1227, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4435,23 +4435,30 @@ swarmer
   orig: 64, 64
   offset: 0, 0
   index: -1
+unit-alpha-full
+  rotate: false
+  xy: 1973, 1925
+  size: 58, 48
+  orig: 58, 48
+  offset: 0, 0
+  index: -1
 unit-crawler-full
   rotate: false
-  xy: 1031, 639
+  xy: 981, 539
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 1081, 689
+  xy: 1031, 589
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-draug-full
   rotate: false
-  xy: 1131, 739
+  xy: 1081, 639
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4479,7 +4486,7 @@ unit-ghoul-full
   index: -1
 unit-phantom-full
   rotate: false
-  xy: 1776, 843
+  xy: 1987, 1311
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -4493,7 +4500,7 @@ unit-reaper-full
   index: -1
 unit-spirit-full
   rotate: false
-  xy: 981, 539
+  xy: 1131, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4507,14 +4514,14 @@ unit-titan-full
   index: -1
 unit-vanguard-full
   rotate: false
-  xy: 1031, 589
+  xy: 1181, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-wraith-full
   rotate: false
-  xy: 1081, 639
+  xy: 981, 489
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4528,140 +4535,140 @@ wave
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1159, 223
+  xy: 1569, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1159, 155
+  xy: 1637, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1193, 461
+  xy: 1705, 643
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1193, 393
+  xy: 1739, 677
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1193, 325
+  xy: 1501, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1193, 257
+  xy: 1569, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1193, 189
+  xy: 1637, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1193, 121
+  xy: 1705, 609
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1091, 87
+  xy: 893, 90
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1159, 87
+  xy: 893, 56
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1023, 81
+  xy: 893, 22
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1091, 53
+  xy: 961, 77
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1193, 53
+  xy: 995, 47
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1173, 621
+  xy: 1029, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1207, 663
+  xy: 1395, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1207, 595
+  xy: 1463, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1417, 619
+  xy: 1429, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1519, 619
+  xy: 1531, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1757, 566
+  xy: 1565, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1689, 1401
+  xy: 1701, 575
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4689,28 +4696,28 @@ shape-3
   index: -1
 alpha
   rotate: false
-  xy: 1973, 1925
-  size: 48, 48
-  orig: 48, 48
+  xy: 91, 17
+  size: 58, 48
+  orig: 58, 48
   offset: 0, 0
   index: -1
 alpha-base
   rotate: false
-  xy: 811, 828
+  xy: 1993, 1153
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-cell
   rotate: false
-  xy: 811, 778
+  xy: 1993, 1103
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-leg
   rotate: false
-  xy: 1987, 1319
+  xy: 1993, 1053
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4745,105 +4752,105 @@ chaos-array-leg
   index: -1
 crawler
   rotate: false
-  xy: 1885, 873
+  xy: 811, 832
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 1935, 873
+  xy: 811, 782
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-cell
   rotate: false
-  xy: 1834, 823
+  xy: 1985, 873
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 1884, 823
+  xy: 1834, 815
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 1934, 823
+  xy: 861, 832
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 1985, 873
+  xy: 861, 782
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 1984, 823
+  xy: 911, 824
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart
   rotate: false
-  xy: 861, 828
+  xy: 911, 774
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart-cell
   rotate: false
-  xy: 861, 778
+  xy: 961, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta
   rotate: false
-  xy: 911, 824
+  xy: 1011, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-base
   rotate: false
-  xy: 911, 774
+  xy: 1061, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-cell
   rotate: false
-  xy: 961, 789
+  xy: 1111, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-leg
   rotate: false
-  xy: 1011, 789
+  xy: 1161, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug
   rotate: false
-  xy: 1061, 789
+  xy: 1211, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 draug-cell
   rotate: false
-  xy: 1111, 789
+  xy: 1261, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4948,35 +4955,35 @@ ghoul-cell
   index: -1
 glaive
   rotate: false
-  xy: 91, 9
+  xy: 1977, 1539
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 glaive-cell
   rotate: false
-  xy: 1977, 1539
+  xy: 1835, 981
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 javelin
   rotate: false
-  xy: 931, 724
+  xy: 931, 574
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-cell
   rotate: false
-  xy: 931, 674
+  xy: 931, 524
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-shield
   rotate: false
-  xy: 931, 624
+  xy: 931, 474
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -4997,7 +5004,7 @@ lich-cell
   index: -1
 omega
   rotate: false
-  xy: 1835, 981
+  xy: 1835, 923
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5011,42 +5018,42 @@ omega-armor
   index: -1
 omega-base
   rotate: false
-  xy: 1835, 923
+  xy: 1893, 981
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-cell
   rotate: false
-  xy: 1893, 981
+  xy: 1893, 923
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-leg
   rotate: false
-  xy: 1893, 923
+  xy: 717, 878
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 phantom
   rotate: false
-  xy: 717, 878
+  xy: 1951, 981
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 phantom-cell
   rotate: false
-  xy: 149, 3
+  xy: 1951, 923
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 power-cell
   rotate: false
-  xy: 207, 3
+  xy: 151, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -5081,42 +5088,42 @@ revenant-cell
   index: -1
 spirit
   rotate: false
-  xy: 981, 639
+  xy: 981, 589
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spirit-cell
   rotate: false
-  xy: 1031, 689
+  xy: 1031, 639
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau
   rotate: false
-  xy: 1951, 981
+  xy: 209, 3
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-base
   rotate: false
-  xy: 1081, 739
+  xy: 1081, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-cell
   rotate: false
-  xy: 1951, 923
+  xy: 1579, 813
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-leg
   rotate: false
-  xy: 981, 589
+  xy: 1131, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5151,63 +5158,63 @@ titan-leg
   index: -1
 trident
   rotate: false
-  xy: 1579, 813
+  xy: 1637, 813
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 trident-cell
   rotate: false
-  xy: 1637, 813
+  xy: 1776, 843
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 vanguard
   rotate: false
-  xy: 1131, 689
+  xy: 1031, 539
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-cell
   rotate: false
-  xy: 1031, 539
+  xy: 1131, 639
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wraith
   rotate: false
-  xy: 1081, 589
+  xy: 1181, 689
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery
   rotate: false
-  xy: 1993, 1261
+  xy: 1695, 813
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 artillery-equip
   rotate: false
-  xy: 1993, 1203
+  xy: 1835, 865
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 blaster
   rotate: false
-  xy: 1993, 1153
+  xy: 1885, 873
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chain-blaster
   rotate: false
-  xy: 1835, 873
+  xy: 825, 882
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5228,70 +5235,70 @@ eradication
   index: -1
 eruption
   rotate: false
-  xy: 1211, 781
+  xy: 1361, 781
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun
   rotate: false
-  xy: 1261, 789
+  xy: 1411, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower
   rotate: false
-  xy: 1311, 781
+  xy: 1461, 781
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster
   rotate: false
-  xy: 1361, 789
+  xy: 1511, 789
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles
   rotate: false
-  xy: 931, 574
+  xy: 931, 424
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles
   rotate: false
-  xy: 931, 324
+  xy: 931, 174
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun
   rotate: false
-  xy: 931, 274
+  xy: 931, 124
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles
   rotate: false
-  xy: 931, 224
+  xy: 981, 739
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun
   rotate: false
-  xy: 981, 739
+  xy: 981, 639
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-blaster
   rotate: false
-  xy: 981, 489
+  xy: 1081, 589
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8984,96 +8991,6 @@ white-tree-icon-editor
   index: -1
 
 sprites5.png
-size: 1024,1024
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-zone-craters
-  rotate: false
-  xy: 605, 767
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-zone-desertWastes
-  rotate: false
-  xy: 303, 461
-  size: 260, 260
-  orig: 260, 260
-  offset: 0, 0
-  index: -1
-zone-desolateRift
-  rotate: false
-  xy: 817, 163
-  size: 100, 350
-  orig: 100, 350
-  offset: 0, 0
-  index: -1
-zone-frozenForest
-  rotate: false
-  xy: 303, 1
-  size: 200, 200
-  orig: 200, 200
-  offset: 0, 0
-  index: -1
-zone-fungalPass
-  rotate: false
-  xy: 863, 773
-  size: 150, 250
-  orig: 150, 250
-  offset: 0, 0
-  index: -1
-zone-groundZero
-  rotate: false
-  xy: 303, 203
-  size: 256, 256
-  orig: 256, 256
-  offset: 0, 0
-  index: -1
-zone-nuclearComplex
-  rotate: false
-  xy: 605, 515
-  size: 250, 250
-  orig: 250, 250
-  offset: 0, 0
-  index: -1
-zone-overgrowth
-  rotate: false
-  xy: 1, 723
-  size: 300, 300
-  orig: 300, 300
-  offset: 0, 0
-  index: -1
-zone-ruinousShores
-  rotate: false
-  xy: 1, 421
-  size: 300, 300
-  orig: 300, 300
-  offset: 0, 0
-  index: -1
-zone-saltFlats
-  rotate: false
-  xy: 303, 723
-  size: 300, 300
-  orig: 300, 300
-  offset: 0, 0
-  index: -1
-zone-stainedMountains
-  rotate: false
-  xy: 1, 119
-  size: 300, 300
-  orig: 300, 300
-  offset: 0, 0
-  index: -1
-zone-tarFields
-  rotate: false
-  xy: 565, 263
-  size: 250, 250
-  orig: 250, 250
-  offset: 0, 0
-  index: -1
-
-sprites6.png
 size: 2048,1024
 format: RGBA8888
 filter: Nearest,Nearest
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index cc8b7ed969..70b52d52d5 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 4c5e8bfbc7..d74f9faed6 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png
index e2146e8186..9c4ac9af5d 100644
Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ
diff --git a/core/assets/sprites/sprites6.png b/core/assets/sprites/sprites6.png
deleted file mode 100644
index 9c4ac9af5d..0000000000
Binary files a/core/assets/sprites/sprites6.png and /dev/null differ
diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index e044d6e32d..6777e842d3 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -128,7 +128,7 @@ public class Vars implements Loadable{
     /** whether typing into the console is enabled - developers only */
     public static boolean enableConsole = false;
     /** whether to clear sector saves when landing */
-    public static boolean clearSectors = true;
+    public static boolean clearSectors = false;
     /** whether any light rendering is enabled */
     public static boolean enableLight = true;
     /** application data directory, equivalent to {@link Settings#getDataDirectory()} */
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 6b6f292f82..93176b3534 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1,16 +1,18 @@
 package mindustry.content;
 
+import arc.graphics.*;
 import arc.struct.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.ctype.*;
 import mindustry.entities.bullet.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.type.*;
 
 public class UnitTypes implements ContentList{
 
     //ground
-    public static @EntityDef({Unitc.class, Legsc.class}) UnitType titan, dagger, crawler, fortress, eruptor, chaosArray, eradicator;
+    public static @EntityDef({Unitc.class, Legsc.class}) UnitType titan, dagger, crawler, fortress, eruptor, chaosArray, eradicator, alpha;
 
     //air
     public static @EntityDef({Unitc.class}) UnitType wraith, reaper, ghoul, revenant, lich;
@@ -262,6 +264,39 @@ public class UnitTypes implements ContentList{
             engineOffset = 6.5f;
             hitsize = 8f;
         }};
+
+        alpha = new UnitType("alpha"){{
+            drillTier = -1;
+            speed = 0.6f;
+            hitsize = 9f;
+            mass = 1.75f;
+            boostMultiplier = 2f;
+            itemCapacity = 15;
+            mass = 0.9f;
+            health = 160f;
+            buildSpeed = 0.9f;
+            canBoost = true;
+
+            weapons.add(new Weapon("shockgun"){{
+                shake = 2f;
+                shootY = 1f;
+                x = 1f;
+                shootX = 3f;
+                reload = 70f;
+                alternate = true;
+                recoil = 4f;
+                shootSound = Sounds.laser;
+
+                bullet = new LaserBulletType(){{
+                    damage = 20f;
+                    recoil = 1f;
+                    sideAngle = 45f;
+                    sideWidth = 1f;
+                    sideLength = 70f;
+                    colors = new Color[]{Pal.heal.cpy().a(0.4f), Pal.heal, Color.white};
+                }};
+            }});
+        }};
         
         /*
 
@@ -480,7 +515,7 @@ public class UnitTypes implements ContentList{
             }
         };
 
-        alpha = new UnitType("alpha-mech", false){
+        "alpha "= new UnitType("alpha-mech", false){
             {
                 drillTier = -1;
                 speed = 0.5f;
diff --git a/core/src/mindustry/entities/def/BoundedComp.java b/core/src/mindustry/entities/comp/BoundedComp.java
similarity index 97%
rename from core/src/mindustry/entities/def/BoundedComp.java
rename to core/src/mindustry/entities/comp/BoundedComp.java
index 47a85ef52f..c266ae3e51 100644
--- a/core/src/mindustry/entities/def/BoundedComp.java
+++ b/core/src/mindustry/entities/comp/BoundedComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.math.geom.*;
diff --git a/core/src/mindustry/entities/def/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
similarity index 99%
rename from core/src/mindustry/entities/def/BuilderComp.java
rename to core/src/mindustry/entities/comp/BuilderComp.java
index 5bd467ef97..e939794b17 100644
--- a/core/src/mindustry/entities/def/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.*;
 import arc.graphics.g2d.*;
diff --git a/core/src/mindustry/entities/def/BulletComp.java b/core/src/mindustry/entities/comp/BulletComp.java
similarity index 99%
rename from core/src/mindustry/entities/def/BulletComp.java
rename to core/src/mindustry/entities/comp/BulletComp.java
index f2f7ffacfc..14b8075146 100644
--- a/core/src/mindustry/entities/def/BulletComp.java
+++ b/core/src/mindustry/entities/comp/BulletComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.func.*;
 import arc.graphics.g2d.*;
diff --git a/core/src/mindustry/entities/def/ChildComp.java b/core/src/mindustry/entities/comp/ChildComp.java
similarity index 94%
rename from core/src/mindustry/entities/def/ChildComp.java
rename to core/src/mindustry/entities/comp/ChildComp.java
index 08d866ab94..be8fafb0aa 100644
--- a/core/src/mindustry/entities/def/ChildComp.java
+++ b/core/src/mindustry/entities/comp/ChildComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.util.ArcAnnotate.*;
 import mindustry.annotations.Annotations.*;
diff --git a/core/src/mindustry/entities/def/CommanderComp.java b/core/src/mindustry/entities/comp/CommanderComp.java
similarity index 98%
rename from core/src/mindustry/entities/def/CommanderComp.java
rename to core/src/mindustry/entities/comp/CommanderComp.java
index 2fa10cad4c..94c4c8dfb2 100644
--- a/core/src/mindustry/entities/def/CommanderComp.java
+++ b/core/src/mindustry/entities/comp/CommanderComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.struct.*;
 import arc.util.ArcAnnotate.*;
diff --git a/core/src/mindustry/entities/def/DamageComp.java b/core/src/mindustry/entities/comp/DamageComp.java
similarity index 77%
rename from core/src/mindustry/entities/def/DamageComp.java
rename to core/src/mindustry/entities/comp/DamageComp.java
index 2ace4db324..e46a7ec87c 100644
--- a/core/src/mindustry/entities/def/DamageComp.java
+++ b/core/src/mindustry/entities/comp/DamageComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 
diff --git a/core/src/mindustry/entities/def/DecalComp.java b/core/src/mindustry/entities/comp/DecalComp.java
similarity index 95%
rename from core/src/mindustry/entities/def/DecalComp.java
rename to core/src/mindustry/entities/comp/DecalComp.java
index 1b60bc5905..f1e6e21bc1 100644
--- a/core/src/mindustry/entities/def/DecalComp.java
+++ b/core/src/mindustry/entities/comp/DecalComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.graphics.*;
 import arc.graphics.g2d.*;
diff --git a/core/src/mindustry/entities/def/DrawComp.java b/core/src/mindustry/entities/comp/DrawComp.java
similarity index 86%
rename from core/src/mindustry/entities/def/DrawComp.java
rename to core/src/mindustry/entities/comp/DrawComp.java
index 6970c933c7..1bfc840717 100644
--- a/core/src/mindustry/entities/def/DrawComp.java
+++ b/core/src/mindustry/entities/comp/DrawComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
diff --git a/core/src/mindustry/entities/def/EffectComp.java b/core/src/mindustry/entities/comp/EffectComp.java
similarity index 94%
rename from core/src/mindustry/entities/def/EffectComp.java
rename to core/src/mindustry/entities/comp/EffectComp.java
index df35658b1a..7ccd477596 100644
--- a/core/src/mindustry/entities/def/EffectComp.java
+++ b/core/src/mindustry/entities/comp/EffectComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.graphics.*;
 import mindustry.annotations.Annotations.*;
diff --git a/core/src/mindustry/entities/def/ElevationMoveComp.java b/core/src/mindustry/entities/comp/ElevationMoveComp.java
similarity index 92%
rename from core/src/mindustry/entities/def/ElevationMoveComp.java
rename to core/src/mindustry/entities/comp/ElevationMoveComp.java
index c0f4c48b8d..6e8b30a1cb 100644
--- a/core/src/mindustry/entities/def/ElevationMoveComp.java
+++ b/core/src/mindustry/entities/comp/ElevationMoveComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
diff --git a/core/src/mindustry/entities/def/EntityComp.java b/core/src/mindustry/entities/comp/EntityComp.java
similarity index 97%
rename from core/src/mindustry/entities/def/EntityComp.java
rename to core/src/mindustry/entities/comp/EntityComp.java
index 0ba8fc13df..0ae1732e87 100644
--- a/core/src/mindustry/entities/def/EntityComp.java
+++ b/core/src/mindustry/entities/comp/EntityComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.func.*;
 import arc.util.io.*;
diff --git a/core/src/mindustry/entities/def/FireComp.java b/core/src/mindustry/entities/comp/FireComp.java
similarity index 98%
rename from core/src/mindustry/entities/def/FireComp.java
rename to core/src/mindustry/entities/comp/FireComp.java
index 6660b7bf43..eeaaf41218 100644
--- a/core/src/mindustry/entities/def/FireComp.java
+++ b/core/src/mindustry/entities/comp/FireComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.math.geom.*;
diff --git a/core/src/mindustry/entities/def/FlyingComp.java b/core/src/mindustry/entities/comp/FlyingComp.java
similarity index 83%
rename from core/src/mindustry/entities/def/FlyingComp.java
rename to core/src/mindustry/entities/comp/FlyingComp.java
index 0ca6b54b03..15b7ee1429 100644
--- a/core/src/mindustry/entities/def/FlyingComp.java
+++ b/core/src/mindustry/entities/comp/FlyingComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.math.geom.*;
@@ -14,10 +14,11 @@ import static mindustry.Vars.net;
 abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
     private static final Vec2 tmp1 = new Vec2(), tmp2 = new Vec2();
 
-    @Import float x, y, drag;
+    @Import float x, y;
     @Import Vec2 vel;
 
     float elevation;
+    private transient boolean wasFlying;
     transient float drownTime;
     transient float splashTimer;
 
@@ -26,13 +27,17 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
     }
 
     boolean isFlying(){
-        return elevation >= 0.001f;
+        return elevation >= 0.09f;
     }
 
     boolean canDrown(){
         return isGrounded();
     }
 
+    void landed(){
+
+    }
+
     void wobble(){
         x += Mathf.sin(Time.time() + id() * 99, 25f, 0.05f) * Time.delta() * elevation;
         y += Mathf.cos(Time.time() + id() * 99, 25f, 0.05f) * Time.delta() * elevation;
@@ -53,6 +58,16 @@ abstract class FlyingComp implements Posc, Velc, Healthc, Hitboxc{
     public void update(){
         Floor floor = floorOn();
 
+        if(isFlying() != wasFlying){
+            if(wasFlying){
+                if(tileOn() != null){
+                    Fx.unitLand.at(x, y, floorOn().isLiquid ? 1f : 0.5f, floorOn().mapColor);
+                }
+            }
+
+            wasFlying = isFlying();
+        }
+
         if(isGrounded() && floor.isLiquid){
             if((splashTimer += Mathf.dst(deltaX(), deltaY())) >= 7f){
                 floor.walkEffect.at(x, y, 0, floor.mapColor);
diff --git a/core/src/mindustry/entities/def/HealthComp.java b/core/src/mindustry/entities/comp/HealthComp.java
similarity index 97%
rename from core/src/mindustry/entities/def/HealthComp.java
rename to core/src/mindustry/entities/comp/HealthComp.java
index 3499245711..857abea319 100644
--- a/core/src/mindustry/entities/def/HealthComp.java
+++ b/core/src/mindustry/entities/comp/HealthComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.util.*;
diff --git a/core/src/mindustry/entities/def/HitboxComp.java b/core/src/mindustry/entities/comp/HitboxComp.java
similarity index 97%
rename from core/src/mindustry/entities/def/HitboxComp.java
rename to core/src/mindustry/entities/comp/HitboxComp.java
index 500e98198e..95fd21ce2e 100644
--- a/core/src/mindustry/entities/def/HitboxComp.java
+++ b/core/src/mindustry/entities/comp/HitboxComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.func.*;
 import arc.math.geom.QuadTree.*;
diff --git a/core/src/mindustry/entities/def/ItemsComp.java b/core/src/mindustry/entities/comp/ItemsComp.java
similarity index 97%
rename from core/src/mindustry/entities/def/ItemsComp.java
rename to core/src/mindustry/entities/comp/ItemsComp.java
index 83a51eebd8..55a55fd20e 100644
--- a/core/src/mindustry/entities/def/ItemsComp.java
+++ b/core/src/mindustry/entities/comp/ItemsComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.*;
 import mindustry.annotations.Annotations.*;
diff --git a/core/src/mindustry/entities/def/LegsComp.java b/core/src/mindustry/entities/comp/LegsComp.java
similarity index 94%
rename from core/src/mindustry/entities/def/LegsComp.java
rename to core/src/mindustry/entities/comp/LegsComp.java
index e73b44dcef..e4dc746371 100644
--- a/core/src/mindustry/entities/def/LegsComp.java
+++ b/core/src/mindustry/entities/comp/LegsComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.util.*;
diff --git a/core/src/mindustry/entities/def/MinerComp.java b/core/src/mindustry/entities/comp/MinerComp.java
similarity index 99%
rename from core/src/mindustry/entities/def/MinerComp.java
rename to core/src/mindustry/entities/comp/MinerComp.java
index bf485ded2f..dff81a95a1 100644
--- a/core/src/mindustry/entities/def/MinerComp.java
+++ b/core/src/mindustry/entities/comp/MinerComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.*;
 import arc.graphics.*;
diff --git a/core/src/mindustry/entities/def/OwnerComp.java b/core/src/mindustry/entities/comp/OwnerComp.java
similarity index 78%
rename from core/src/mindustry/entities/def/OwnerComp.java
rename to core/src/mindustry/entities/comp/OwnerComp.java
index e5e1f9d5ae..fa71323913 100644
--- a/core/src/mindustry/entities/def/OwnerComp.java
+++ b/core/src/mindustry/entities/comp/OwnerComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
diff --git a/core/src/mindustry/entities/def/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
similarity index 90%
rename from core/src/mindustry/entities/def/PayloadComp.java
rename to core/src/mindustry/entities/comp/PayloadComp.java
index a0a41df5a0..1c0f08b6b6 100644
--- a/core/src/mindustry/entities/def/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.util.ArcAnnotate.*;
 import mindustry.annotations.Annotations.*;
diff --git a/core/src/mindustry/entities/def/PhysicsComp.java b/core/src/mindustry/entities/comp/PhysicsComp.java
similarity index 93%
rename from core/src/mindustry/entities/def/PhysicsComp.java
rename to core/src/mindustry/entities/comp/PhysicsComp.java
index 97ba374fab..a2c44116c8 100644
--- a/core/src/mindustry/entities/def/PhysicsComp.java
+++ b/core/src/mindustry/entities/comp/PhysicsComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.async.PhysicsProcess.*;
diff --git a/core/src/mindustry/entities/def/PlayerComp.java b/core/src/mindustry/entities/comp/PlayerComp.java
similarity index 99%
rename from core/src/mindustry/entities/def/PlayerComp.java
rename to core/src/mindustry/entities/comp/PlayerComp.java
index 9371966112..b3e8cd530e 100644
--- a/core/src/mindustry/entities/def/PlayerComp.java
+++ b/core/src/mindustry/entities/comp/PlayerComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.*;
 import arc.graphics.*;
diff --git a/core/src/mindustry/entities/def/PosComp.java b/core/src/mindustry/entities/comp/PosComp.java
similarity index 97%
rename from core/src/mindustry/entities/def/PosComp.java
rename to core/src/mindustry/entities/comp/PosComp.java
index b4eec935fb..2822c72021 100644
--- a/core/src/mindustry/entities/def/PosComp.java
+++ b/core/src/mindustry/entities/comp/PosComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.geom.*;
 import arc.util.ArcAnnotate.*;
diff --git a/core/src/mindustry/entities/def/PuddleComp.java b/core/src/mindustry/entities/comp/PuddleComp.java
similarity index 99%
rename from core/src/mindustry/entities/def/PuddleComp.java
rename to core/src/mindustry/entities/comp/PuddleComp.java
index 3d40e68671..0bfe15237e 100644
--- a/core/src/mindustry/entities/def/PuddleComp.java
+++ b/core/src/mindustry/entities/comp/PuddleComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.graphics.*;
 import arc.graphics.g2d.*;
diff --git a/core/src/mindustry/entities/def/RotComp.java b/core/src/mindustry/entities/comp/RotComp.java
similarity index 90%
rename from core/src/mindustry/entities/def/RotComp.java
rename to core/src/mindustry/entities/comp/RotComp.java
index 8740b78935..548db46730 100644
--- a/core/src/mindustry/entities/def/RotComp.java
+++ b/core/src/mindustry/entities/comp/RotComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
diff --git a/core/src/mindustry/entities/def/ShieldComp.java b/core/src/mindustry/entities/comp/ShieldComp.java
similarity index 97%
rename from core/src/mindustry/entities/def/ShieldComp.java
rename to core/src/mindustry/entities/comp/ShieldComp.java
index eb081c2a72..991e9eb4d7 100644
--- a/core/src/mindustry/entities/def/ShieldComp.java
+++ b/core/src/mindustry/entities/comp/ShieldComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
diff --git a/core/src/mindustry/entities/def/ShielderComp.java b/core/src/mindustry/entities/comp/ShielderComp.java
similarity index 83%
rename from core/src/mindustry/entities/def/ShielderComp.java
rename to core/src/mindustry/entities/comp/ShielderComp.java
index 86a038d9fb..020f556127 100644
--- a/core/src/mindustry/entities/def/ShielderComp.java
+++ b/core/src/mindustry/entities/comp/ShielderComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
diff --git a/core/src/mindustry/entities/def/StatusComp.java b/core/src/mindustry/entities/comp/StatusComp.java
similarity index 99%
rename from core/src/mindustry/entities/def/StatusComp.java
rename to core/src/mindustry/entities/comp/StatusComp.java
index da14ceb039..5f3964d6d1 100644
--- a/core/src/mindustry/entities/def/StatusComp.java
+++ b/core/src/mindustry/entities/comp/StatusComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.graphics.*;
 import arc.math.*;
diff --git a/core/src/mindustry/entities/def/SyncComp.java b/core/src/mindustry/entities/comp/SyncComp.java
similarity index 96%
rename from core/src/mindustry/entities/def/SyncComp.java
rename to core/src/mindustry/entities/comp/SyncComp.java
index cc88886d06..0e36ebd682 100644
--- a/core/src/mindustry/entities/def/SyncComp.java
+++ b/core/src/mindustry/entities/comp/SyncComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.*;
 import mindustry.annotations.Annotations.*;
diff --git a/core/src/mindustry/entities/def/TeamComp.java b/core/src/mindustry/entities/comp/TeamComp.java
similarity index 93%
rename from core/src/mindustry/entities/def/TeamComp.java
rename to core/src/mindustry/entities/comp/TeamComp.java
index 3ad28ff669..393b6158da 100644
--- a/core/src/mindustry/entities/def/TeamComp.java
+++ b/core/src/mindustry/entities/comp/TeamComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.util.ArcAnnotate.*;
 import mindustry.annotations.Annotations.*;
diff --git a/core/src/mindustry/entities/def/TileComp.java b/core/src/mindustry/entities/comp/TileComp.java
similarity index 99%
rename from core/src/mindustry/entities/def/TileComp.java
rename to core/src/mindustry/entities/comp/TileComp.java
index 2830d818aa..bbf4b3910a 100644
--- a/core/src/mindustry/entities/def/TileComp.java
+++ b/core/src/mindustry/entities/comp/TileComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.*;
 import arc.Graphics.*;
diff --git a/core/src/mindustry/entities/def/TimedComp.java b/core/src/mindustry/entities/comp/TimedComp.java
similarity index 94%
rename from core/src/mindustry/entities/def/TimedComp.java
rename to core/src/mindustry/entities/comp/TimedComp.java
index f3b5f97317..15dbb737d6 100644
--- a/core/src/mindustry/entities/def/TimedComp.java
+++ b/core/src/mindustry/entities/comp/TimedComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.util.*;
diff --git a/core/src/mindustry/entities/def/TimerComp.java b/core/src/mindustry/entities/comp/TimerComp.java
similarity index 87%
rename from core/src/mindustry/entities/def/TimerComp.java
rename to core/src/mindustry/entities/comp/TimerComp.java
index a23e8e09ac..b17c84a150 100644
--- a/core/src/mindustry/entities/def/TimerComp.java
+++ b/core/src/mindustry/entities/comp/TimerComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
diff --git a/core/src/mindustry/entities/def/TrailComp.java b/core/src/mindustry/entities/comp/TrailComp.java
similarity index 82%
rename from core/src/mindustry/entities/def/TrailComp.java
rename to core/src/mindustry/entities/comp/TrailComp.java
index d1a16970e1..7ef07d03a2 100644
--- a/core/src/mindustry/entities/def/TrailComp.java
+++ b/core/src/mindustry/entities/comp/TrailComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.graphics.*;
diff --git a/core/src/mindustry/entities/def/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
similarity index 95%
rename from core/src/mindustry/entities/def/UnitComp.java
rename to core/src/mindustry/entities/comp/UnitComp.java
index 00104c457e..5f5a891dba 100644
--- a/core/src/mindustry/entities/def/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.*;
 import arc.math.*;
@@ -125,8 +125,19 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         teamIndex.updateCount(team(), -1);
     }
 
+    @Override
+    public void landed(){
+        if(type.landShake > 0f){
+            Effects.shake(type.landShake, type.landShake, this);
+        }
+
+        type.landed(this);
+    }
+
     @Override
     public void update(){
+        type.update(this);
+
         drag(type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f));
 
         //apply knockback based on spawns
diff --git a/core/src/mindustry/entities/def/VelComp.java b/core/src/mindustry/entities/comp/VelComp.java
similarity index 95%
rename from core/src/mindustry/entities/def/VelComp.java
rename to core/src/mindustry/entities/comp/VelComp.java
index 475fb8b04e..583f2331f5 100644
--- a/core/src/mindustry/entities/def/VelComp.java
+++ b/core/src/mindustry/entities/comp/VelComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.geom.*;
 import arc.util.*;
diff --git a/core/src/mindustry/entities/def/WaterMoveComp.java b/core/src/mindustry/entities/comp/WaterMoveComp.java
similarity index 96%
rename from core/src/mindustry/entities/def/WaterMoveComp.java
rename to core/src/mindustry/entities/comp/WaterMoveComp.java
index 6913debd53..07c607f6ab 100644
--- a/core/src/mindustry/entities/def/WaterMoveComp.java
+++ b/core/src/mindustry/entities/comp/WaterMoveComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
diff --git a/core/src/mindustry/entities/def/WeaponsComp.java b/core/src/mindustry/entities/comp/WeaponsComp.java
similarity index 99%
rename from core/src/mindustry/entities/def/WeaponsComp.java
rename to core/src/mindustry/entities/comp/WeaponsComp.java
index a2555094c4..427439e8ba 100644
--- a/core/src/mindustry/entities/def/WeaponsComp.java
+++ b/core/src/mindustry/entities/comp/WeaponsComp.java
@@ -1,4 +1,4 @@
-package mindustry.entities.def;
+package mindustry.entities.comp;
 
 import arc.math.*;
 import arc.math.geom.*;
diff --git a/core/src/mindustry/input/DesktopInput.java b/core/src/mindustry/input/DesktopInput.java
index df9ced7d8a..2a544edd67 100644
--- a/core/src/mindustry/input/DesktopInput.java
+++ b/core/src/mindustry/input/DesktopInput.java
@@ -45,7 +45,7 @@ public class DesktopInput extends InputHandler{
     /** Selected build request for movement. */
     private @Nullable BuildRequest sreq;
     /** Whether player is currently deleting removal requests. */
-    private boolean deleting = false;
+    private boolean deleting = false, shouldShoot = false;
 
     @Override
     public void buildUI(Group group){
@@ -186,11 +186,14 @@ public class DesktopInput extends InputHandler{
             Core.camera.position.lerpDelta(player, 0.08f);
         }
 
+        shouldShoot = true;
+
         if(!scene.hasMouse()){
             if(Core.input.keyDown(Binding.control) && Core.input.keyTap(Binding.select)){
                 Unitc on = selectedUnit();
                 if(on != null){
                     Call.onUnitControl(player, on);
+                    shouldShoot = false;
                 }
             }
 
@@ -454,10 +457,10 @@ public class DesktopInput extends InputHandler{
                 //only begin shooting if there's no cursor event
                 if(!tileTapped(selected.entity) && !tryTapPlayer(Core.input.mouseWorld().x, Core.input.mouseWorld().y) && (player.builder().requests().size == 0 || !player.builder().isBuilding()) && !droppingItem &&
                 !tryBeginMine(selected) && player.miner().mineTile() == null && !Core.scene.hasKeyboard()){
-                    isShooting = true;
+                    isShooting = shouldShoot;
                 }
             }else if(!Core.scene.hasKeyboard()){ //if it's out of bounds, shooting is just fine
-                isShooting = true;
+                isShooting = shouldShoot;
             }
         }else if(Core.input.keyTap(Binding.deselect) && isPlacing()){
             block = null;
@@ -558,7 +561,7 @@ public class DesktopInput extends InputHandler{
     protected void updateMovement(Unitc unit){
         boolean omni = !(unit instanceof WaterMovec);
         boolean legs = unit.isGrounded();
-        float speed = unit.type().speed;
+        float speed = unit.type().speed * Mathf.lerp(1f, unit.type().canBoost ? unit.type().boostMultiplier : 1f, unit.elevation());
         float xa = Core.input.axis(Binding.move_x);
         float ya = Core.input.axis(Binding.move_y);
 
@@ -590,5 +593,13 @@ public class DesktopInput extends InputHandler{
         unit.aim(unit.type().faceTarget ? Core.input.mouseWorld() : Tmp.v1.trns(unit.rotation(), Core.input.mouseWorld().dst(unit)).add(unit.x(), unit.y()));
 
         unit.controlWeapons(true, isShooting);
+
+        isBoosting = Core.input.keyDown(Binding.boost);
+
+        if(unit.type().canBoost){
+            Tile tile = unit.tileOn();
+
+            unit.elevation(Mathf.approachDelta(unit.elevation(), (tile != null && tile.solid()) || (isBoosting && !movement.isZero()) ? 1f : 0f, 0.08f));
+        }
     }
 }
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index 80b71f2cc4..410de92f4c 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -55,7 +55,7 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     public int rotation;
     public boolean droppingItem;
     public Group uiGroup;
-    public boolean isShooting, isBuilding = true, buildWasAutoPaused = false;
+    public boolean isShooting, isBuilding = true, buildWasAutoPaused = false, isBoosting = false;
     public @Nullable UnitType controlledType;
 
     protected @Nullable Schematic lastSchematic;
diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java
index 4026f62bda..f0d9cb381f 100644
--- a/core/src/mindustry/type/UnitType.java
+++ b/core/src/mindustry/type/UnitType.java
@@ -9,8 +9,8 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
-import arc.util.ArcAnnotate.*;
 import arc.util.*;
+import arc.util.ArcAnnotate.*;
 import mindustry.ai.types.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.ctype.*;
@@ -30,11 +30,12 @@ public class UnitType extends UnlockableContent{
     public boolean flying;
     public @NonNull Prov<? extends Unitc> constructor;
     public @NonNull Prov<? extends UnitController> defaultController = () -> !flying ? new GroundAI() : new FlyingAI();
-    public float speed = 1.1f, boostSpeed = 0.75f, rotateSpeed = 5f, baseRotateSpeed = 5f;
-    public float drag = 0.3f, mass = 1f, accel = 0.5f;
+    public float speed = 1.1f, boostMultiplier = 1f, rotateSpeed = 5f, baseRotateSpeed = 5f;
+    public float drag = 0.3f, mass = 1f, accel = 0.5f, landShake = 0f;
     public float health = 200f, range = -1;
     public boolean targetAir = true, targetGround = true;
     public boolean faceTarget = true, isCounted = true, lowAltitude = false;
+    public boolean canBoost = false;
     public float sway = 1f;
 
     public int itemCapacity = 30;
@@ -54,7 +55,7 @@ public class UnitType extends UnlockableContent{
     public Sound deathSound = Sounds.bang;
 
     public Array<Weapon> weapons = new Array<>();
-    public TextureRegion baseRegion, legRegion, region, cellRegion, occlusionRegion;
+    public TextureRegion baseRegion, legRegion, region, shadowRegion, cellRegion, occlusionRegion;
 
     public UnitType(String name){
         super(name);
@@ -83,6 +84,10 @@ public class UnitType extends UnlockableContent{
         return weapons.size > 0;
     }
 
+    public void update(Unitc unit){}
+
+    public void landed(Unitc unit){}
+
     @Override
     public void displayInfo(Table table){
         ContentDisplay.displayUnit(table, this);
@@ -108,6 +113,7 @@ public class UnitType extends UnlockableContent{
         baseRegion = Core.atlas.find(name + "-base");
         cellRegion = Core.atlas.find(name + "-cell", Core.atlas.find("power-cell"));
         occlusionRegion = Core.atlas.find("circle-shadow");
+        shadowRegion = icon(Cicon.full);
     }
 
     @Override
@@ -119,25 +125,24 @@ public class UnitType extends UnlockableContent{
 
     public void draw(Unitc unit){
         Legsc legs = unit instanceof Legsc ? (Legsc)unit : null;
+        float z = unit.elevation() > 0.5f ? (lowAltitude ? Layer.flyingUnitLow : Layer.flyingUnit) : Layer.groundUnit;
 
         if(unit.controller().isBeingControlled(player.unit())){
             drawControl(unit);
         }
 
         if(unit.isFlying()){
-            Draw.z(Layer.darkness);
+            Draw.z(Math.min(Layer.darkness, z - 1f));
             drawShadow(unit);
         }
 
-        float z = unit.elevation() > 0.5f ? (lowAltitude ? Layer.flyingUnitLow : Layer.flyingUnit) : Layer.groundUnit;
-
         Draw.z(z - 0.02f);
 
         if(legs != null){
             drawLegs(legs);
 
             float ft = Mathf.sin(legs.walkTime(), 3f, 3f);
-            legOffset.trns(legs.baseRotation(), 0f, ft * 0.18f * sway);
+            legOffset.trns(legs.baseRotation(), 0f, Mathf.lerp(ft * 0.18f * sway, 0f, unit.elevation()));
             unit.trns(legOffset.x, legOffset.y);
         }
 
@@ -178,7 +183,7 @@ public class UnitType extends UnlockableContent{
 
     public void drawShadow(Unitc unit){
         Draw.color(shadowColor);
-        Draw.rect(region, unit.x() + shadowTX * unit.elevation(), unit.y() + shadowTY * unit.elevation(), unit.rotation() - 90);
+        Draw.rect(shadowRegion, unit.x() + shadowTX * unit.elevation(), unit.y() + shadowTY * unit.elevation(), unit.rotation() - 90);
         Draw.color();
     }
 
@@ -226,26 +231,29 @@ public class UnitType extends UnlockableContent{
     public void drawEngine(Unitc unit){
         if(!unit.isFlying()) return;
 
+        float scale = unit.elevation();
+        float offset = engineOffset/2f + engineOffset/2f*scale;
+
         if(unit instanceof Trailc){
             Trail trail = ((Trailc)unit).trail();
 
-            float cx = unit.x() + Angles.trnsx(unit.rotation() + 180, engineOffset),
-            cy = unit.y() + Angles.trnsy(unit.rotation() + 180, engineOffset);
+            float cx = unit.x() + Angles.trnsx(unit.rotation() + 180, offset),
+            cy = unit.y() + Angles.trnsy(unit.rotation() + 180, offset);
             trail.update(cx, cy);
-            trail.draw(unit.team().color, (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f) * unit.elevation()));
+            trail.draw(unit.team().color, (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f) * scale));
         }
 
         Draw.color(unit.team().color);
         Fill.circle(
-            unit.x() + Angles.trnsx(unit.rotation() + 180, engineOffset),
-            unit.y() + Angles.trnsy(unit.rotation() + 180, engineOffset),
-            (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f) * unit.elevation())
+            unit.x() + Angles.trnsx(unit.rotation() + 180, offset),
+            unit.y() + Angles.trnsy(unit.rotation() + 180, offset),
+            (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) * scale
         );
         Draw.color(Color.white);
         Fill.circle(
-            unit.x() + Angles.trnsx(unit.rotation() + 180, engineOffset - 1f),
-            unit.y() + Angles.trnsy(unit.rotation() + 180, engineOffset - 1f),
-            (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f  * unit.elevation()
+            unit.x() + Angles.trnsx(unit.rotation() + 180, offset - 1f),
+            unit.y() + Angles.trnsy(unit.rotation() + 180, offset - 1f),
+            (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f  * scale
         );
         Draw.color();
     }
@@ -305,8 +313,10 @@ public class UnitType extends UnlockableContent{
 
         Draw.mixcol(Color.white, unit.hitTime());
 
-        float sin = Mathf.sin(unit.walkTime(), 3f, 1f);
+        float e = unit.elevation();
+        float sin = Mathf.lerp(Mathf.sin(unit.walkTime(), 3f, 1f), 0f, e);
         float ft = sin*(2.5f + (unit.hitSize()-8f)/2f);
+        float boostTrns = e * 2f;
 
         Floor floor = unit.floorOn();
 
@@ -317,11 +327,11 @@ public class UnitType extends UnlockableContent{
         for(int i : Mathf.signs){
             //Draw.mixcol(Color.valueOf("989aa4"), Math.max(sin * i, 0));
             Draw.rect(legRegion,
-            unit.x() + Angles.trnsx(unit.baseRotation(), ft * i),
-            unit.y() + Angles.trnsy(unit.baseRotation(), ft * i),
+            unit.x() + Angles.trnsx(unit.baseRotation(), ft * i - boostTrns, -boostTrns*i),
+            unit.y() + Angles.trnsy(unit.baseRotation(), ft * i - boostTrns, -boostTrns*i),
             legRegion.getWidth() * i * Draw.scl,
             legRegion.getHeight() * Draw.scl - Math.max(-sin * i, 0) * legRegion.getHeight() * 0.5f * Draw.scl,
-            unit.baseRotation() - 90);
+            unit.baseRotation() - 90 + 35f*i*e);
         }
         //Draw.mixcol();