diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter.png b/core/assets-raw/sprites/blocks/production/alloy-smelter.png
index a93b551ee3..f180eebdc6 100644
Binary files a/core/assets-raw/sprites/blocks/production/alloy-smelter.png and b/core/assets-raw/sprites/blocks/production/alloy-smelter.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png
new file mode 100644
index 0000000000..7a2c27eec3
Binary files /dev/null and b/core/assets-raw/sprites/mechs/mechs/omega-mech-armor.png differ
diff --git a/core/assets/shaders/build.fragment b/core/assets/shaders/build.fragment
index 4977e782b1..1762a407be 100644
--- a/core/assets/shaders/build.fragment
+++ b/core/assets/shaders/build.fragment
@@ -42,7 +42,7 @@ void main() {
 
     if(c.a > 0.01 || outline){
         float f = abs(sin(coords.x*2.0 + u_time));
-        if(f > 0.9 || (f > 0.7 && rand(t) > 0.6))
+        if(f > 0.9 )
             f = 1.0;
         else
             f = 0.0;
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 00903ea248..30b632caf1 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,287 +13,287 @@ background
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 833, 218
+  xy: 903, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 833, 208
+  xy: 913, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 833, 198
+  xy: 923, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 863, 269
+  xy: 853, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 853, 256
+  xy: 863, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 863, 259
+  xy: 873, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 873, 269
+  xy: 883, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 853, 246
+  xy: 893, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 863, 249
+  xy: 903, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 873, 259
+  xy: 913, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 883, 269
+  xy: 853, 206
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 853, 236
+  xy: 863, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 863, 239
+  xy: 873, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 873, 249
+  xy: 883, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 883, 259
+  xy: 893, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 893, 269
+  xy: 903, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 853, 226
+  xy: 913, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 863, 229
+  xy: 923, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 873, 239
+  xy: 853, 196
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 883, 249
+  xy: 863, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 893, 259
+  xy: 873, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 903, 269
+  xy: 883, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1013, 195
+  xy: 469, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1013, 185
+  xy: 479, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1013, 175
+  xy: 469, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 415, 7
+  xy: 479, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 419, 114
+  xy: 489, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 429, 114
+  xy: 479, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 419, 104
+  xy: 489, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 439, 114
+  xy: 499, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 419, 94
+  xy: 489, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 429, 104
+  xy: 499, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 449, 114
+  xy: 509, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 429, 94
+  xy: 499, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 439, 104
+  xy: 509, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 459, 114
+  xy: 519, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 439, 94
+  xy: 509, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 449, 104
+  xy: 519, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 469, 114
+  xy: 529, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 449, 94
+  xy: 519, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 459, 104
+  xy: 529, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -307,21 +307,21 @@ mass-driver-turret
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 327, 17
+  xy: 983, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 337, 17
+  xy: 993, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 347, 17
+  xy: 1003, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -545,14 +545,14 @@ block-icon-blackstone
   index: -1
 blackstone2
   rotate: false
-  xy: 510, 138
+  xy: 536, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 287, 27
+  xy: 474, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -566,553 +566,553 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 833, 188
+  xy: 933, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 841, 278
+  xy: 853, 276
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 843, 268
+  xy: 853, 266
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 853, 216
+  xy: 893, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 863, 219
+  xy: 903, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 873, 229
+  xy: 913, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 863, 209
+  xy: 893, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 873, 219
+  xy: 903, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirtedge
   rotate: false
-  xy: 315, 37
+  xy: 359, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 generic-cliff-edge
   rotate: false
-  xy: 873, 209
+  xy: 903, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 873, 209
+  xy: 903, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 883, 219
+  xy: 913, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 883, 219
+  xy: 913, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-2
   rotate: false
-  xy: 893, 229
+  xy: 923, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 893, 229
+  xy: 923, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-side
   rotate: false
-  xy: 903, 239
+  xy: 933, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 903, 239
+  xy: 933, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 933, 269
+  xy: 953, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 943, 275
+  xy: 893, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 873, 199
+  xy: 903, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 883, 209
+  xy: 913, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 913, 249
+  xy: 963, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 923, 259
+  xy: 943, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 357, 51
+  xy: 1005, 339
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 903, 229
+  xy: 933, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 913, 239
+  xy: 973, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iceedge
   rotate: false
-  xy: 371, 51
+  xy: 177, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 923, 249
+  xy: 943, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 933, 259
+  xy: 953, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 933, 259
+  xy: 953, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 943, 265
+  xy: 963, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 943, 265
+  xy: 963, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lavaedge
   rotate: false
-  xy: 385, 37
+  xy: 191, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 933, 229
+  xy: 963, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 943, 235
+  xy: 973, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 953, 245
+  xy: 983, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 973, 255
+  xy: 963, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 983, 265
+  xy: 973, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 993, 275
+  xy: 983, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 923, 199
+  xy: 993, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 933, 209
+  xy: 963, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalflooredge
   rotate: false
-  xy: 399, 37
+  xy: 401, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 oiledge
   rotate: false
-  xy: 191, 17
+  xy: 500, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 355, 7
+  xy: 381, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 375, 7
+  xy: 401, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 385, 7
+  xy: 411, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandedge
   rotate: false
-  xy: 177, 3
+  xy: 514, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 531, 145
+  xy: 429, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 541, 145
+  xy: 419, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 520, 133
+  xy: 429, 104
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowedge
   rotate: false
-  xy: 723, 186
+  xy: 542, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 737, 186
+  xy: 556, 192
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 1007, 295
+  xy: 429, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 1007, 285
+  xy: 439, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 1013, 275
+  xy: 449, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 1013, 265
+  xy: 459, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 1007, 315
+  xy: 459, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1007, 305
+  xy: 419, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneedge
   rotate: false
-  xy: 751, 186
+  xy: 484, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 1013, 255
+  xy: 418, 74
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1013, 245
+  xy: 428, 74
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1013, 235
+  xy: 438, 74
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1013, 225
+  xy: 448, 74
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1013, 215
+  xy: 458, 74
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1013, 205
+  xy: 469, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 459, 94
+  xy: 529, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 469, 104
+  xy: 539, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 489, 114
+  xy: 549, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 469, 94
+  xy: 539, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 500, 195
+  xy: 540, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 357, 27
+  xy: 494, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 367, 27
+  xy: 504, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 367, 27
+  xy: 504, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 823, 188
+  xy: 843, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 823, 188
+  xy: 843, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 833, 268
+  xy: 853, 286
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 833, 258
+  xy: 863, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 883, 279
+  xy: 883, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 883, 239
+  xy: 923, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1140,7 +1140,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 863, 199
+  xy: 893, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1154,21 +1154,21 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 357, 17
+  xy: 1013, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 367, 17
+  xy: 287, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ripples
   rotate: false
-  xy: 486, 147
+  xy: 654, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1217,7 +1217,7 @@ rubble-3-1
   index: -1
 shadow-1
   rotate: false
-  xy: 486, 135
+  xy: 666, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1259,14 +1259,14 @@ shadow-6
   index: -1
 shadow-corner
   rotate: false
-  xy: 498, 147
+  xy: 1007, 277
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 shadow-round-1
   rotate: false
-  xy: 498, 135
+  xy: 406, 69
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1294,154 +1294,154 @@ shadow-rounded-2
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 833, 248
+  xy: 873, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 833, 238
+  xy: 883, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 833, 228
+  xy: 893, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 843, 228
+  xy: 873, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 843, 218
+  xy: 853, 246
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 843, 208
+  xy: 863, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 843, 198
+  xy: 873, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 843, 188
+  xy: 883, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 853, 286
+  xy: 853, 236
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 863, 279
+  xy: 863, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 873, 279
+  xy: 873, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 893, 279
+  xy: 893, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 903, 279
+  xy: 853, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 913, 279
+  xy: 863, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 923, 279
+  xy: 873, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 933, 279
+  xy: 883, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 853, 276
+  xy: 893, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 853, 266
+  xy: 903, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router
   rotate: false
-  xy: 933, 219
+  xy: 973, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 943, 225
+  xy: 983, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 953, 235
+  xy: 993, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 963, 245
+  xy: 953, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1469,70 +1469,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 297, 17
+  xy: 953, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 307, 17
+  xy: 963, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 317, 17
+  xy: 973, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 377, 17
+  xy: 297, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 387, 17
+  xy: 285, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 397, 17
+  xy: 295, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 407, 17
+  xy: 301, 39
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 285, 7
+  xy: 311, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 295, 7
+  xy: 321, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 305, 7
+  xy: 331, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1623,7 +1623,7 @@ fusion-reactor-top
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 365, 7
+  xy: 391, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1812,14 +1812,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 923, 219
+  xy: 953, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 953, 215
+  xy: 993, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1861,21 +1861,21 @@ poweralloysmelter-top
   index: -1
 pulverizer
   rotate: false
-  xy: 315, 7
+  xy: 341, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 325, 7
+  xy: 351, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 541, 155
+  xy: 419, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1896,21 +1896,21 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 527, 113
+  xy: 439, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 337, 27
+  xy: 494, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 347, 27
+  xy: 484, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1980,7 +1980,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 853, 196
+  xy: 883, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2001,7 +2001,7 @@ spectre
   index: -1
 hail
   rotate: false
-  xy: 893, 219
+  xy: 923, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2078,21 +2078,21 @@ salvo-panel-right
   index: -1
 scatter
   rotate: false
-  xy: 409, 87
+  xy: 1003, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 521, 153
+  xy: 1013, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 531, 155
+  xy: 305, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2246,14 +2246,14 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 335, 7
+  xy: 361, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupply-point
   rotate: false
-  xy: 345, 7
+  xy: 371, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2281,7 +2281,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 923, 269
+  xy: 943, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2316,7 +2316,7 @@ bullet
   index: -1
 bullet-back
   rotate: false
-  xy: 572, 195
+  xy: 481, 158
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -2330,42 +2330,42 @@ casing
   index: -1
 clear
   rotate: false
-  xy: 566, 287
+  xy: 481, 181
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 command-attack
   rotate: false
-  xy: 843, 258
+  xy: 863, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-idle
   rotate: false
-  xy: 843, 248
+  xy: 853, 256
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-retreat
   rotate: false
-  xy: 843, 238
+  xy: 863, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 enemyarrow
   rotate: false
-  xy: 550, 197
+  xy: 853, 187
   size: 8, 7
   orig: 8, 7
   offset: 0, 0
   index: -1
 error
   rotate: false
-  xy: 329, 37
+  xy: 387, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -2407,14 +2407,14 @@ minelaser-end
   index: -1
 missile
   rotate: false
-  xy: 474, 124
+  xy: 492, 158
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 485, 124
+  xy: 503, 158
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -2456,21 +2456,21 @@ scorch5
   index: -1
 shell
   rotate: false
-  xy: 496, 124
+  xy: 514, 158
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 510, 148
+  xy: 525, 158
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 521, 143
+  xy: 419, 104
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2484,7 +2484,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 479, 114
+  xy: 539, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2498,28 +2498,28 @@ transfer-end
   index: -1
 blackstone-cliff-edge
   rotate: false
-  xy: 297, 27
+  xy: 474, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-1
   rotate: false
-  xy: 307, 27
+  xy: 484, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-2
   rotate: false
-  xy: 317, 27
+  xy: 474, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-side
   rotate: false
-  xy: 327, 27
+  xy: 484, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2547,28 +2547,28 @@ block-icon-blast-drill
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 377, 27
+  xy: 494, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 377, 27
+  xy: 494, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 387, 27
+  xy: 504, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 387, 27
+  xy: 504, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2589,14 +2589,14 @@ centrifuge
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 397, 27
+  xy: 514, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 397, 27
+  xy: 514, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2617,14 +2617,14 @@ command-center
   index: -1
 block-icon-composite-wall
   rotate: false
-  xy: 407, 27
+  xy: 504, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 composite-wall
   rotate: false
-  xy: 407, 27
+  xy: 504, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2645,35 +2645,35 @@ composite-wall-large
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 568, 184
+  xy: 514, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 406, 71
+  xy: 524, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 406, 71
+  xy: 524, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-copper-wall
   rotate: false
-  xy: 507, 125
+  xy: 514, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 507, 125
+  xy: 514, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2750,28 +2750,28 @@ dart-ship-factory
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 517, 173
+  xy: 524, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 517, 173
+  xy: 524, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall
   rotate: false
-  xy: 517, 163
+  xy: 524, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 517, 163
+  xy: 524, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2806,14 +2806,14 @@ delta-mech-factory
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 527, 175
+  xy: 474, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 527, 175
+  xy: 474, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2834,14 +2834,14 @@ distributor
   index: -1
 block-icon-door
   rotate: false
-  xy: 527, 165
+  xy: 484, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 527, 165
+  xy: 484, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2869,21 +2869,21 @@ block-icon-drone-pad
   index: -1
 block-icon-drop-point
   rotate: false
-  xy: 537, 175
+  xy: 494, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 drop-point
   rotate: false
-  xy: 537, 175
+  xy: 494, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-duo
   rotate: false
-  xy: 537, 165
+  xy: 504, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2911,63 +2911,63 @@ block-icon-fusion-reactor
   index: -1
 block-icon-grass
   rotate: false
-  xy: 578, 182
+  xy: 514, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 578, 182
+  xy: 514, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-hail
   rotate: false
-  xy: 588, 182
+  xy: 524, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-ice
   rotate: false
-  xy: 598, 182
+  xy: 813, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 598, 182
+  xy: 813, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 608, 182
+  xy: 823, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 608, 182
+  xy: 823, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 618, 182
+  xy: 811, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 618, 182
+  xy: 811, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2981,28 +2981,28 @@ block-icon-interceptor-pad
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 628, 182
+  xy: 833, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 628, 182
+  xy: 833, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 638, 182
+  xy: 821, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 638, 182
+  xy: 821, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3023,14 +3023,14 @@ javelin-ship-factory
   index: -1
 block-icon-junction
   rotate: false
-  xy: 648, 182
+  xy: 813, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 648, 182
+  xy: 813, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3051,35 +3051,35 @@ block-icon-laser-drill
   index: -1
 block-icon-lava
   rotate: false
-  xy: 658, 182
+  xy: 831, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 658, 182
+  xy: 831, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 668, 182
+  xy: 813, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 668, 182
+  xy: 813, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 568, 174
+  xy: 823, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3093,14 +3093,14 @@ block-icon-liquid-tank
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 578, 172
+  xy: 813, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 578, 172
+  xy: 813, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3128,14 +3128,14 @@ block-icon-mechanical-drill
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 588, 172
+  xy: 823, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 588, 172
+  xy: 823, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3149,28 +3149,28 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 598, 172
+  xy: 813, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 598, 172
+  xy: 813, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 608, 172
+  xy: 823, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 608, 172
+  xy: 823, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3184,14 +3184,14 @@ block-icon-monsoon-pad
   index: -1
 block-icon-oil
   rotate: false
-  xy: 618, 172
+  xy: 813, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 618, 172
+  xy: 813, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3205,56 +3205,56 @@ block-icon-oil-extractor
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 628, 172
+  xy: 823, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 628, 172
+  xy: 823, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 638, 172
+  xy: 813, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 638, 172
+  xy: 813, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 648, 172
+  xy: 823, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 648, 172
+  xy: 823, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 658, 172
+  xy: 813, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 658, 172
+  xy: 813, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3310,14 +3310,14 @@ block-icon-pneumatic-drill
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 668, 172
+  xy: 823, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 668, 172
+  xy: 823, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3338,42 +3338,42 @@ power-node-large
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 813, 288
+  xy: 813, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 813, 288
+  xy: 813, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 823, 288
+  xy: 823, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 823, 288
+  xy: 823, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 811, 278
+  xy: 813, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 833, 288
+  xy: 823, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3436,14 +3436,14 @@ reconstructor
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 821, 278
+  xy: 823, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 821, 278
+  xy: 823, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3457,14 +3457,14 @@ block-icon-ripple
   index: -1
 block-icon-rock
   rotate: false
-  xy: 813, 268
+  xy: 833, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 813, 268
+  xy: 833, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3485,28 +3485,28 @@ rotary-pump
   index: -1
 block-icon-router
   rotate: false
-  xy: 831, 278
+  xy: 833, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 831, 278
+  xy: 833, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 813, 258
+  xy: 833, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 813, 258
+  xy: 833, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3520,49 +3520,49 @@ block-icon-salvo
   index: -1
 block-icon-sand
   rotate: false
-  xy: 823, 268
+  xy: 833, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 823, 268
+  xy: 833, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 813, 248
+  xy: 833, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 823, 258
+  xy: 833, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 823, 258
+  xy: 833, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 813, 238
+  xy: 833, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 813, 238
+  xy: 833, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3583,42 +3583,42 @@ silicon-smelter
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 823, 248
+  xy: 833, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 823, 248
+  xy: 833, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 813, 228
+  xy: 833, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 813, 228
+  xy: 833, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 823, 238
+  xy: 841, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 823, 238
+  xy: 841, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3639,42 +3639,42 @@ solar-panel-large
   index: -1
 block-icon-solidifer
   rotate: false
-  xy: 813, 218
+  xy: 843, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 813, 218
+  xy: 843, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 823, 228
+  xy: 843, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 823, 228
+  xy: 843, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 813, 208
+  xy: 843, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 813, 208
+  xy: 843, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3688,14 +3688,14 @@ block-icon-spectre
   index: -1
 block-icon-stone
   rotate: false
-  xy: 823, 218
+  xy: 843, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 823, 218
+  xy: 843, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3751,14 +3751,14 @@ thorium-reactor
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 813, 198
+  xy: 843, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 813, 198
+  xy: 843, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3786,14 +3786,14 @@ block-icon-titan-pad
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 823, 208
+  xy: 843, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 823, 208
+  xy: 843, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3814,14 +3814,14 @@ turbine-generator
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 813, 188
+  xy: 843, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 813, 188
+  xy: 843, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3856,14 +3856,14 @@ warp-gate
   index: -1
 block-icon-water
   rotate: false
-  xy: 823, 198
+  xy: 843, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 823, 198
+  xy: 843, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3884,147 +3884,147 @@ block-icon-wave
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 893, 249
+  xy: 933, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 903, 259
+  xy: 943, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 913, 269
+  xy: 873, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 853, 206
+  xy: 883, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 883, 229
+  xy: 913, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 893, 239
+  xy: 923, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 903, 249
+  xy: 933, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 913, 259
+  xy: 953, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge
   rotate: false
-  xy: 963, 265
+  xy: 983, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-1
   rotate: false
-  xy: 973, 275
+  xy: 923, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-2
   rotate: false
-  xy: 903, 199
+  xy: 933, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-side
   rotate: false
-  xy: 913, 209
+  xy: 943, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 973, 265
+  xy: 933, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 983, 275
+  xy: 943, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 913, 199
+  xy: 953, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 923, 209
+  xy: 963, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 1003, 367
+  xy: 723, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 1003, 353
+  xy: 737, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 1005, 339
+  xy: 751, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-halberd-ship
   rotate: false
-  xy: 1005, 325
+  xy: 765, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-trident-ship
   rotate: false
-  xy: 1005, 325
+  xy: 765, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -4038,784 +4038,784 @@ mech-icon-omega-mech
   index: -1
 mech-icon-tau-mech
   rotate: false
-  xy: 399, 51
+  xy: 779, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 943, 215
+  xy: 973, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 953, 225
+  xy: 983, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 963, 235
+  xy: 993, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 973, 245
+  xy: 973, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge
   rotate: false
-  xy: 983, 255
+  xy: 983, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-1
   rotate: false
-  xy: 993, 265
+  xy: 993, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-2
   rotate: false
-  xy: 933, 199
+  xy: 983, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-side
   rotate: false
-  xy: 943, 205
+  xy: 993, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 963, 225
+  xy: 863, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 973, 235
+  xy: 873, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 983, 245
+  xy: 883, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 993, 255
+  xy: 893, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 953, 205
+  xy: 903, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 963, 215
+  xy: 913, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 973, 225
+  xy: 923, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 983, 235
+  xy: 933, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 993, 245
+  xy: 943, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 963, 205
+  xy: 953, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 973, 215
+  xy: 963, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 983, 225
+  xy: 973, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 993, 235
+  xy: 983, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 973, 205
+  xy: 993, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 983, 215
+  xy: 1003, 267
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 993, 225
+  xy: 1003, 257
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 983, 205
+  xy: 1003, 247
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 993, 215
+  xy: 1003, 237
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 993, 205
+  xy: 1003, 227
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 853, 186
+  xy: 1003, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 863, 189
+  xy: 1003, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 873, 189
+  xy: 1003, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 883, 189
+  xy: 943, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 893, 189
+  xy: 953, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 903, 189
+  xy: 963, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 913, 189
+  xy: 973, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 923, 189
+  xy: 983, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 933, 189
+  xy: 993, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 943, 195
+  xy: 1003, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 953, 195
+  xy: 1013, 267
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 963, 195
+  xy: 1013, 257
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 973, 195
+  xy: 1013, 247
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 983, 195
+  xy: 1013, 237
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 993, 195
+  xy: 1013, 227
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 943, 185
+  xy: 1013, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 953, 185
+  xy: 1013, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 963, 185
+  xy: 1013, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 973, 185
+  xy: 1013, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 983, 185
+  xy: 207, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 993, 185
+  xy: 217, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 1003, 275
+  xy: 227, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 1003, 265
+  xy: 237, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 1003, 255
+  xy: 247, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 1003, 245
+  xy: 257, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 1003, 235
+  xy: 267, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 1003, 225
+  xy: 277, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 1003, 215
+  xy: 287, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 1003, 205
+  xy: 205, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 1003, 195
+  xy: 205, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 1003, 185
+  xy: 215, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 863, 179
+  xy: 215, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 873, 179
+  xy: 225, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 883, 179
+  xy: 225, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 893, 179
+  xy: 235, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 903, 179
+  xy: 235, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 913, 179
+  xy: 245, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 923, 179
+  xy: 245, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 933, 179
+  xy: 255, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 943, 175
+  xy: 255, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 953, 175
+  xy: 265, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 963, 175
+  xy: 265, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 973, 175
+  xy: 275, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 983, 175
+  xy: 275, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 993, 175
+  xy: 297, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 1003, 175
+  xy: 409, 107
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 207, 23
+  xy: 409, 97
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 217, 23
+  xy: 409, 87
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 227, 23
+  xy: 546, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 237, 23
+  xy: 556, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 247, 23
+  xy: 534, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 257, 23
+  xy: 534, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 267, 23
+  xy: 534, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 277, 23
+  xy: 534, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 205, 13
+  xy: 544, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 205, 3
+  xy: 544, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 215, 13
+  xy: 554, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 215, 3
+  xy: 544, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 225, 13
+  xy: 554, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 225, 3
+  xy: 544, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 235, 13
+  xy: 554, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 235, 3
+  xy: 554, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 245, 13
+  xy: 863, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 245, 3
+  xy: 873, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 255, 13
+  xy: 883, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 255, 3
+  xy: 893, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 265, 13
+  xy: 903, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 265, 3
+  xy: 913, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 275, 13
+  xy: 923, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 275, 3
+  xy: 933, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 287, 17
+  xy: 943, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 395, 7
+  xy: 564, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 405, 7
+  xy: 564, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 409, 107
+  xy: 564, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 409, 97
+  xy: 564, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 517, 123
+  xy: 439, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 507, 115
+  xy: 429, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 517, 113
+  xy: 439, 104
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 527, 123
+  xy: 449, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 530, 133
+  xy: 449, 104
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 540, 135
+  xy: 459, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 537, 123
+  xy: 449, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 537, 113
+  xy: 459, 104
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unit-icon-dagger
   rotate: false
-  xy: 486, 195
+  xy: 526, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -4829,112 +4829,112 @@ unit-icon-titan
   index: -1
 item-biomatter
   rotate: false
-  xy: 893, 209
+  xy: 923, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 903, 219
+  xy: 933, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 913, 229
+  xy: 983, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 923, 239
+  xy: 943, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-dense-alloy
   rotate: false
-  xy: 933, 249
+  xy: 953, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 943, 255
+  xy: 963, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 953, 265
+  xy: 973, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 963, 275
+  xy: 913, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 893, 199
+  xy: 923, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 903, 209
+  xy: 933, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 913, 219
+  xy: 993, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 923, 229
+  xy: 943, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 933, 239
+  xy: 953, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 943, 245
+  xy: 963, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 953, 255
+  xy: 973, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 963, 255
+  xy: 993, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4962,14 +4962,14 @@ alpha-mech-leg
   index: -1
 delta-mech
   rotate: false
-  xy: 301, 37
+  xy: 331, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 315, 51
+  xy: 345, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -4981,58 +4981,65 @@ omega-mech
   orig: 14, 14
   offset: 0, 0
   index: -1
-omega-mech-base
+omega-mech-armor
   rotate: false
   xy: 255, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
-omega-mech-leg
+omega-mech-base
   rotate: false
   xy: 271, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
+omega-mech-leg
+  rotate: false
+  xy: 271, 33
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
 tau-mech
   rotate: false
-  xy: 779, 186
+  xy: 512, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 301, 51
+  xy: 317, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 halberd-ship
   rotate: false
-  xy: 357, 37
+  xy: 1005, 325
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 357, 37
+  xy: 1005, 325
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 javelin-ship
   rotate: false
-  xy: 385, 51
+  xy: 177, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-javelin-ship
   rotate: false
-  xy: 385, 51
+  xy: 177, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -5272,21 +5279,21 @@ icon-arrow-down
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 514, 197
+  xy: 570, 194
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 526, 197
+  xy: 582, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 538, 197
+  xy: 594, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5321,7 +5328,7 @@ icon-cancel
   index: -1
 icon-chat
   rotate: false
-  xy: 484, 183
+  xy: 606, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5335,21 +5342,21 @@ icon-check
   index: -1
 icon-crafting
   rotate: false
-  xy: 496, 183
+  xy: 618, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 481, 171
+  xy: 630, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 493, 171
+  xy: 642, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5370,7 +5377,7 @@ icon-discord
   index: -1
 icon-distribution
   rotate: false
-  xy: 508, 183
+  xy: 654, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5510,14 +5517,14 @@ icon-grid
   index: -1
 icon-hold
   rotate: false
-  xy: 505, 171
+  xy: 666, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 520, 185
+  xy: 481, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5538,7 +5545,7 @@ icon-host
   index: -1
 icon-info
   rotate: false
-  xy: 532, 185
+  xy: 493, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5552,14 +5559,14 @@ icon-itch.io
   index: -1
 icon-item
   rotate: false
-  xy: 544, 185
+  xy: 505, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 953, 275
+  xy: 903, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5580,7 +5587,7 @@ icon-link
   index: -1
 icon-liquid
   rotate: false
-  xy: 560, 194
+  xy: 517, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5622,7 +5629,7 @@ icon-locked
   index: -1
 icon-logic
   rotate: false
-  xy: 583, 192
+  xy: 529, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5636,7 +5643,7 @@ icon-map
   index: -1
 icon-menu
   rotate: false
-  xy: 595, 192
+  xy: 541, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5650,28 +5657,28 @@ icon-menu-large
   index: -1
 icon-missing
   rotate: false
-  xy: 607, 192
+  xy: 554, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 619, 192
+  xy: 553, 168
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 883, 199
+  xy: 913, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 631, 192
+  xy: 1007, 313
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5699,7 +5706,7 @@ icon-pick
   index: -1
 icon-play
   rotate: false
-  xy: 643, 192
+  xy: 1007, 301
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5713,21 +5720,21 @@ icon-play-2
   index: -1
 icon-players
   rotate: false
-  xy: 655, 192
+  xy: 1007, 289
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 667, 192
+  xy: 570, 182
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 481, 159
+  xy: 582, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5818,7 +5825,7 @@ icon-save-map
   index: -1
 icon-settings
   rotate: false
-  xy: 493, 159
+  xy: 594, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5839,14 +5846,14 @@ icon-tools
   index: -1
 icon-touch
   rotate: false
-  xy: 505, 159
+  xy: 606, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 556, 182
+  xy: 618, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5888,7 +5895,7 @@ icon-undo
   index: -1
 icon-units
   rotate: false
-  xy: 474, 147
+  xy: 630, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5902,7 +5909,7 @@ icon-unlocks
   index: -1
 icon-weapon
   rotate: false
-  xy: 474, 135
+  xy: 642, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6009,7 +6016,7 @@ scroll-knob-vertical-black
   index: -1
 selection
   rotate: false
-  xy: 177, 166
+  xy: 566, 287
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -6118,49 +6125,49 @@ dagger
   index: -1
 dagger-base
   rotate: false
-  xy: 287, 51
+  xy: 287, 35
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech-base
   rotate: false
-  xy: 287, 51
+  xy: 287, 35
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech-base
   rotate: false
-  xy: 287, 51
+  xy: 287, 35
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 287, 37
+  xy: 303, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech-leg
   rotate: false
-  xy: 287, 37
+  xy: 303, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 drone
   rotate: false
-  xy: 329, 51
+  xy: 373, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-drone
   rotate: false
-  xy: 329, 51
+  xy: 373, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -6181,14 +6188,14 @@ unit-icon-fabricator
   index: -1
 interceptor
   rotate: false
-  xy: 371, 37
+  xy: 191, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-interceptor
   rotate: false
-  xy: 371, 37
+  xy: 191, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -6209,7 +6216,7 @@ unit-icon-monsoon
   index: -1
 power-cell
   rotate: false
-  xy: 271, 33
+  xy: 287, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6251,35 +6258,35 @@ chain-blaster-equip
   index: -1
 flakgun-equip
   rotate: false
-  xy: 343, 51
+  xy: 1003, 367
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 343, 37
+  xy: 1003, 353
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 177, 17
+  xy: 486, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 191, 3
+  xy: 528, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 765, 186
+  xy: 498, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 7992acae42..c1b28754b9 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/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java
index f16ba68260..a846051623 100644
--- a/core/src/io/anuke/mindustry/content/Mechs.java
+++ b/core/src/io/anuke/mindustry/content/Mechs.java
@@ -1,12 +1,19 @@
 package io.anuke.mindustry.content;
 
 import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.utils.Array;
+import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.graphics.Palette;
+import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.type.ContentList;
 import io.anuke.mindustry.type.Mech;
 import io.anuke.mindustry.type.Upgrade;
+import io.anuke.ucore.core.Core;
+import io.anuke.ucore.core.Graphics;
+import io.anuke.ucore.core.Timers;
+import io.anuke.ucore.graphics.Draw;
 
 public class Mechs implements ContentList{
     public static Mech alpha, delta, tau, omega, dart, javelin, trident, halberd;
@@ -52,19 +59,61 @@ public class Mechs implements ContentList{
             armor = 30f;
         }};
 
-        omega = new Mech("omega-mech", false){{
-            drillPower = 2;
-            mineSpeed = 1.5f;
-            itemCapacity = 50;
-            speed = 0.36f;
-            boostSpeed = 0.6f;
-            shake = 4f;
-            weaponOffsetX = 1;
-            weaponOffsetY = 0;
-            weapon = Weapons.swarmer;
-            maxSpeed = 3.5f;
-            armor = 70f;
-        }};
+        omega = new Mech("omega-mech", false){
+            protected TextureRegion armorRegion;
+            {
+                drillPower = 2;
+                mineSpeed = 1.5f;
+                itemCapacity = 50;
+                speed = 0.36f;
+                boostSpeed = 0.6f;
+                shake = 4f;
+                weaponOffsetX = 1;
+                weaponOffsetY = 0;
+                weapon = Weapons.swarmer;
+                trailColorTo = Color.valueOf("feb380");
+                maxSpeed = 3.5f;
+                armor = 50f;
+            }
+
+            @Override
+            public float spreadX(Player player){
+                return player.altHeat*2f;
+            }
+
+            @Override
+            public void load(){
+                super.load();
+                armorRegion = Draw.region(name + "-armor");
+            }
+
+            @Override
+            public void updateAlt(Player player){
+                float scl = 1f - player.altHeat/2f;
+                player.getVelocity().scl(scl);
+            }
+
+            @Override
+            public float getExtraArmor(Player player){
+                return player.altHeat * 40f;
+            }
+
+            @Override
+            public void draw(Player player){
+                if(player.altHeat <= 0.01f) return;
+
+                float alpha = Core.batch.getColor().a;
+                Shaders.build.progress = player.altHeat;
+                Shaders.build.region = armorRegion;
+                Shaders.build.time = Timers.time() / 10f;
+                Shaders.build.color.set(Palette.accent).a = player.altHeat;
+                Graphics.shader(Shaders.build);
+                Draw.alpha(1f);
+                Draw.rect(armorRegion, player.snappedX(), player.snappedY(), player.rotation);
+                Graphics.shader(Shaders.mix);
+                Draw.color(1f, 1f, 1f, alpha);
+            }
+        };
 
         dart = new Mech("dart-ship", true){{
             drillPower = 1;
diff --git a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
index c9a220cced..c280e858d7 100644
--- a/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/MissileBullets.java
@@ -52,7 +52,7 @@ public class MissileBullets extends BulletList implements ContentList{
             }
         };
 
-        javelin = new MissileBulletType(2.5f, 10, "missile"){
+        javelin = new MissileBulletType(2.5f, 14, "missile"){
             {
                 bulletWidth = 8f;
                 bulletHeight = 8f;
@@ -60,22 +60,23 @@ public class MissileBullets extends BulletList implements ContentList{
                 drag = -0.02f;
                 keepVelocity = false;
                 splashDamageRadius = 25f;
-                splashDamage = 15f;
+                splashDamage = 11f;
                 lifetime = 90f;
                 hiteffect = BulletFx.blastExplosion;
                 despawneffect = BulletFx.blastExplosion;
             }
         };
 
-        swarm = new MissileBulletType(2.7f, 10, "missile"){
+        swarm = new MissileBulletType(2.7f, 14, "missile"){
             {
                 bulletWidth = 8f;
                 bulletHeight = 8f;
                 bulletShrink = 0f;
                 drag = -0.003f;
+                homingRange = 60f;
                 keepVelocity = false;
                 splashDamageRadius = 25f;
-                splashDamage = 15f;
+                splashDamage = 11f;
                 lifetime = 120f;
                 trailColor = Color.GRAY;
                 backColor = Palette.bulletYellowBack;
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index dd5ffdc074..b9df0167fb 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -159,7 +159,11 @@ public class Renderer extends RendererModule{
             Vector2 position = averagePosition();
 
             if(!mobile){
-                setCamera(position.x + 0.0001f, position.y + 0.0001f);
+                if(players[0].isDead()){
+                    smoothCamera(position.x + 0.0001f, position.y + 0.0001f, 0.08f);
+                }else{
+                    setCamera(position.x + 0.0001f, position.y + 0.0001f);
+                }
             }
 
             if(world.getSector() == null){
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 7fa674dd12..b6381e75d1 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -56,7 +56,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
     public String name = "name";
     public String uuid, usid;
     public boolean isAdmin, isTransferring, isShooting, isBoosting, isAlt, isMobile;
-    public float boostHeat;
+    public float boostHeat, altHeat;
     public boolean achievedFlight;
     public Color color = new Color();
     public Mech mech;
@@ -183,7 +183,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
     @Override
     public float getArmor(){
-        return mech.armor;
+        return mech.armor + mech.getExtraArmor(this);
     }
 
     @Override
@@ -210,7 +210,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
     public void damage(float amount){
         hitTime = hitDuration;
         if(!Net.client()){
-            health -= amount;
+            health -= calculateDamage(amount);
         }
 
         if(health <= 0 && !dead){
@@ -314,12 +314,14 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
         Draw.rect(mech.region, x, y, rotation - 90);
 
+        mech.draw(this);
+
         for(int i : Mathf.signs){
             float tra = rotation - 90, trY = -mech.weapon.getRecoil(this, i > 0) + mech.weaponOffsetY;
             float w = i > 0 ? -mech.weapon.equipRegion.getRegionWidth() : mech.weapon.equipRegion.getRegionWidth();
             Draw.rect(mech.weapon.equipRegion,
-                    x + Angles.trnsx(tra, mech.weaponOffsetX * i, trY),
-                    y + Angles.trnsy(tra, mech.weaponOffsetX * i, trY), w, mech.weapon.equipRegion.getRegionHeight(), rotation - 90);
+                    x + Angles.trnsx(tra, (mech.weaponOffsetX + mech.spreadX(this)) * i, trY),
+                    y + Angles.trnsy(tra, (mech.weaponOffsetX + mech.spreadX(this)) * i, trY), w, mech.weapon.equipRegion.getRegionHeight(), rotation - 90);
         }
 
         float backTrns = 4f, itemSize = 5f;
@@ -366,11 +368,11 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         }
     }
 
-    float snappedX(){
+    public float snappedX(){
         return snapCamera && isLocal ? (int) (x + 0.0001f) : x;
     }
 
-    float snappedY(){
+    public float snappedY(){
         return snapCamera && isLocal ? (int) (y + 0.0001f) : y;
     }
 
@@ -489,8 +491,11 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
     protected void updateMech(){
         Tile tile = world.tileWorld(x, y);
 
+        altHeat = Mathf.lerpDelta(altHeat, isAlt ? 1f : 0f, mech.altChargeAlpha);
         boostHeat = Mathf.lerpDelta(boostHeat, isBoosting && ((!movement.isZero() && moved) || !isLocal) ? 1f : 0f, 0.08f);
 
+        mech.updateAlt(this);
+
         if(boostHeat > liftoffBoost + 0.1f){
             achievedFlight = true;
         }
@@ -505,7 +510,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
             achievedFlight = false;
         }
 
-        isBoosting = Inputs.keyDown("dash") && !mech.flying;
+        isBoosting = Inputs.keyDown("dash") && !mech.flying && !isAlt;
         isAlt = Inputs.keyDown("ability") && !mech.flying;
 
         //if player is in solid block
@@ -771,7 +776,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
     public void write(DataOutput buffer) throws IOException{
         super.writeSave(buffer, !isLocal);
         buffer.writeUTF(name); //TODO writing strings is very inefficient
-        buffer.writeByte(Bits.toByte(isAdmin) | (Bits.toByte(dead) << 1) | (Bits.toByte(isBoosting) << 2));
+        buffer.writeByte(Bits.toByte(isAdmin) | (Bits.toByte(dead) << 1) | (Bits.toByte(isBoosting) << 2)| (Bits.toByte(isAlt) << 3));
         buffer.writeInt(Color.rgba8888(color));
         buffer.writeByte(mech.id);
         buffer.writeInt(mining == null ? -1 : mining.packedPosition());
@@ -790,6 +795,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         isAdmin = (bools & 1) != 0;
         dead = (bools & 2) != 0;
         boolean boosting = (bools & 4) != 0;
+        boolean alt = (bools & 8) != 0;
         color.set(buffer.readInt());
         mech = Upgrade.getByID(buffer.readByte());
         int mine = buffer.readInt();
@@ -807,6 +813,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         }else{
             mining = world.tile(mine);
             isBoosting = boosting;
+            isAlt = alt;
         }
     }
 
diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
index 89630c4a8e..d21d2feb06 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
@@ -88,14 +88,13 @@ public class BlockRenderer{
 
         int shadowW = rangex * tilesize*2, shadowH = rangey * tilesize*2;
 
-        if(shadows.width() != shadowW || shadows.height() != shadowH){
-            shadows.setSize(shadowW, shadowH);
-        }
-
         teamChecks.clear();
         requestidx = 0;
 
         Graphics.end();
+        if(shadows.width() != shadowW || shadows.height() != shadowH){
+            shadows.setSize(shadowW, shadowH);
+        }
         Core.batch.getProjectionMatrix().setToOrtho2D(Mathf.round(Core.camera.position.x, tilesize)-shadowW/2f, Mathf.round(Core.camera.position.y, tilesize)-shadowH/2f, shadowW, shadowH);
         Graphics.surface(shadows);
 
diff --git a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java
index cef9551c16..9f65e7d3be 100644
--- a/core/src/io/anuke/mindustry/input/DefaultKeybinds.java
+++ b/core/src/io/anuke/mindustry/input/DefaultKeybinds.java
@@ -24,7 +24,7 @@ public class DefaultKeybinds{
                     //"shoot", Input.MOUSE_LEFT,
                     "rotate", new Axis(Input.SCROLL),
                     "dash", Input.SHIFT_LEFT,
-                    "ability", Input.SPACE,
+                    "ability", Input.CONTROL_LEFT,
                     "drop_unit", Input.SHIFT_LEFT,
                     new Category("view"),
                     "zoom_hold", Input.CONTROL_LEFT,
diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java
index 504b2f21f0..7a52b01b95 100644
--- a/core/src/io/anuke/mindustry/type/Mech.java
+++ b/core/src/io/anuke/mindustry/type/Mech.java
@@ -3,6 +3,7 @@ package io.anuke.mindustry.type;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import io.anuke.mindustry.content.Weapons;
+import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.ui.ContentDisplay;
@@ -21,6 +22,7 @@ public class Mech extends Upgrade implements UnlockableContent{
     public float shake = 0f;
     public float armor = 1f;
 
+    public float altChargeAlpha = 0.1f;
     public float mineSpeed = 1f;
     public int drillPower = -1;
     public float carryWeight = 10f;
@@ -30,7 +32,6 @@ public class Mech extends Upgrade implements UnlockableContent{
     public int itemCapacity = 30;
 
     public float weaponOffsetX, weaponOffsetY;
-
     public Weapon weapon = Weapons.blaster;
 
     public TextureRegion baseRegion, legRegion, region, iconRegion;
@@ -40,6 +41,18 @@ public class Mech extends Upgrade implements UnlockableContent{
         this.flying = flying;
     }
 
+    public void updateAlt(Player player){}
+
+    public void draw(Player player){}
+
+    public float getExtraArmor(Player player){
+        return 0f;
+    }
+
+    public float spreadX(Player player){
+        return 0f;
+    }
+
     @Override
     public void displayInfo(Table table){
         ContentDisplay.displayMech(table, this);
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
index bcbebc69e3..50e9a1022d 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.blocks.storage;
 
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
-import com.badlogic.gdx.math.Rectangle;
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
 import io.anuke.mindustry.Vars;
@@ -38,12 +37,6 @@ import java.io.IOException;
 import static io.anuke.mindustry.Vars.*;
 
 public class CoreBlock extends StorageBlock{
-    private static Rectangle rect = new Rectangle();
-
-    protected int timerSupply = timers++;
-
-    protected float supplyRadius = 50f;
-    protected float supplyInterval = 5f;
     protected float droneRespawnDuration = 60 * 6;
     protected UnitType droneType = UnitTypes.drone;
 
@@ -164,13 +157,6 @@ public class CoreBlock extends StorageBlock{
         return tile.entity.items.get(item) < itemCapacity && item.type == ItemType.material;
     }
 
-    @Override
-    public void drawSelect(Tile tile){
-        Draw.color(Palette.accent);
-        Lines.dashCircle(tile.drawx(), tile.drawy(), supplyRadius);
-        Draw.color();
-    }
-
     @Override
     public void onDestroyed(Tile tile){
         //TODO more dramatic effects