diff --git a/core/assets-raw/sprites/blocks/defense/force-projector-top.png b/core/assets-raw/sprites/blocks/defense/force-projector-top.png
index ef835d34e6..3890d89025 100644
Binary files a/core/assets-raw/sprites/blocks/defense/force-projector-top.png and b/core/assets-raw/sprites/blocks/defense/force-projector-top.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/force-projector.png b/core/assets-raw/sprites/blocks/defense/force-projector.png
index 9c54cfe032..1075da7378 100644
Binary files a/core/assets-raw/sprites/blocks/defense/force-projector.png and b/core/assets-raw/sprites/blocks/defense/force-projector.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png b/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png
index 76e7676888..9da22c1a84 100644
Binary files a/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png and b/core/assets-raw/sprites/blocks/defense/overdrive-projector-top.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/overdrive-projector.png b/core/assets-raw/sprites/blocks/defense/overdrive-projector.png
index 6634742a1b..3a808300f5 100644
Binary files a/core/assets-raw/sprites/blocks/defense/overdrive-projector.png and b/core/assets-raw/sprites/blocks/defense/overdrive-projector.png differ
diff --git a/core/assets-raw/sprites/blocks/defense/shock-mine.png b/core/assets-raw/sprites/blocks/defense/shock-mine.png
index af4ce4542b..1bbf64d1da 100644
Binary files a/core/assets-raw/sprites/blocks/defense/shock-mine.png and b/core/assets-raw/sprites/blocks/defense/shock-mine.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-round-4.png b/core/assets-raw/sprites/blocks/extra/shadow-round-4.png
index 428a060ff7..2d9ddf0d3d 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-round-4.png and b/core/assets-raw/sprites/blocks/extra/shadow-round-4.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-shock-mine.png b/core/assets-raw/sprites/blocks/extra/shadow-shock-mine.png
index 86c61ecefb..fed06b8960 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-shock-mine.png and b/core/assets-raw/sprites/blocks/extra/shadow-shock-mine.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png
index 225663a2ee..4a2f7fb61f 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png
index 8465ed415d..2dfdcba3a0 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png
index 6331c56195..0919ee1fb9 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png
index d3d703fec8..feab88d240 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png
index ad50ff08af..99a4199802 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png
index aed29c054f..004959c5df 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png
index f853e0b116..ad65e04ad2 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png
index 042005c44f..637a38ab9c 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png
index 18497fa8ea..98cb3e39f6 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png
index fa239fc96a..35e2236735 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png
index 5235f6bafc..035dde1e32 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png
index 1cdef7f381..61791af364 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png
index ae2d829973..9198c3703a 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png
index b8920b9f72..7755bf244c 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png
index cf234e5565..00a4a503c3 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png
index 7e92b46514..d1a2a244c8 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png
index 0917670444..8a8549093d 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png
index 19456307cf..43f474b93b 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png
index 47a48567ae..72cd323b46 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png differ
diff --git a/core/assets-raw/sprites/blocks/power/battery-large.png b/core/assets-raw/sprites/blocks/power/battery-large.png
index 74bce7fc54..e140bf1bd0 100644
Binary files a/core/assets-raw/sprites/blocks/power/battery-large.png and b/core/assets-raw/sprites/blocks/power/battery-large.png differ
diff --git a/core/assets-raw/sprites/blocks/power/powerinfinite.png b/core/assets-raw/sprites/blocks/power/powerinfinite.png
index 836a02813a..5a14712e46 100644
Binary files a/core/assets-raw/sprites/blocks/power/powerinfinite.png and b/core/assets-raw/sprites/blocks/power/powerinfinite.png differ
diff --git a/core/assets-raw/sprites/blocks/power/powervoid.png b/core/assets-raw/sprites/blocks/power/powervoid.png
index 3aaed1ab1c..5634353f59 100644
Binary files a/core/assets-raw/sprites/blocks/power/powervoid.png and b/core/assets-raw/sprites/blocks/power/powervoid.png differ
diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator.png b/core/assets-raw/sprites/blocks/power/rtg-generator.png
index 2ef3cf9a29..e68303af1d 100644
Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator.png and b/core/assets-raw/sprites/blocks/power/rtg-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png b/core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png
index ede276c846..527f3abd7e 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png
index 58d8febc7b..29c4990489 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png
index db5a2756e5..8cb4340f9e 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png and b/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/arc.png b/core/assets-raw/sprites/blocks/turrets/turrets/arc.png
index e173d301f6..c41a9b2a80 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/arc.png and b/core/assets-raw/sprites/blocks/turrets/turrets/arc.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown-heat.png
index 15fdf42e1f..a66d7c4ee5 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown-heat.png and b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png
index 81a8c456e2..6444f9a941 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png and b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/spectre.png b/core/assets-raw/sprites/blocks/turrets/turrets/spectre.png
index cfaf95e1e5..18c1b7e7da 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/spectre.png and b/core/assets-raw/sprites/blocks/turrets/turrets/spectre.png differ
diff --git a/core/assets-raw/sprites/blocks/units/fortress-factory.png b/core/assets-raw/sprites/blocks/units/fortress-factory.png
index 2897ec646c..716fd0a9cf 100644
Binary files a/core/assets-raw/sprites/blocks/units/fortress-factory.png and b/core/assets-raw/sprites/blocks/units/fortress-factory.png differ
diff --git a/core/assets-raw/sprites/blocks/units/repair-point-turret.png b/core/assets-raw/sprites/blocks/units/repair-point-turret.png
index 2ee450d037..b01b4bde05 100644
Binary files a/core/assets-raw/sprites/blocks/units/repair-point-turret.png and b/core/assets-raw/sprites/blocks/units/repair-point-turret.png differ
diff --git a/core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png b/core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png
index 9a58a6ea99..570f92dc80 100644
Binary files a/core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png and b/core/assets-raw/sprites/blocks/units/revenant-factory-top-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/revenant-factory-top.png b/core/assets-raw/sprites/blocks/units/revenant-factory-top.png
index c19aea12ab..e0940d5486 100644
Binary files a/core/assets-raw/sprites/blocks/units/revenant-factory-top.png and b/core/assets-raw/sprites/blocks/units/revenant-factory-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/revenant-factory.png b/core/assets-raw/sprites/blocks/units/revenant-factory.png
index ea347cc36f..3388b2cc76 100644
Binary files a/core/assets-raw/sprites/blocks/units/revenant-factory.png and b/core/assets-raw/sprites/blocks/units/revenant-factory.png differ
diff --git a/core/assets-raw/sprites/effects/bullet-back.png b/core/assets-raw/sprites/effects/bullet-back.png
index 6ea1da16fb..48429567b6 100644
Binary files a/core/assets-raw/sprites/effects/bullet-back.png and b/core/assets-raw/sprites/effects/bullet-back.png differ
diff --git a/core/assets-raw/sprites/effects/bullet.png b/core/assets-raw/sprites/effects/bullet.png
index 3615b601ee..ca12da1af9 100644
Binary files a/core/assets-raw/sprites/effects/bullet.png and b/core/assets-raw/sprites/effects/bullet.png differ
diff --git a/core/assets-raw/sprites/effects/command-patrol.png b/core/assets-raw/sprites/effects/command-patrol.png
index fa099ea4b9..acf89f181a 100644
Binary files a/core/assets-raw/sprites/effects/command-patrol.png and b/core/assets-raw/sprites/effects/command-patrol.png differ
diff --git a/core/assets-raw/sprites/items/item-silicon.png b/core/assets-raw/sprites/items/item-silicon.png
index ea22f87439..7cb816d09e 100644
Binary files a/core/assets-raw/sprites/items/item-silicon.png and b/core/assets-raw/sprites/items/item-silicon.png differ
diff --git a/core/assets-raw/sprites/shapes/shape-3.png b/core/assets-raw/sprites/shapes/shape-3.png
index db75ca9349..358facf7db 100644
Binary files a/core/assets-raw/sprites/shapes/shape-3.png and b/core/assets-raw/sprites/shapes/shape-3.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-unlocked.png b/core/assets-raw/sprites/ui/icons/icon-unlocked.png
index c52e01dccb..9eedca0a66 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-unlocked.png and b/core/assets-raw/sprites/ui/icons/icon-unlocked.png differ
diff --git a/core/assets-raw/sprites/units/dagger-base.png b/core/assets-raw/sprites/units/dagger-base.png
index 3dd806403d..16d639ad6b 100644
Binary files a/core/assets-raw/sprites/units/dagger-base.png and b/core/assets-raw/sprites/units/dagger-base.png differ
diff --git a/core/assets-raw/sprites/units/dagger-leg.png b/core/assets-raw/sprites/units/dagger-leg.png
index 3eabd86858..9049d99666 100644
Binary files a/core/assets-raw/sprites/units/dagger-leg.png and b/core/assets-raw/sprites/units/dagger-leg.png differ
diff --git a/core/assets-raw/sprites/units/fortress-base.png b/core/assets-raw/sprites/units/fortress-base.png
index 45a4eaf997..8d01aeb29a 100644
Binary files a/core/assets-raw/sprites/units/fortress-base.png and b/core/assets-raw/sprites/units/fortress-base.png differ
diff --git a/core/assets-raw/sprites/units/fortress-leg.png b/core/assets-raw/sprites/units/fortress-leg.png
index a257fde52d..3e94dd7bed 100644
Binary files a/core/assets-raw/sprites/units/fortress-leg.png and b/core/assets-raw/sprites/units/fortress-leg.png differ
diff --git a/core/assets-raw/sprites/units/fortress.png b/core/assets-raw/sprites/units/fortress.png
index 3614452f50..8842a4aefc 100644
Binary files a/core/assets-raw/sprites/units/fortress.png and b/core/assets-raw/sprites/units/fortress.png differ
diff --git a/core/assets-raw/sprites/units/revenant.png b/core/assets-raw/sprites/units/revenant.png
index 8d49d55ddc..6054faf101 100644
Binary files a/core/assets-raw/sprites/units/revenant.png and b/core/assets-raw/sprites/units/revenant.png differ
diff --git a/core/assets-raw/sprites/units/titan-base.png b/core/assets-raw/sprites/units/titan-base.png
index a5c60d294c..8d01aeb29a 100644
Binary files a/core/assets-raw/sprites/units/titan-base.png and b/core/assets-raw/sprites/units/titan-base.png differ
diff --git a/core/assets-raw/sprites/units/titan-leg.png b/core/assets-raw/sprites/units/titan-leg.png
index 9f0347d206..8f79a7c274 100644
Binary files a/core/assets-raw/sprites/units/titan-leg.png and b/core/assets-raw/sprites/units/titan-leg.png differ
diff --git a/core/assets-raw/sprites/weapons/artillery-equip.png b/core/assets-raw/sprites/weapons/artillery-equip.png
index 9c13378d12..2f18a8de59 100644
Binary files a/core/assets-raw/sprites/weapons/artillery-equip.png and b/core/assets-raw/sprites/weapons/artillery-equip.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index f7555b9ef6..11e6d4f3f8 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -74,7 +74,7 @@ text.mission.unit=Create {0} Unit
 text.mission.command=Send Command {0} To Units
 text.mission.linknode=Link Power Node
 text.mission.display=[accent]Mission:\n[LIGHT_GRAY]{0}
-text.mission.mech=Switch to mech
+text.mission.mech=Switch to mech[accent] {0}[]
 
 text.none=<none>
 text.close=Close
@@ -327,7 +327,7 @@ text.blocks.explosive=Highly explosive!
 text.blocks.health=Health
 text.blocks.inaccuracy=Inaccuracy
 text.blocks.shots=Shots
-text.blocks.reload=Reload
+text.blocks.reload=Shots/Second
 text.blocks.inputfuel=Fuel
 text.blocks.fuelburntime=Fuel Burn Time
 text.blocks.inputcapacity=Input capacity
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 7e77ef9240..4d70f42e96 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -25,289 +25,282 @@ overdrive-projector-top
   orig: 16, 16
   offset: 0, 0
   index: -1
-bridge-conveyor-arrow
+bridge-conveyor-bridge
   rotate: false
   xy: 800, 360
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-bridge-conveyor-bridge
+bridge-conveyor-end
   rotate: false
   xy: 810, 360
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-bridge-conveyor-end
-  rotate: false
-  xy: 820, 360
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
 conveyor-0-1
   rotate: false
-  xy: 942, 366
+  xy: 932, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 952, 366
+  xy: 942, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 482, 350
+  xy: 952, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 620, 346
+  xy: 482, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 630, 348
+  xy: 620, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 640, 348
+  xy: 630, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 650, 348
+  xy: 640, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 660, 348
+  xy: 650, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 670, 348
+  xy: 660, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 680, 348
+  xy: 670, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 690, 348
+  xy: 680, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 700, 350
+  xy: 690, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 710, 350
+  xy: 700, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 720, 350
+  xy: 710, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 730, 350
+  xy: 720, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 740, 350
+  xy: 730, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 750, 350
+  xy: 740, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 760, 350
+  xy: 750, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 770, 350
+  xy: 760, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 166, 97
+  xy: 176, 107
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 156, 87
+  xy: 166, 97
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 156, 77
+  xy: 156, 87
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 176, 97
+  xy: 156, 77
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 166, 87
+  xy: 176, 97
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 166, 77
+  xy: 166, 87
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 160, 67
+  xy: 166, 77
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 176, 87
+  xy: 160, 67
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 160, 57
+  xy: 176, 87
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 176, 77
+  xy: 160, 57
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 170, 67
+  xy: 176, 77
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 160, 47
+  xy: 170, 67
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 160, 37
+  xy: 160, 47
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 170, 57
+  xy: 160, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 170, 47
+  xy: 170, 57
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 170, 37
+  xy: 170, 47
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 161, 27
+  xy: 170, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 161, 17
+  xy: 161, 27
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 161, 7
+  xy: 161, 17
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -321,21 +314,21 @@ mass-driver-turret
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 179, 187
+  xy: 189, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 159, 167
+  xy: 179, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 169, 177
+  xy: 159, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -580,56 +573,56 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 830, 362
+  xy: 820, 360
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 844, 376
+  xy: 830, 362
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 854, 376
+  xy: 844, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 780, 350
+  xy: 770, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 790, 350
+  xy: 780, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 800, 350
+  xy: 790, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 870, 356
+  xy: 860, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 880, 356
+  xy: 870, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -643,98 +636,98 @@ dirtedge
   index: -1
 generic-cliff-edge
   rotate: false
-  xy: 840, 346
+  xy: 950, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 840, 346
+  xy: 950, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 850, 346
+  xy: 840, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 850, 346
+  xy: 840, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-2
   rotate: false
-  xy: 860, 346
+  xy: 850, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 860, 346
+  xy: 850, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-side
   rotate: false
-  xy: 870, 346
+  xy: 860, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 870, 346
+  xy: 860, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 900, 346
+  xy: 890, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 910, 346
+  xy: 900, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 920, 346
+  xy: 910, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 930, 346
+  xy: 920, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 880, 346
+  xy: 870, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 890, 346
+  xy: 880, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -748,14 +741,14 @@ grassedge
   index: -1
 ice2
   rotate: false
-  xy: 950, 346
+  xy: 940, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 830, 342
+  xy: 950, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -769,35 +762,35 @@ iceedge
   index: -1
 icerock2
   rotate: false
-  xy: 840, 336
+  xy: 830, 342
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 850, 336
+  xy: 840, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 850, 336
+  xy: 840, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 860, 336
+  xy: 850, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 860, 336
+  xy: 850, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -811,56 +804,56 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 670, 338
+  xy: 660, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 680, 338
+  xy: 670, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 690, 338
+  xy: 680, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 780, 340
+  xy: 770, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 790, 340
+  xy: 780, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 800, 340
+  xy: 790, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 810, 340
+  xy: 800, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 820, 340
+  xy: 810, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -881,21 +874,21 @@ oiledge
   index: -1
 rock2
   rotate: false
-  xy: 154, 157
+  xy: 144, 147
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 164, 157
+  xy: 144, 137
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 154, 147
+  xy: 164, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -909,21 +902,21 @@ sandedge
   index: -1
 shrubshadow
   rotate: false
-  xy: 174, 137
+  xy: 184, 147
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 164, 127
+  xy: 174, 137
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 154, 117
+  xy: 164, 127
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -944,42 +937,42 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 204, 152
+  xy: 194, 122
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 204, 142
+  xy: 204, 152
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 204, 132
+  xy: 204, 142
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 204, 122
+  xy: 204, 132
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 194, 132
+  xy: 194, 142
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 194, 122
+  xy: 194, 132
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -993,70 +986,70 @@ stoneedge
   index: -1
 thorium1
   rotate: false
-  xy: 194, 112
+  xy: 204, 122
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 204, 112
+  xy: 194, 112
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 156, 107
+  xy: 204, 112
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 166, 107
+  xy: 156, 107
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 156, 97
+  xy: 166, 107
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 176, 107
+  xy: 156, 97
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 171, 17
+  xy: 171, 27
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 171, 7
+  xy: 171, 17
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 180, 67
+  xy: 171, 7
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 180, 57
+  xy: 180, 67
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1119,14 +1112,14 @@ border
   index: -1
 conduit-liquid
   rotate: false
-  xy: 862, 366
+  xy: 852, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 810, 350
+  xy: 800, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1154,7 +1147,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 950, 356
+  xy: 940, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1168,14 +1161,14 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 189, 187
+  xy: 169, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 169, 167
+  xy: 189, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1315,7 +1308,7 @@ shadow-rounded-2
   index: -1
 shadow-shock-mine
   rotate: false
-  xy: 154, 127
+  xy: 164, 137
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1327,6 +1320,13 @@ bridge-conduit-arrow
   orig: 8, 8
   offset: 0, 0
   index: -1
+bridge-conveyor-arrow
+  rotate: false
+  xy: 770, 360
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 bridge-conduit-bridge
   rotate: false
   xy: 780, 360
@@ -1343,126 +1343,126 @@ bridge-conduit-end
   index: -1
 conduit-bottom
   rotate: false
-  xy: 904, 376
+  xy: 894, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 914, 376
+  xy: 904, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 924, 376
+  xy: 914, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 934, 376
+  xy: 924, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 944, 376
+  xy: 934, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 954, 376
+  xy: 944, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 842, 366
+  xy: 954, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 852, 366
+  xy: 842, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 872, 366
+  xy: 862, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 882, 366
+  xy: 872, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 892, 366
+  xy: 882, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 902, 366
+  xy: 892, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 912, 366
+  xy: 902, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 922, 366
+  xy: 912, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 932, 366
+  xy: 922, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 750, 340
+  xy: 740, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 760, 340
+  xy: 750, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 770, 340
+  xy: 760, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1490,70 +1490,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 169, 187
+  xy: 149, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 159, 177
+  xy: 169, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 189, 197
+  xy: 159, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 179, 177
+  xy: 169, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 179, 167
+  xy: 179, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 189, 177
+  xy: 179, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 189, 167
+  xy: 189, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 199, 202
+  xy: 189, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 199, 192
+  xy: 199, 202
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 199, 182
+  xy: 199, 192
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1644,7 +1644,7 @@ fusion-reactor-top
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 144, 137
+  xy: 154, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1833,14 +1833,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 660, 338
+  xy: 650, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 910, 326
+  xy: 900, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1875,21 +1875,21 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 199, 172
+  xy: 199, 182
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 144, 157
+  xy: 199, 172
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 164, 137
+  xy: 174, 147
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1910,7 +1910,7 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 174, 117
+  xy: 184, 127
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1994,7 +1994,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 940, 356
+  xy: 930, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2008,7 +2008,7 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 940, 346
+  xy: 930, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2092,21 +2092,21 @@ salvo-panel-right
   index: -1
 scatter
   rotate: false
-  xy: 144, 117
+  xy: 154, 137
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 184, 157
+  xy: 144, 117
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 174, 147
+  xy: 184, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2232,7 +2232,7 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 144, 147
+  xy: 144, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2295,7 +2295,7 @@ wraith-factory-top-open
   index: -1
 deflector-wall
   rotate: false
-  xy: 860, 356
+  xy: 850, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2316,7 +2316,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 930, 356
+  xy: 920, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2372,28 +2372,28 @@ clear
   index: -1
 command-attack
   rotate: false
-  xy: 864, 376
+  xy: 854, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-idle
   rotate: false
-  xy: 874, 376
+  xy: 864, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-patrol
   rotate: false
-  xy: 884, 376
+  xy: 874, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-retreat
   rotate: false
-  xy: 894, 376
+  xy: 884, 376
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2512,7 +2512,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 184, 147
+  xy: 154, 127
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2526,7 +2526,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 171, 27
+  xy: 161, 7
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4038,112 +4038,112 @@ block-icon-wraith-factory
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 820, 350
+  xy: 810, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 830, 352
+  xy: 820, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 840, 356
+  xy: 830, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 850, 356
+  xy: 840, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 890, 356
+  xy: 880, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 900, 356
+  xy: 890, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 910, 356
+  xy: 900, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 920, 356
+  xy: 910, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge
   rotate: false
-  xy: 1012, 366
+  xy: 1002, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-1
   rotate: false
-  xy: 630, 338
+  xy: 1012, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-2
   rotate: false
-  xy: 640, 338
+  xy: 630, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-side
   rotate: false
-  xy: 650, 338
+  xy: 640, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 710, 340
+  xy: 700, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 720, 340
+  xy: 710, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 730, 340
+  xy: 720, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 740, 340
+  xy: 730, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4199,770 +4199,770 @@ trident-ship
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 830, 332
+  xy: 820, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 840, 326
+  xy: 830, 332
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 850, 326
+  xy: 840, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 860, 326
+  xy: 850, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge
   rotate: false
-  xy: 870, 326
+  xy: 860, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-1
   rotate: false
-  xy: 880, 326
+  xy: 870, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-2
   rotate: false
-  xy: 890, 326
+  xy: 880, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-side
   rotate: false
-  xy: 900, 326
+  xy: 890, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 920, 326
+  xy: 910, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 930, 326
+  xy: 920, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 940, 326
+  xy: 930, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 950, 326
+  xy: 940, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 960, 326
+  xy: 950, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 970, 356
+  xy: 960, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 970, 346
+  xy: 970, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 970, 336
+  xy: 970, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 970, 326
+  xy: 970, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 980, 358
+  xy: 970, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 980, 348
+  xy: 980, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 990, 358
+  xy: 980, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 980, 338
+  xy: 990, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 990, 348
+  xy: 980, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 980, 328
+  xy: 990, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 990, 338
+  xy: 980, 328
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 990, 328
+  xy: 990, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 1000, 356
+  xy: 990, 328
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 1000, 346
+  xy: 1000, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 1010, 356
+  xy: 1000, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 1000, 336
+  xy: 1010, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 1010, 346
+  xy: 1000, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 1010, 336
+  xy: 1010, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 1000, 326
+  xy: 1010, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 1010, 326
+  xy: 1000, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 700, 330
+  xy: 1010, 326
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 710, 330
+  xy: 700, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 720, 330
+  xy: 710, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 730, 330
+  xy: 720, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 740, 330
+  xy: 730, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 750, 330
+  xy: 740, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 760, 330
+  xy: 750, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 770, 330
+  xy: 760, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 780, 330
+  xy: 770, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 790, 330
+  xy: 780, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 800, 330
+  xy: 790, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 810, 330
+  xy: 800, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 820, 330
+  xy: 810, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 830, 322
+  xy: 820, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 840, 316
+  xy: 830, 322
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 850, 316
+  xy: 840, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 860, 316
+  xy: 850, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 870, 316
+  xy: 860, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 880, 316
+  xy: 870, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 890, 316
+  xy: 880, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 900, 316
+  xy: 890, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 910, 316
+  xy: 900, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 920, 316
+  xy: 910, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 930, 316
+  xy: 920, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 940, 316
+  xy: 930, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 950, 316
+  xy: 940, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 960, 316
+  xy: 950, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 970, 316
+  xy: 960, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 980, 318
+  xy: 970, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 990, 318
+  xy: 980, 318
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 1000, 316
+  xy: 990, 318
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 1010, 316
+  xy: 1000, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 980, 308
+  xy: 1010, 316
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 990, 308
+  xy: 980, 308
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 1000, 306
+  xy: 990, 308
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 1010, 306
+  xy: 1000, 306
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 322, 170
+  xy: 1010, 306
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 332, 170
+  xy: 322, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 342, 170
+  xy: 332, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 352, 170
+  xy: 342, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 362, 170
+  xy: 352, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 140, 217
+  xy: 362, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 150, 217
+  xy: 140, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 160, 217
+  xy: 150, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 170, 217
+  xy: 160, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 180, 217
+  xy: 170, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 190, 217
+  xy: 180, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 139, 207
+  xy: 190, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 139, 197
+  xy: 139, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 149, 207
+  xy: 139, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 139, 187
+  xy: 149, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 159, 207
+  xy: 139, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 149, 197
+  xy: 159, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 139, 177
+  xy: 149, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 169, 207
+  xy: 139, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 159, 197
+  xy: 169, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 149, 187
+  xy: 159, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 139, 167
+  xy: 149, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 179, 207
+  xy: 139, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 169, 197
+  xy: 179, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 149, 177
+  xy: 169, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 159, 187
+  xy: 149, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 189, 207
+  xy: 159, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 179, 197
+  xy: 189, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 149, 167
+  xy: 179, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 144, 127
+  xy: 154, 147
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 174, 157
+  xy: 144, 127
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 164, 147
+  xy: 174, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 154, 137
+  xy: 164, 147
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 184, 137
+  xy: 154, 117
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 174, 127
+  xy: 184, 137
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 164, 117
+  xy: 174, 127
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 184, 127
+  xy: 164, 117
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 184, 117
+  xy: 174, 117
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 199, 162
+  xy: 184, 117
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 194, 152
+  xy: 199, 162
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 194, 142
+  xy: 194, 152
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5004,112 +5004,112 @@ wraith
   index: -1
 item-biomatter
   rotate: false
-  xy: 890, 336
+  xy: 880, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 900, 336
+  xy: 890, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 910, 336
+  xy: 900, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 920, 336
+  xy: 910, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-dense-alloy
   rotate: false
-  xy: 930, 336
+  xy: 920, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 940, 336
+  xy: 930, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 950, 336
+  xy: 940, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 962, 366
+  xy: 950, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 960, 356
+  xy: 962, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 960, 346
+  xy: 960, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 960, 336
+  xy: 960, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 972, 368
+  xy: 960, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 982, 368
+  xy: 972, 368
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 992, 368
+  xy: 982, 368
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1002, 366
+  xy: 992, 368
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 700, 340
+  xy: 690, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5741,7 +5741,7 @@ icon-item
   index: -1
 icon-items-none
   rotate: false
-  xy: 870, 336
+  xy: 860, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5846,7 +5846,7 @@ icon-none
   index: -1
 icon-nullitem
   rotate: false
-  xy: 880, 336
+  xy: 870, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index a755a7e34b..eb5b79bfbf 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java
index 279c4d0a1a..cc334ed552 100644
--- a/core/src/io/anuke/mindustry/core/World.java
+++ b/core/src/io/anuke/mindustry/core/World.java
@@ -232,7 +232,6 @@ public class World extends Module{
     /**Loads up a sector map. This does not call play(), but calls reset().*/
     public void loadSector(Sector sector){
         currentSector = sector;
-        state.mode = sector.mode;
         state.difficulty = sectors.getDifficulty(sector);
         Timers.mark();
         Timers.mark();
diff --git a/core/src/io/anuke/mindustry/maps/SectorPresets.java b/core/src/io/anuke/mindustry/maps/SectorPresets.java
new file mode 100644
index 0000000000..f830b3334f
--- /dev/null
+++ b/core/src/io/anuke/mindustry/maps/SectorPresets.java
@@ -0,0 +1,55 @@
+package io.anuke.mindustry.maps;
+
+import com.badlogic.gdx.utils.Array;
+import io.anuke.mindustry.content.Items;
+import io.anuke.mindustry.content.Mechs;
+import io.anuke.mindustry.content.blocks.UnitBlocks;
+import io.anuke.mindustry.content.blocks.UpgradeBlocks;
+import io.anuke.mindustry.entities.units.UnitCommand;
+import io.anuke.mindustry.maps.missions.*;
+import io.anuke.mindustry.type.Item;
+import io.anuke.ucore.util.GridMap;
+import io.anuke.ucore.util.Structs;
+
+import static io.anuke.mindustry.Vars.mobile;
+
+public class SectorPresets{
+    private final GridMap<SectorPreset> presets = new GridMap<SectorPreset>(){{
+        //base tutorial mission
+        put(0, 0, new SectorPreset(TutorialSector.getMissions(), Array.with(Items.copper), 1));
+
+        //water mission
+        put(-2, 0, new SectorPreset(Array.with(), Array.with(Items.copper), 1));
+        //command center mission
+        //TODO generate enemy base
+        //TODO make 2x2
+        //TODO more gen info
+        put(0, 1, new SectorPreset(Structs.array(new BlockMission(UnitBlocks.daggerFactory), Missions.blockRecipe(UnitBlocks.commandCenter),
+        new CommandMission(UnitCommand.retreat), new CommandMission(UnitCommand.attack), new BattleMission()), Array.with(Items.copper), 1));
+        //reconstructor mission
+        put(0, -1, new SectorPreset(Structs.array(Missions.blockRecipe(mobile ? UpgradeBlocks.tridentPad : UpgradeBlocks.deltaPad),
+        new MechMission(Mechs.delta)), Array.with(Items.copper), 1));
+        //oil mission
+        put(1, 0, new SectorPreset(Array.with(), Array.with(Items.copper), 1));
+    }};
+
+    public SectorPreset get(int x, int y){
+        return presets.get(x, y);
+    }
+
+    public static class SectorPreset{
+        public final Array<Mission> missions;
+        public final Array<Item> ores;
+        public final int size;
+
+        public SectorPreset(Array<Mission> missions, Array<Item> ores, int size){
+            this.missions = missions;
+            this.ores = ores;
+            this.size = size;
+        }
+
+        void generate(Sector sector){
+
+        }
+    }
+}
diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java
index 37d9b3ca69..4bd4bbadb1 100644
--- a/core/src/io/anuke/mindustry/maps/Sectors.java
+++ b/core/src/io/anuke/mindustry/maps/Sectors.java
@@ -5,17 +5,15 @@ import com.badlogic.gdx.graphics.Pixmap.Format;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.content.Items;
-import io.anuke.mindustry.content.Mechs;
-import io.anuke.mindustry.content.blocks.UnitBlocks;
-import io.anuke.mindustry.content.blocks.UpgradeBlocks;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.units.BaseUnit;
-import io.anuke.mindustry.entities.units.UnitCommand;
 import io.anuke.mindustry.game.Difficulty;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.SaveIO;
+import io.anuke.mindustry.maps.SectorPresets.SectorPreset;
 import io.anuke.mindustry.maps.generation.WorldGenerator.GenResult;
-import io.anuke.mindustry.maps.missions.*;
+import io.anuke.mindustry.maps.missions.Mission;
+import io.anuke.mindustry.maps.missions.WaveMission;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.world.ColorMapper;
@@ -24,7 +22,10 @@ import io.anuke.ucore.core.Settings;
 import io.anuke.ucore.entities.Entities;
 import io.anuke.ucore.entities.EntityGroup;
 import io.anuke.ucore.entities.trait.Entity;
-import io.anuke.ucore.util.*;
+import io.anuke.ucore.util.Bits;
+import io.anuke.ucore.util.GridMap;
+import io.anuke.ucore.util.Log;
+import io.anuke.ucore.util.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
 
@@ -33,24 +34,7 @@ public class Sectors{
     private static final boolean checkExpansion = false;
 
     private final GridMap<Sector> grid = new GridMap<>();
-
-    private final GridMap<SectorPreset> presets = new GridMap<SectorPreset>(){{
-        put(0, 0, new SectorPreset(TutorialSector.getMissions(), Array.with(Items.copper), 1));
-
-        //water mission
-        put(-2, 0, new SectorPreset(Array.with(), Array.with(Items.copper), 1));
-        //command center mission
-        //TODO generate enemy base
-        //TODO make 2x2
-        //TODO more gen info
-        put(0, 1, new SectorPreset(Structs.array(new BlockMission(UnitBlocks.daggerFactory), Missions.blockRecipe(UnitBlocks.commandCenter),
-                new CommandMission(UnitCommand.retreat), new CommandMission(UnitCommand.attack), new BattleMission()), Array.with(Items.copper), 1));
-        //reconstructor mission
-        put(0, -1, new SectorPreset(Structs.array(Missions.blockRecipe(mobile ? UpgradeBlocks.tridentPad : UpgradeBlocks.deltaPad),
-                new MechMission(Mechs.delta)), Array.with(Items.copper), 1));
-        //oil mission
-        put(1, 0, new SectorPreset(Array.with(), Array.with(Items.copper), 1));
-    }};
+    private final SectorPresets presets = new SectorPresets();
 
     public void playSector(Sector sector){
         if(sector.hasSave() && SaveIO.breakingVersions.contains(sector.getSave().getBuild())){
@@ -310,7 +294,7 @@ public class Sectors{
     private void initSector(Sector sector){
         sector.difficulty = (int)(Mathf.dst(sector.x, sector.y));
 
-        if(presets.containsKey(sector.x, sector.y)){
+        if(presets.get(sector.x, sector.y) != null){
             SectorPreset p = presets.get(sector.x, sector.y);
             sector.missions.addAll(p.missions);
         }else{
@@ -370,19 +354,5 @@ public class Sectors{
         pixmap.dispose();
     }
 
-    private class SectorPreset{
-        private final Array<Mission> missions;
-        private final Array<Item> ores;
-        private final int size;
 
-        public SectorPreset(Array<Mission> missions, Array<Item> ores, int size){
-            this.missions = missions;
-            this.ores = ores;
-            this.size = size;
-        }
-
-        void generate(Sector sector){
-
-        }
-    }
 }
diff --git a/core/src/io/anuke/mindustry/maps/missions/MechMission.java b/core/src/io/anuke/mindustry/maps/missions/MechMission.java
index a0d5ed2319..f59710a698 100644
--- a/core/src/io/anuke/mindustry/maps/missions/MechMission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/MechMission.java
@@ -1,5 +1,7 @@
 package io.anuke.mindustry.maps.missions;
 
+import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.type.Mech;
 import io.anuke.ucore.util.Bundles;
 
@@ -12,11 +14,16 @@ public class MechMission extends Mission{
 
     @Override
     public boolean isComplete(){
+        for(Player player : Vars.playerGroup.all()){
+            if(player.mech == mech){
+                return true;
+            }
+        }
         return false;
     }
 
     @Override
     public String displayString(){
-        return Bundles.format("te");
+        return Bundles.format("text.mission.mech", mech.localizedName());
     }
 }
diff --git a/core/src/io/anuke/mindustry/maps/missions/Mission.java b/core/src/io/anuke/mindustry/maps/missions/Mission.java
index 333ba8cd78..9021860298 100644
--- a/core/src/io/anuke/mindustry/maps/missions/Mission.java
+++ b/core/src/io/anuke/mindustry/maps/missions/Mission.java
@@ -12,8 +12,7 @@ import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.scene.ui.layout.Table;
 import io.anuke.ucore.util.Bundles;
 
-import static io.anuke.mindustry.Vars.headless;
-import static io.anuke.mindustry.Vars.ui;
+import static io.anuke.mindustry.Vars.*;
 
 public abstract class Mission{
     private String extraMessage;
@@ -90,7 +89,9 @@ public abstract class Mission{
         return Array.with();
     }
 
-    public void generate(Generation gen){}
+    public void generate(Generation gen){
+        generateCoreAt(gen, gen.width/2, gen.height/2, defaultTeam);
+    }
 
     public void generateCoreAt(Generation gen, int coreX, int coreY, Team team){
         gen.tiles[coreX][coreY].setBlock(StorageBlocks.core);