diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill.png b/core/assets-raw/sprites/blocks/drills/blast-drill.png
index a1f5d3765f..48de6544b7 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill.png and b/core/assets-raw/sprites/blocks/drills/blast-drill.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 67aa9528da..6d5ea2167c 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -419,6 +419,9 @@ text.item.radioactivity=[LIGHT_GRAY]Radioactivity: {0}
 text.item.fluxiness=[LIGHT_GRAY]Flux Power: {0}
 text.item.hardness=[LIGHT_GRAY]Hardness: {0}
 
+text.unit.health=[LIGHT_GRAY]Health: {0}
+text.unit.speed=[LIGHT_GRAY]Speed: {0}
+
 text.liquid.heatcapacity=[LIGHT_GRAY]Heat Capacity: {0}
 text.liquid.viscosity=[LIGHT_GRAY]Viscosity: {0}
 text.liquid.temperature=[LIGHT_GRAY]Temperature: {0}
@@ -520,4 +523,16 @@ block.rotary-pump.name=Rotary Pump
 block.nuclear-reactor.name=Nuclear Reactor
 block.interceptor-factory.name=Interceptor Factory
 block.command-center.name=Command Center
-block.mass-driver.name=Mass Driver
\ No newline at end of file
+block.mass-driver.name=Mass Driver
+block.blast-drill.name=Blast Drill
+
+unit.drone.name=Drone
+unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks.
+unit.fabricator.name=Fabricator
+unit.fabricator.description=An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone.
+unit.scout.name=Scout
+unit.scout.description=A basic ground unit. Uses tungsten as ammo.
+unit.titan.name=Titan
+unit.titan.description=An advanced armored ground unit. Uses carbide as ammo. Attacks both ground and air targets.
+unit.monsoon.name=Monsoon
+unit.monsoon.description=A heavy carpet bomber. Uses blast compound or pyratite as ammo.
\ No newline at end of file
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 2beb827812..ed2fb53b89 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,427 +13,420 @@ background
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 974, 348
+  xy: 877, 327
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 984, 348
+  xy: 877, 317
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 994, 348
+  xy: 877, 307
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 557, 189
+  xy: 797, 242
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 567, 189
+  xy: 807, 252
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 487, 179
+  xy: 807, 242
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 497, 179
+  xy: 809, 232
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 507, 179
+  xy: 809, 222
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 517, 179
+  xy: 809, 212
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 527, 179
+  xy: 809, 202
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 537, 179
+  xy: 809, 192
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 547, 179
+  xy: 809, 182
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 557, 179
+  xy: 847, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 567, 179
+  xy: 857, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 577, 189
+  xy: 867, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 577, 179
+  xy: 877, 297
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 587, 196
+  xy: 887, 297
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 597, 196
+  xy: 895, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 587, 186
+  xy: 905, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 607, 196
+  xy: 915, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 597, 186
+  xy: 925, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 617, 196
+  xy: 935, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 511, 109
+  xy: 829, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 521, 119
+  xy: 829, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 531, 129
+  xy: 829, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 541, 139
+  xy: 829, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 521, 109
+  xy: 892, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 531, 119
+  xy: 902, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 541, 129
+  xy: 912, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 551, 139
+  xy: 922, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 531, 109
+  xy: 932, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 541, 119
+  xy: 942, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 551, 129
+  xy: 952, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 561, 139
+  xy: 962, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 541, 109
+  xy: 972, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 551, 119
+  xy: 982, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 561, 129
+  xy: 992, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 571, 139
+  xy: 1002, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 551, 109
+  xy: 827, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 561, 119
+  xy: 827, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 571, 129
+  xy: 1012, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-mass-driver
+mass-driver-turret
   rotate: false
   xy: 587, 232
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-mass-driver-turret
-  rotate: false
-  xy: 613, 232
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 641, 166
+  xy: 445, 19
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 582, 156
+  xy: 419, 9
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 592, 156
+  xy: 429, 9
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 warp-gate-top
   rotate: false
-  xy: 717, 205
+  xy: 717, 231
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-drill
   rotate: false
-  xy: 953, 419
+  xy: 925, 419
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-drill-rim
   rotate: false
-  xy: 713, 319
+  xy: 951, 419
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-drill-rotator
   rotate: false
-  xy: 739, 328
+  xy: 713, 319
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-drill-top
   rotate: false
-  xy: 765, 330
+  xy: 739, 328
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 carbide-drill
   rotate: false
-  xy: 1004, 348
+  xy: 887, 327
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-rotator
   rotate: false
-  xy: 1014, 348
+  xy: 887, 317
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-top
   rotate: false
-  xy: 800, 262
+  xy: 887, 307
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laser-drill
   rotate: false
-  xy: 761, 202
+  xy: 885, 401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laser-drill-rotator
   rotate: false
-  xy: 429, 104
+  xy: 903, 401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laser-drill-top
   rotate: false
-  xy: 447, 104
+  xy: 921, 401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 oil-extractor
   rotate: false
-  xy: 639, 206
+  xy: 613, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-liquid
   rotate: false
-  xy: 665, 231
+  xy: 639, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-rotator
   rotate: false
-  xy: 665, 205
+  xy: 665, 231
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-top
   rotate: false
-  xy: 691, 231
+  xy: 665, 205
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -468,49 +461,49 @@ plasma-drill-top
   index: -1
 tungsten-drill
   rotate: false
-  xy: 581, 126
+  xy: 839, 237
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-rotator
   rotate: false
-  xy: 591, 136
+  xy: 839, 227
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-top
   rotate: false
-  xy: 581, 116
+  xy: 839, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-extractor
   rotate: false
-  xy: 360, 63
+  xy: 288, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 378, 63
+  xy: 306, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 177, 45
+  xy: 324, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 195, 45
+  xy: 342, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -552,581 +545,581 @@ block-icon-blackstone
   index: -1
 blackstone2
   rotate: false
-  xy: 181, 1
+  xy: 831, 388
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 387, 37
+  xy: 841, 388
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstoneedge
   rotate: false
-  xy: 572, 244
+  xy: 977, 431
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 800, 252
+  xy: 985, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 799, 242
+  xy: 985, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 799, 232
+  xy: 995, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 647, 196
+  xy: 903, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 637, 186
+  xy: 913, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirtedge
   rotate: false
-  xy: 287, 1
+  xy: 209, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 generic-cliff-edge
   rotate: false
-  xy: 647, 176
+  xy: 907, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 647, 176
+  xy: 907, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 657, 195
+  xy: 897, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 657, 195
+  xy: 897, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-2
   rotate: false
-  xy: 657, 185
+  xy: 907, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 657, 185
+  xy: 907, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-side
   rotate: false
-  xy: 667, 195
+  xy: 917, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 667, 195
+  xy: 917, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 677, 185
+  xy: 917, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 687, 195
+  xy: 927, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 687, 185
+  xy: 907, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 697, 195
+  xy: 917, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 667, 185
+  xy: 897, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 677, 195
+  xy: 907, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 355, 17
+  xy: 279, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 697, 185
+  xy: 927, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 707, 195
+  xy: 937, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iceedge
   rotate: false
-  xy: 343, 3
+  xy: 307, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 707, 185
+  xy: 917, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 717, 195
+  xy: 927, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 717, 195
+  xy: 927, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 717, 185
+  xy: 937, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 717, 185
+  xy: 937, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lavaedge
   rotate: false
-  xy: 975, 392
+  xy: 349, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 797, 192
+  xy: 917, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 797, 182
+  xy: 927, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 737, 172
+  xy: 937, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 857, 358
+  xy: 977, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 857, 348
+  xy: 987, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 867, 359
+  xy: 997, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 877, 359
+  xy: 1007, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 867, 349
+  xy: 977, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalflooredge
   rotate: false
-  xy: 385, 3
+  xy: 391, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 oiledge
   rotate: false
-  xy: 1003, 378
+  xy: 405, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 881, 279
+  xy: 802, 277
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 842, 282
+  xy: 822, 297
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 842, 272
+  xy: 822, 287
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandedge
   rotate: false
-  xy: 811, 317
+  xy: 401, 36
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 839, 202
+  xy: 820, 267
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 850, 262
+  xy: 830, 267
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 850, 252
+  xy: 842, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowedge
   rotate: false
-  xy: 825, 302
+  xy: 429, 54
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 424, 38
+  xy: 429, 40
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 501, 139
+  xy: 872, 277
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 511, 139
+  xy: 882, 277
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 501, 129
+  xy: 819, 237
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 511, 129
+  xy: 819, 227
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 857, 182
+  xy: 872, 287
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 857, 172
+  xy: 882, 287
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneedge
   rotate: false
-  xy: 438, 38
+  xy: 443, 54
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 521, 139
+  xy: 819, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 501, 119
+  xy: 819, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 511, 119
+  xy: 819, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 521, 129
+  xy: 819, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 531, 139
+  xy: 829, 237
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 501, 109
+  xy: 829, 227
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten1
   rotate: false
-  xy: 571, 119
+  xy: 837, 257
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten2
   rotate: false
-  xy: 571, 109
+  xy: 837, 247
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten3
   rotate: false
-  xy: 581, 136
+  xy: 840, 267
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 591, 126
+  xy: 839, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 601, 136
+  xy: 839, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 591, 116
+  xy: 839, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 601, 126
+  xy: 837, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 466, 38
+  xy: 457, 54
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 954, 373
+  xy: 782, 282
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 964, 373
+  xy: 792, 292
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 964, 373
+  xy: 792, 292
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 914, 353
+  xy: 847, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 914, 353
+  xy: 847, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 924, 353
+  xy: 857, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 934, 353
+  xy: 867, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 569, 199
+  xy: 1005, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 607, 186
+  xy: 945, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-2
   rotate: false
-  xy: 285, 117
+  xy: 831, 398
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1147,84 +1140,84 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 637, 176
+  xy: 897, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 nuclearreactor-shadow
   rotate: false
-  xy: 845, 417
+  xy: 765, 356
   size: 26, 26
   orig: 26, 26
   offset: 0, 0
   index: -1
 place-arrow
   rotate: false
-  xy: 602, 156
+  xy: 439, 9
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 612, 156
+  xy: 449, 9
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ripples
   rotate: false
-  xy: 483, 16
+  xy: 811, 307
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 rubble-1-0
   rotate: false
-  xy: 427, 68
+  xy: 779, 238
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-1-1
   rotate: false
-  xy: 445, 68
+  xy: 427, 68
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-0
   rotate: false
-  xy: 463, 68
+  xy: 445, 68
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-1
   rotate: false
-  xy: 481, 68
+  xy: 463, 68
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-3-0
   rotate: false
-  xy: 710, 283
+  xy: 702, 257
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rubble-3-1
   rotate: false
-  xy: 710, 283
+  xy: 702, 257
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 shadow-1
   rotate: false
-  xy: 858, 369
+  xy: 835, 307
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1238,7 +1231,7 @@ shadow-2
   index: -1
 shadow-3
   rotate: false
-  xy: 873, 417
+  xy: 845, 417
   size: 26, 26
   orig: 26, 26
   offset: 0, 0
@@ -1266,14 +1259,14 @@ shadow-6
   index: -1
 shadow-corner
   rotate: false
-  xy: 870, 369
+  xy: 993, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 shadow-round-1
   rotate: false
-  xy: 882, 369
+  xy: 1005, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1294,154 +1287,154 @@ shadow-rounded-2
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 944, 353
+  xy: 857, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 954, 353
+  xy: 867, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 964, 353
+  xy: 867, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 489, 199
+  xy: 1015, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 499, 199
+  xy: 995, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 509, 199
+  xy: 1005, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 519, 199
+  xy: 1015, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 529, 199
+  xy: 1005, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 539, 199
+  xy: 1015, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 549, 199
+  xy: 985, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 559, 199
+  xy: 995, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 487, 189
+  xy: 1015, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 497, 189
+  xy: 462, 21
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 507, 189
+  xy: 483, 16
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 517, 189
+  xy: 493, 16
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 527, 189
+  xy: 503, 17
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 537, 189
+  xy: 800, 262
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 547, 189
+  xy: 797, 252
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router
   rotate: false
-  xy: 797, 172
+  xy: 987, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 807, 192
+  xy: 977, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 807, 182
+  xy: 987, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 807, 172
+  xy: 997, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1469,70 +1462,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 611, 166
+  xy: 817, 162
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 621, 166
+  xy: 425, 19
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 631, 166
+  xy: 435, 19
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 622, 156
+  xy: 459, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 632, 156
+  xy: 459, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 642, 156
+  xy: 469, 4
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 582, 146
+  xy: 479, 4
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 592, 146
+  xy: 489, 6
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 602, 146
+  xy: 499, 6
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 612, 146
+  xy: 509, 7
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1553,14 +1546,14 @@ block-icon-battery
   index: -1
 battery-large
   rotate: false
-  xy: 927, 419
+  xy: 899, 419
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-battery-large
   rotate: false
-  xy: 927, 419
+  xy: 899, 419
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1623,42 +1616,42 @@ fusion-reactor-top
   index: -1
 nuclear-reactor-center
   rotate: false
-  xy: 587, 206
+  xy: 639, 232
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 nuclear-reactor-lights
   rotate: false
-  xy: 613, 206
+  xy: 587, 206
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 891, 279
+  xy: 812, 287
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 turbine-generator-top
   rotate: false
-  xy: 324, 63
+  xy: 252, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 alloy-fuser
   rotate: false
-  xy: 901, 419
+  xy: 873, 419
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-alloy-fuser
   rotate: false
-  xy: 901, 419
+  xy: 873, 419
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1721,161 +1714,161 @@ biomattercompressor-frame0
   index: -1
 biomattercompressor-frame1
   rotate: false
-  xy: 427, 158
+  xy: 977, 413
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-frame2
   rotate: false
-  xy: 445, 158
+  xy: 995, 419
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-liquid
   rotate: false
-  xy: 420, 140
+  xy: 995, 401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-top
   rotate: false
-  xy: 438, 140
+  xy: 427, 158
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 blast-mixer
   rotate: false
-  xy: 757, 310
+  xy: 445, 158
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-blast-mixer
   rotate: false
-  xy: 757, 310
+  xy: 445, 158
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 centrifuge-liquid
   rotate: false
-  xy: 249, 117
+  xy: 465, 122
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 303, 117
+  xy: 849, 399
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 321, 117
+  xy: 175, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 339, 117
+  xy: 175, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 357, 117
+  xy: 193, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 375, 117
+  xy: 193, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 393, 117
+  xy: 211, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 lavasmelter
   rotate: false
-  xy: 787, 182
+  xy: 907, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 861, 298
+  xy: 1007, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-weaver
   rotate: false
-  xy: 465, 104
+  xy: 939, 401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 phase-weaver-bottom
   rotate: false
-  xy: 483, 104
+  xy: 957, 401
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 phase-weaver-weave
   rotate: false
-  xy: 427, 86
+  xy: 975, 395
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 plastanium-compressor-top
   rotate: false
-  xy: 445, 86
+  xy: 773, 220
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 poweralloysmelter-top
   rotate: false
-  xy: 463, 86
+  xy: 773, 202
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 622, 146
+  xy: 802, 297
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 632, 146
+  xy: 802, 287
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 839, 222
+  xy: 832, 277
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1896,49 +1889,49 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 849, 202
+  xy: 862, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 934, 373
+  xy: 782, 292
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 944, 373
+  xy: 792, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-2
   rotate: false
-  xy: 754, 292
+  xy: 420, 140
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-2-top
   rotate: false
-  xy: 754, 274
+  xy: 438, 140
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-3
   rotate: false
-  xy: 586, 284
+  xy: 765, 330
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-3-top
   rotate: false
-  xy: 612, 284
+  xy: 586, 284
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1959,14 +1952,14 @@ block-4-top
   index: -1
 arc
   rotate: false
-  xy: 197, 1
+  xy: 1013, 425
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 arc-heat
   rotate: false
-  xy: 209, 1
+  xy: 1013, 413
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1980,7 +1973,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 627, 176
+  xy: 897, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2001,35 +1994,35 @@ spectre
   index: -1
 hail
   rotate: false
-  xy: 975, 406
+  xy: 483, 56
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scatter
   rotate: false
-  xy: 975, 406
+  xy: 483, 56
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 hail-heat
   rotate: false
-  xy: 805, 331
+  xy: 413, 24
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 lancer
   rotate: false
-  xy: 761, 238
+  xy: 481, 86
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 761, 220
+  xy: 867, 399
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2043,182 +2036,182 @@ meltdown
   index: -1
 ripple
   rotate: false
-  xy: 691, 205
+  xy: 691, 231
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ripple-heat
   rotate: false
-  xy: 702, 257
+  xy: 691, 205
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 salvo
   rotate: false
-  xy: 180, 63
+  xy: 481, 68
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-heat
   rotate: false
-  xy: 198, 63
+  xy: 791, 220
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-panel-left
   rotate: false
-  xy: 216, 63
+  xy: 791, 202
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-panel-right
   rotate: false
-  xy: 234, 63
+  xy: 791, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 495, 16
+  xy: 823, 307
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 846, 368
+  xy: 835, 319
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 swarmer
   rotate: false
-  xy: 252, 63
+  xy: 180, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 177, 27
+  xy: 360, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 213, 45
+  xy: 378, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-factory-top
   rotate: false
-  xy: 465, 122
+  xy: 247, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-factory-top-open
   rotate: false
-  xy: 483, 122
+  xy: 247, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-factory-top
   rotate: false
-  xy: 175, 99
+  xy: 265, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-factory-top-open
   rotate: false
-  xy: 175, 81
+  xy: 265, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 interceptor-factory-top
   rotate: false
-  xy: 743, 220
+  xy: 427, 86
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 interceptor-factory-top-open
   rotate: false
-  xy: 743, 202
+  xy: 445, 86
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 mech-factory
   rotate: false
-  xy: 639, 232
+  xy: 613, 232
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 dart-ship-factory-open
   rotate: false
-  xy: 411, 116
+  xy: 211, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 delta-mech-factory-open
   rotate: false
-  xy: 429, 122
+  xy: 229, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 javelin-ship-factory-open
   rotate: false
-  xy: 762, 256
+  xy: 463, 86
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 reconstructor-open
   rotate: false
-  xy: 481, 86
+  xy: 773, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 repair-point-turret
   rotate: false
-  xy: 642, 146
+  xy: 812, 297
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ship-factory
   rotate: false
-  xy: 717, 231
+  xy: 710, 283
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 door-large-open
   rotate: false
-  xy: 447, 122
+  xy: 229, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 617, 176
+  xy: 963, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2253,14 +2246,14 @@ bullet
   index: -1
 bullet-back
   rotate: false
-  xy: 987, 406
+  xy: 429, 29
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 casing
   rotate: false
-  xy: 827, 410
+  xy: 991, 431
   size: 2, 4
   orig: 2, 4
   offset: 0, 0
@@ -2274,21 +2267,21 @@ clear
   index: -1
 command-attack
   rotate: false
-  xy: 799, 222
+  xy: 985, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-idle
   rotate: false
-  xy: 799, 212
+  xy: 995, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-retreat
   rotate: false
-  xy: 799, 202
+  xy: 1005, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2302,7 +2295,7 @@ enemyarrow
   index: -1
 error
   rotate: false
-  xy: 315, 1
+  xy: 237, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -2337,77 +2330,77 @@ minelaser
   index: -1
 minelaser-end
   rotate: false
-  xy: 811, 388
+  xy: 717, 211
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 missile
   rotate: false
-  xy: 998, 406
+  xy: 440, 29
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 397, 46
+  xy: 451, 29
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 scorch1
   rotate: false
-  xy: 979, 418
+  xy: 819, 361
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 819, 361
+  xy: 418, 168
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 418, 168
+  xy: 411, 134
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 411, 134
+  xy: 166, 80
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 166, 80
+  xy: 828, 361
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 shell
   rotate: false
-  xy: 411, 1
+  xy: 462, 31
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 422, 1
+  xy: 495, 57
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 839, 212
+  xy: 810, 267
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2421,7 +2414,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 561, 109
+  xy: 827, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2435,28 +2428,28 @@ transfer-end
   index: -1
 blackstone-cliff-edge
   rotate: false
-  xy: 894, 371
+  xy: 772, 300
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-1
   rotate: false
-  xy: 904, 373
+  xy: 772, 290
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-2
   rotate: false
-  xy: 914, 373
+  xy: 772, 280
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-side
   rotate: false
-  xy: 924, 373
+  xy: 782, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2470,168 +2463,168 @@ block-icon-arc
   index: -1
 block-icon-biomattercompressor
   rotate: false
-  xy: 775, 312
+  xy: 757, 310
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-blast-drill
   rotate: false
-  xy: 638, 284
+  xy: 612, 284
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 847, 358
+  xy: 792, 282
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 847, 358
+  xy: 792, 282
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 847, 348
+  xy: 885, 377
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 847, 348
+  xy: 885, 377
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-drill
   rotate: false
-  xy: 974, 368
+  xy: 885, 367
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-wall
   rotate: false
-  xy: 984, 368
+  xy: 895, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-wall
   rotate: false
-  xy: 984, 368
+  xy: 895, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-wall-large
   rotate: false
-  xy: 456, 140
+  xy: 754, 292
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 carbide-wall-large
   rotate: false
-  xy: 456, 140
+  xy: 754, 292
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-centrifuge
   rotate: false
-  xy: 463, 158
+  xy: 754, 274
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 centrifuge
   rotate: false
-  xy: 463, 158
+  xy: 754, 274
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 994, 368
+  xy: 895, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 994, 368
+  xy: 895, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-command-center
   rotate: false
-  xy: 474, 140
+  xy: 775, 312
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 command-center
   rotate: false
-  xy: 474, 140
+  xy: 775, 312
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 1004, 368
+  xy: 905, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 772, 300
+  xy: 905, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 772, 300
+  xy: 905, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-core
   rotate: false
-  xy: 684, 283
+  xy: 638, 284
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 core
   rotate: false
-  xy: 684, 283
+  xy: 638, 284
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-cryofluidmixer
   rotate: false
-  xy: 831, 398
+  xy: 456, 140
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-cultivator
   rotate: false
-  xy: 849, 399
+  xy: 463, 158
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2645,189 +2638,189 @@ block-icon-cyclone
   index: -1
 block-icon-dart-ship-factory
   rotate: false
-  xy: 867, 399
+  xy: 474, 140
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dart-ship-factory
   rotate: false
-  xy: 867, 399
+  xy: 474, 140
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 772, 290
+  xy: 915, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 772, 290
+  xy: 915, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall
   rotate: false
-  xy: 772, 280
+  xy: 915, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 772, 280
+  xy: 915, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 772, 280
+  xy: 915, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 772, 280
+  xy: 915, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall-large
   rotate: false
-  xy: 885, 399
+  xy: 717, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 deflector-wall-large
   rotate: false
-  xy: 885, 399
+  xy: 717, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 phase-wall-large
   rotate: false
-  xy: 885, 399
+  xy: 717, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-phase-wall-large
   rotate: false
-  xy: 885, 399
+  xy: 717, 193
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-delta-mech-factory
   rotate: false
-  xy: 903, 401
+  xy: 737, 213
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 delta-mech-factory
   rotate: false
-  xy: 903, 401
+  xy: 737, 213
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 782, 302
+  xy: 925, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 782, 302
+  xy: 925, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-distributor
   rotate: false
-  xy: 921, 401
+  xy: 793, 344
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 distributor
   rotate: false
-  xy: 921, 401
+  xy: 793, 344
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-door
   rotate: false
-  xy: 782, 292
+  xy: 925, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 782, 292
+  xy: 925, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-door-large
   rotate: false
-  xy: 939, 401
+  xy: 793, 312
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-large
   rotate: false
-  xy: 939, 401
+  xy: 793, 312
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-drone-factory
   rotate: false
-  xy: 957, 401
+  xy: 811, 343
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-drop-point
   rotate: false
-  xy: 792, 302
+  xy: 935, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 drop-point
   rotate: false
-  xy: 792, 302
+  xy: 935, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-duo
   rotate: false
-  xy: 221, 1
+  xy: 1013, 401
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 block-icon-fabricator-factory
   rotate: false
-  xy: 831, 380
+  xy: 829, 343
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2848,14 +2841,14 @@ block-icon-fusion-reactor
   index: -1
 block-icon-grass
   rotate: false
-  xy: 792, 292
+  xy: 935, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 792, 292
+  xy: 935, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2869,105 +2862,105 @@ block-icon-hail
   index: -1
 block-icon-ice
   rotate: false
-  xy: 782, 282
+  xy: 945, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 782, 282
+  xy: 945, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 792, 282
+  xy: 945, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 792, 282
+  xy: 945, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 1014, 368
+  xy: 955, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 1014, 368
+  xy: 955, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-interceptor-factory
   rotate: false
-  xy: 849, 381
+  xy: 177, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 499, 94
+  xy: 955, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 499, 94
+  xy: 955, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 499, 84
+  xy: 965, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 499, 84
+  xy: 965, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-javelin-ship-factory
   rotate: false
-  xy: 867, 381
+  xy: 195, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 javelin-ship-factory
   rotate: false
-  xy: 867, 381
+  xy: 195, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-junction
   rotate: false
-  xy: 499, 74
+  xy: 965, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 499, 74
+  xy: 965, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2981,84 +2974,91 @@ block-icon-lancer
   index: -1
 block-icon-laser-drill
   rotate: false
-  xy: 885, 381
+  xy: 213, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-lava
   rotate: false
-  xy: 851, 322
+  xy: 885, 357
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 851, 322
+  xy: 885, 357
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 851, 312
+  xy: 895, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 851, 312
+  xy: 895, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 851, 302
+  xy: 905, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-tank
   rotate: false
-  xy: 177, 135
+  xy: 684, 283
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 851, 292
+  xy: 915, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 851, 292
+  xy: 915, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-mass-driver
   rotate: false
-  xy: 737, 354
-  size: 26, 26
-  orig: 26, 26
+  xy: 177, 135
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+mass-driver
+  rotate: false
+  xy: 177, 135
+  size: 24, 24
+  orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 481, 4
+  xy: 925, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 481, 4
+  xy: 925, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3072,28 +3072,28 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 491, 6
+  xy: 935, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 491, 6
+  xy: 935, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 501, 6
+  xy: 945, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 501, 6
+  xy: 945, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3114,14 +3114,14 @@ nuclear-reactor
   index: -1
 block-icon-oil
   rotate: false
-  xy: 894, 361
+  xy: 955, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 894, 361
+  xy: 955, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3135,49 +3135,49 @@ block-icon-oil-extractor
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 904, 363
+  xy: 965, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 904, 363
+  xy: 965, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 914, 363
+  xy: 883, 347
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 914, 363
+  xy: 883, 347
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 924, 363
+  xy: 883, 337
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 924, 363
+  xy: 883, 337
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-weaver
   rotate: false
-  xy: 903, 383
+  xy: 231, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3191,210 +3191,210 @@ block-icon-plasma-drill
   index: -1
 block-icon-plastanium-compressor
   rotate: false
-  xy: 921, 383
+  xy: 249, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 plastanium-compressor
   rotate: false
-  xy: 921, 383
+  xy: 249, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 934, 363
+  xy: 975, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 934, 363
+  xy: 975, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-power-node-large
   rotate: false
-  xy: 939, 383
+  xy: 267, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 power-node-large
   rotate: false
-  xy: 939, 383
+  xy: 267, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 944, 363
+  xy: 975, 375
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 944, 363
+  xy: 975, 375
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 954, 363
+  xy: 975, 365
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 954, 363
+  xy: 975, 365
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 964, 363
+  xy: 975, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 974, 358
+  xy: 469, 44
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pyratite-mixer
   rotate: false
-  xy: 957, 383
+  xy: 285, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 pyratite-mixer
   rotate: false
-  xy: 957, 383
+  xy: 285, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-reconstructor
   rotate: false
-  xy: 828, 362
+  xy: 303, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-factory
   rotate: false
-  xy: 828, 362
+  xy: 303, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-factory
   rotate: false
-  xy: 828, 362
+  xy: 303, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 interceptor-factory
   rotate: false
-  xy: 828, 362
+  xy: 303, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 reconstructor
   rotate: false
-  xy: 828, 362
+  xy: 303, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 984, 358
+  xy: 479, 46
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 984, 358
+  xy: 479, 46
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-resupply-point
   rotate: false
-  xy: 994, 358
+  xy: 489, 46
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupply-point
   rotate: false
-  xy: 994, 358
+  xy: 489, 46
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-ripple
   rotate: false
-  xy: 765, 356
+  xy: 737, 354
   size: 26, 26
   orig: 26, 26
   offset: 0, 0
   index: -1
 block-icon-rock
   rotate: false
-  xy: 1004, 358
+  xy: 499, 47
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 1004, 358
+  xy: 499, 47
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-rotary-pump
   rotate: false
-  xy: 793, 344
+  xy: 321, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rotary-pump
   rotate: false
-  xy: 793, 344
+  xy: 321, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 1014, 358
+  xy: 473, 34
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 1014, 358
+  xy: 473, 34
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3408,105 +3408,105 @@ block-icon-salvo
   index: -1
 block-icon-sand
   rotate: false
-  xy: 782, 272
+  xy: 483, 36
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 782, 272
+  xy: 483, 36
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 396, 57
+  xy: 457, 42
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 792, 272
+  xy: 493, 36
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 792, 272
+  xy: 493, 36
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 780, 262
+  xy: 503, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 780, 262
+  xy: 503, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-silicon-smelter
   rotate: false
-  xy: 793, 312
+  xy: 339, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 silicon-smelter
   rotate: false
-  xy: 793, 312
+  xy: 339, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 790, 262
+  xy: 473, 24
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 790, 262
+  xy: 473, 24
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 780, 252
+  xy: 483, 26
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 780, 252
+  xy: 483, 26
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 790, 252
+  xy: 493, 26
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 790, 252
+  xy: 493, 26
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3527,42 +3527,42 @@ solar-panel-large
   index: -1
 block-icon-solidifer
   rotate: false
-  xy: 779, 242
+  xy: 503, 27
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 779, 242
+  xy: 503, 27
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 779, 232
+  xy: 499, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 779, 232
+  xy: 499, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 789, 242
+  xy: 499, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 789, 242
+  xy: 499, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3576,28 +3576,28 @@ block-icon-spectre
   index: -1
 block-icon-splitter
   rotate: false
-  xy: 779, 222
+  xy: 499, 74
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 splitter
   rotate: false
-  xy: 779, 222
+  xy: 499, 74
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-stone
   rotate: false
-  xy: 789, 232
+  xy: 782, 272
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 789, 232
+  xy: 782, 272
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3611,140 +3611,140 @@ block-icon-swarmer
   index: -1
 block-icon-thermal-generator
   rotate: false
-  xy: 811, 343
+  xy: 357, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermal-generator
   rotate: false
-  xy: 811, 343
+  xy: 357, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thermal-pump
   rotate: false
-  xy: 829, 344
+  xy: 375, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermal-pump
   rotate: false
-  xy: 829, 344
+  xy: 375, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 779, 212
+  xy: 792, 272
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 779, 212
+  xy: 792, 272
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-thorium-wall-large
   rotate: false
-  xy: 177, 117
+  xy: 393, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thorium-wall-large
   rotate: false
-  xy: 177, 117
+  xy: 393, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 789, 222
+  xy: 780, 262
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 789, 222
+  xy: 780, 262
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor
   rotate: false
-  xy: 789, 222
+  xy: 780, 262
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-drill
   rotate: false
-  xy: 779, 202
+  xy: 790, 262
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-wall
   rotate: false
-  xy: 789, 212
+  xy: 847, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-wall
   rotate: false
-  xy: 789, 212
+  xy: 847, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-wall-large
   rotate: false
-  xy: 195, 117
+  xy: 411, 116
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 tungsten-wall-large
   rotate: false
-  xy: 195, 117
+  xy: 411, 116
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-turbine-generator
   rotate: false
-  xy: 213, 117
+  xy: 429, 122
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 turbine-generator
   rotate: false
-  xy: 213, 117
+  xy: 429, 122
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 789, 202
+  xy: 847, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 789, 202
+  xy: 847, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3779,21 +3779,21 @@ warp-gate
   index: -1
 block-icon-water
   rotate: false
-  xy: 904, 353
+  xy: 857, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 904, 353
+  xy: 857, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-water-extractor
   rotate: false
-  xy: 231, 117
+  xy: 447, 122
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3807,1057 +3807,1057 @@ block-icon-wave
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 627, 196
+  xy: 955, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 617, 186
+  xy: 965, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 637, 196
+  xy: 975, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 627, 186
+  xy: 893, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 647, 186
+  xy: 923, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 587, 176
+  xy: 933, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 597, 176
+  xy: 943, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 607, 176
+  xy: 953, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge
   rotate: false
-  xy: 767, 182
+  xy: 1005, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-1
   rotate: false
-  xy: 777, 192
+  xy: 1015, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-2
   rotate: false
-  xy: 777, 182
+  xy: 472, 14
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-side
   rotate: false
-  xy: 787, 192
+  xy: 897, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 757, 172
+  xy: 957, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 767, 172
+  xy: 967, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 777, 172
+  xy: 977, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 787, 172
+  xy: 977, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 975, 378
+  xy: 357, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 989, 392
+  xy: 371, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 989, 378
+  xy: 385, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-halberd-ship
   rotate: false
-  xy: 1009, 407
+  xy: 363, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-trident-ship
   rotate: false
-  xy: 1009, 407
+  xy: 363, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-omega-mech
   rotate: false
-  xy: 383, 17
+  xy: 377, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-tau-mech
   rotate: false
-  xy: 383, 17
+  xy: 377, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 877, 349
+  xy: 987, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 855, 338
+  xy: 997, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 887, 351
+  xy: 1007, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 865, 338
+  xy: 987, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge
   rotate: false
-  xy: 875, 339
+  xy: 997, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-1
   rotate: false
-  xy: 861, 328
+  xy: 1007, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-2
   rotate: false
-  xy: 861, 318
+  xy: 997, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-side
   rotate: false
-  xy: 861, 308
+  xy: 1007, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 861, 288
+  xy: 489, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 871, 328
+  xy: 499, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 871, 318
+  xy: 509, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 871, 308
+  xy: 519, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 871, 298
+  xy: 529, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 871, 288
+  xy: 539, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 881, 329
+  xy: 549, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 881, 319
+  xy: 559, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 881, 309
+  xy: 569, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 881, 299
+  xy: 487, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 881, 289
+  xy: 497, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 885, 339
+  xy: 507, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 891, 329
+  xy: 517, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 891, 319
+  xy: 527, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 891, 309
+  xy: 537, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 891, 299
+  xy: 547, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 891, 289
+  xy: 557, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 802, 293
+  xy: 567, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 802, 283
+  xy: 487, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 812, 293
+  xy: 497, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 802, 273
+  xy: 507, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 812, 283
+  xy: 517, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 812, 273
+  xy: 527, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 810, 263
+  xy: 537, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 810, 253
+  xy: 547, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 822, 292
+  xy: 557, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 822, 282
+  xy: 567, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 822, 272
+  xy: 577, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 820, 262
+  xy: 577, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 820, 252
+  xy: 587, 196
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 832, 284
+  xy: 597, 196
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 832, 274
+  xy: 587, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 830, 262
+  xy: 607, 196
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 830, 252
+  xy: 597, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 810, 243
+  xy: 617, 196
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 809, 233
+  xy: 607, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 809, 223
+  xy: 627, 196
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 809, 213
+  xy: 617, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 809, 203
+  xy: 637, 196
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 820, 242
+  xy: 627, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 830, 242
+  xy: 647, 196
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 819, 232
+  xy: 637, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 819, 222
+  xy: 647, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 829, 232
+  xy: 587, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 819, 212
+  xy: 597, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 829, 222
+  xy: 607, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 829, 212
+  xy: 617, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 819, 202
+  xy: 627, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 829, 202
+  xy: 637, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 817, 192
+  xy: 647, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 817, 182
+  xy: 657, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 827, 192
+  xy: 657, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 817, 172
+  xy: 667, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 827, 182
+  xy: 667, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 827, 172
+  xy: 677, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 837, 192
+  xy: 677, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 837, 182
+  xy: 687, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 837, 172
+  xy: 687, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 481, 169
+  xy: 697, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 491, 169
+  xy: 707, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 501, 169
+  xy: 697, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 511, 169
+  xy: 707, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 481, 159
+  xy: 657, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 521, 169
+  xy: 667, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 491, 159
+  xy: 677, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 501, 159
+  xy: 687, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 511, 159
+  xy: 697, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 531, 169
+  xy: 707, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 521, 159
+  xy: 717, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 541, 169
+  xy: 727, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 531, 159
+  xy: 717, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 551, 169
+  xy: 727, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-blackstone1
   rotate: false
-  xy: 541, 159
+  xy: 737, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-blackstone2
   rotate: false
-  xy: 561, 169
+  xy: 737, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-blackstone3
   rotate: false
-  xy: 551, 159
+  xy: 737, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass1
   rotate: false
-  xy: 571, 169
+  xy: 747, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass2
   rotate: false
-  xy: 561, 159
+  xy: 757, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass3
   rotate: false
-  xy: 571, 159
+  xy: 767, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice1
   rotate: false
-  xy: 492, 149
+  xy: 777, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice2
   rotate: false
-  xy: 502, 149
+  xy: 787, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice3
   rotate: false
-  xy: 512, 149
+  xy: 797, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand1
   rotate: false
-  xy: 522, 149
+  xy: 747, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand2
   rotate: false
-  xy: 532, 149
+  xy: 757, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand3
   rotate: false
-  xy: 542, 149
+  xy: 767, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow1
   rotate: false
-  xy: 552, 149
+  xy: 777, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow2
   rotate: false
-  xy: 562, 149
+  xy: 787, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow3
   rotate: false
-  xy: 572, 149
+  xy: 797, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone1
   rotate: false
-  xy: 581, 166
+  xy: 807, 172
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone2
   rotate: false
-  xy: 591, 166
+  xy: 807, 162
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone3
   rotate: false
-  xy: 601, 166
+  xy: 817, 172
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 840, 262
+  xy: 812, 277
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 840, 252
+  xy: 832, 297
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 840, 242
+  xy: 832, 287
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 839, 232
+  xy: 822, 277
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 850, 242
+  xy: 842, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 849, 232
+  xy: 852, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 849, 222
+  xy: 852, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 849, 212
+  xy: 862, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 847, 192
+  xy: 817, 257
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 847, 182
+  xy: 827, 257
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 847, 172
+  xy: 817, 247
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 857, 192
+  xy: 827, 247
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unit-icon-scout
   rotate: false
-  xy: 452, 38
+  xy: 443, 40
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-titan
   rotate: false
-  xy: 342, 63
+  xy: 270, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 657, 175
+  xy: 937, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 667, 175
+  xy: 947, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-carbide
   rotate: false
-  xy: 677, 175
+  xy: 957, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 687, 175
+  xy: 937, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 697, 175
+  xy: 947, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 707, 175
+  xy: 957, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 717, 175
+  xy: 947, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 727, 175
+  xy: 957, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 737, 192
+  xy: 957, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 737, 182
+  xy: 967, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 747, 192
+  xy: 967, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 747, 182
+  xy: 967, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 757, 192
+  xy: 967, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 757, 182
+  xy: 985, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-tungsten
   rotate: false
-  xy: 767, 192
+  xy: 995, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 747, 172
+  xy: 947, 289
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4934,63 +4934,63 @@ scout-leg
   index: -1
 delta-mech
   rotate: false
-  xy: 259, 1
+  xy: 181, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 273, 1
+  xy: 195, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 omega-mech
   rotate: false
-  xy: 829, 330
+  xy: 401, 50
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech
   rotate: false
-  xy: 829, 330
+  xy: 401, 50
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 245, 1
+  xy: 166, 66
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 halberd-ship
   rotate: false
-  xy: 369, 17
+  xy: 293, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 369, 17
+  xy: 293, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 javelin-ship
   rotate: false
-  xy: 371, 3
+  xy: 335, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-javelin-ship
   rotate: false
-  xy: 371, 3
+  xy: 335, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -5139,7 +5139,7 @@ check-over
   index: -1
 clear
   rotate: false
-  xy: 233, 1
+  xy: 471, 56
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5167,28 +5167,28 @@ discord-banner-over
   index: -1
 controller-cursor
   rotate: false
-  xy: 267, 117
+  xy: 483, 122
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-about
   rotate: false
-  xy: 728, 258
+  xy: 177, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-add
   rotate: false
-  xy: 195, 29
+  xy: 193, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-admin
   rotate: false
-  xy: 231, 47
+  xy: 177, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5202,238 +5202,238 @@ icon-admin-small
   index: -1
 icon-areaDelete
   rotate: false
-  xy: 817, 331
+  xy: 837, 376
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow
   rotate: false
-  xy: 193, 99
+  xy: 283, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 193, 99
+  xy: 283, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-down
   rotate: false
-  xy: 480, 40
+  xy: 837, 364
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 492, 40
+  xy: 851, 387
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 843, 332
+  xy: 863, 387
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 839, 318
+  xy: 849, 375
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-back
   rotate: false
-  xy: 193, 81
+  xy: 283, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-ban
   rotate: false
-  xy: 211, 29
+  xy: 209, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-break
   rotate: false
-  xy: 211, 99
+  xy: 301, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 211, 81
+  xy: 301, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 839, 306
+  xy: 861, 375
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-check
   rotate: false
-  xy: 229, 99
+  xy: 319, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 839, 294
+  xy: 849, 363
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 397, 34
+  xy: 861, 363
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 409, 36
+  xy: 875, 387
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 247, 47
+  xy: 193, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 263, 47
+  xy: 225, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 397, 22
+  xy: 873, 375
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 279, 47
+  xy: 209, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 295, 47
+  xy: 241, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 311, 47
+  xy: 225, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 327, 47
+  xy: 257, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-elevation
   rotate: false
-  xy: 229, 81
+  xy: 319, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-eraser
   rotate: false
-  xy: 247, 99
+  xy: 337, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-exit
   rotate: false
-  xy: 343, 47
+  xy: 241, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 247, 81
+  xy: 337, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 265, 99
+  xy: 355, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 359, 47
+  xy: 273, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 265, 81
+  xy: 355, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-floppy
   rotate: false
-  xy: 375, 47
+  xy: 257, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 283, 99
+  xy: 373, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 181, 11
+  xy: 289, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 197, 13
+  xy: 273, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5447,441 +5447,441 @@ icon-generated
   index: -1
 icon-github
   rotate: false
-  xy: 213, 13
+  xy: 305, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 408, 64
+  xy: 289, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-grid
   rotate: false
-  xy: 283, 81
+  xy: 373, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-hold
   rotate: false
-  xy: 409, 24
+  xy: 873, 363
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 421, 26
+  xy: 887, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 408, 48
+  xy: 321, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 424, 52
+  xy: 305, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 433, 26
+  xy: 899, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 440, 52
+  xy: 337, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 445, 26
+  xy: 911, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 727, 195
+  xy: 947, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 301, 99
+  xy: 391, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-link
   rotate: false
-  xy: 456, 52
+  xy: 321, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 457, 26
+  xy: 923, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 472, 52
+  xy: 353, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 301, 81
+  xy: 391, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 319, 99
+  xy: 409, 98
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 319, 81
+  xy: 409, 80
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 337, 99
+  xy: 744, 256
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 469, 26
+  xy: 935, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 488, 52
+  xy: 337, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 481, 28
+  xy: 947, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 337, 81
+  xy: 743, 238
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-missing
   rotate: false
-  xy: 493, 28
+  xy: 959, 389
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 399, 10
+  xy: 847, 351
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 727, 185
+  xy: 927, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 411, 12
+  xy: 859, 351
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 355, 99
+  xy: 762, 256
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 227, 29
+  xy: 369, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 355, 81
+  xy: 761, 238
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 423, 14
+  xy: 871, 351
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 229, 13
+  xy: 353, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 435, 14
+  xy: 847, 339
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 447, 14
+  xy: 859, 339
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 459, 14
+  xy: 871, 339
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 243, 31
+  xy: 369, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 373, 99
+  xy: 755, 220
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 259, 31
+  xy: 385, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 275, 31
+  xy: 385, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 373, 81
+  xy: 755, 202
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 291, 31
+  xy: 408, 64
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 307, 31
+  xy: 181, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 323, 31
+  xy: 197, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 339, 31
+  xy: 213, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 355, 31
+  xy: 229, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 391, 99
+  xy: 737, 195
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 391, 81
+  xy: 755, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 433, 2
+  xy: 805, 331
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 409, 98
+  xy: 429, 104
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 371, 31
+  xy: 245, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 445, 2
+  xy: 817, 331
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 457, 2
+  xy: 829, 331
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 245, 15
+  xy: 261, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 409, 80
+  xy: 447, 104
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-trello
   rotate: false
-  xy: 261, 15
+  xy: 277, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 277, 15
+  xy: 293, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 744, 256
+  xy: 465, 104
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 471, 14
+  xy: 811, 319
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 293, 15
+  xy: 309, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-weapon
   rotate: false
-  xy: 469, 2
+  xy: 823, 319
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 309, 15
+  xy: 325, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 743, 238
+  xy: 483, 104
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 325, 15
+  xy: 341, 15
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6069,126 +6069,126 @@ window-empty
   index: -1
 drone
   rotate: false
-  xy: 301, 1
+  xy: 223, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-drone
   rotate: false
-  xy: 301, 1
+  xy: 223, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 fabricator
   rotate: false
-  xy: 1008, 421
+  xy: 728, 258
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 unit-icon-fabricator
   rotate: false
-  xy: 1008, 421
+  xy: 728, 258
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 interceptor
   rotate: false
-  xy: 357, 3
+  xy: 321, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-interceptor
   rotate: false
-  xy: 357, 3
+  xy: 321, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 monsoon
   rotate: false
-  xy: 988, 417
+  xy: 811, 388
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 unit-icon-monsoon
   rotate: false
-  xy: 988, 417
+  xy: 811, 388
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 scout
   rotate: false
-  xy: 825, 316
+  xy: 415, 50
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 titan
   rotate: false
-  xy: 270, 63
+  xy: 198, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 titan-base
   rotate: false
-  xy: 288, 63
+  xy: 216, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 titan-leg
   rotate: false
-  xy: 306, 63
+  xy: 234, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 blaster-equip
   rotate: false
-  xy: 791, 330
+  xy: 572, 244
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 166, 66
+  xy: 791, 330
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 329, 1
+  xy: 251, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 341, 17
+  xy: 265, 1
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 1003, 392
+  xy: 399, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 811, 303
+  xy: 415, 36
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 8e875b8936..65b4b50db9 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/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java
index 20c2dc5b54..9a6b29db93 100644
--- a/core/src/io/anuke/mindustry/entities/units/UnitType.java
+++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java
@@ -16,14 +16,19 @@ import io.anuke.ucore.function.Supplier;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.scene.ui.layout.Table;
 import io.anuke.ucore.util.Bundles;
+import io.anuke.ucore.util.Log;
+import io.anuke.ucore.util.Strings;
 
 //TODO merge unit type with mech
 public class UnitType implements UnlockableContent{
     private static byte lastid = 0;
     private static Array<UnitType> types = new Array<>();
-    public final String name;
-    public final byte id;
+
     protected final Supplier<? extends BaseUnit> constructor;
+
+    public final String name;
+    public final String description;
+    public final byte id;
     public float health = 60;
     public float hitsize = 5f;
     public float hitsizeTile = 4f;
@@ -51,10 +56,16 @@ public class UnitType implements UnlockableContent{
         this.id = lastid++;
         this.name = name;
         this.constructor = mainConstructor;
+        this.description = Bundles.getOrNull("unit." + name + ".description");
 
         types.add(this);
 
         TypeTrait.registerType(type, mainConstructor);
+
+        if(!Bundles.has("unit." + this.name + ".name")){
+            Log.err("Warning: unit '" + name + "' is missing a localized name. Add the follow to bundle.properties:");
+            Log.err("unit." + this.name + ".name=" + Strings.capitalize(name.replace('-', '_')));
+        }
     }
 
     public static UnitType getByID(byte id){
diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java
index 18653372c6..2e29a94973 100644
--- a/core/src/io/anuke/mindustry/type/Item.java
+++ b/core/src/io/anuke/mindustry/type/Item.java
@@ -23,33 +23,19 @@ public class Item implements Comparable<Item>, UnlockableContent{
     public final Color color;
     public TextureRegion region;
 
-    /**
-     * type of the item; used for tabs and core acceptance. default value is {@link ItemType#resource}.
-     */
+    /**type of the item; used for tabs and core acceptance. default value is {@link ItemType#resource}.*/
     public ItemType type = ItemType.resource;
-    /**
-     * how explosive this item is.
-     */
+    /**how explosive this item is.*/
     public float explosiveness = 0f;
-    /**
-     * flammability above 0.3 makes this eleigible for item burners.
-     */
+    /**flammability above 0.3 makes this eleigible for item burners.*/
     public float flammability = 0f;
-    /**
-     * how radioactive this item is. 0=none, 1=chernobyl ground zero
-     */
+    /**how radioactive this item is. 0=none, 1=chernobyl ground zero*/
     public float radioactivity;
-    /**
-     * how effective this item is as flux for smelting. 0 = not a flux, 0.5 = normal flux, 1 = very good
-     */
+    /**how effective this item is as flux for smelting. 0 = not a flux, 0.5 = normal flux, 1 = very good*/
     public float fluxiness = 0f;
-    /**
-     * drill hardness of the item
-     */
+    /**drill hardness of the item*/
     public int hardness = 0;
-    /**
-     * the burning color of this item
-     */
+    /**the burning color of this item*/
     public Color flameColor = Palette.darkFlame.cpy();
     /**
      * base material cost of this item, used for calculating place times
diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java
index 181e5704f1..59c53fef20 100644
--- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java
+++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java
@@ -17,6 +17,7 @@ import io.anuke.mindustry.world.meta.StatValue;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.scene.ui.layout.Table;
 import io.anuke.ucore.util.Bundles;
+import io.anuke.ucore.util.Strings;
 
 public class ContentDisplay{
 
@@ -144,6 +145,31 @@ public class ContentDisplay{
     }
 
     public static void displayUnit(Table table, UnitType unit){
+        table.table(title -> {
+            title.addImage(unit.getContentIcon()).size(8 * 6);
+            title.add("[accent]" + unit.localizedName()).padLeft(5);
+        });
 
+        table.row();
+
+        table.addImage("white").height(3).color(Color.LIGHT_GRAY).pad(15).padLeft(0).padRight(0).fillX();
+
+        table.row();
+
+        if(unit.description != null){
+            table.add(unit.description).padLeft(5).padRight(5).width(400f).wrap().fillX();
+            table.row();
+
+            table.addImage("white").height(3).color(Color.LIGHT_GRAY).pad(15).padLeft(0).padRight(0).fillX();
+            table.row();
+        }
+
+        table.left().defaults().fillX();
+
+        table.add(Bundles.format("text.unit.health", unit.health));
+        table.row();
+        table.add(Bundles.format("text.unit.speed", Strings.toFixed(unit.speed, 1)));
+        table.row();
+        table.row();
     }
 }
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
index 7bc8d5e445..0b765eafba 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
@@ -7,6 +7,7 @@ import io.anuke.mindustry.core.ContentLoader;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.graphics.Palette;
+import io.anuke.ucore.scene.event.HandCursorListener;
 import io.anuke.ucore.scene.ui.Image;
 import io.anuke.ucore.scene.ui.ScrollPane;
 import io.anuke.ucore.scene.ui.Tooltip;
@@ -56,6 +57,7 @@ public class UnlocksDialog extends FloatingDialog{
                     if(unlock.isHidden()) continue;
 
                     Image image = control.database().isUnlocked(unlock) ? new Image(unlock.getContentIcon()) : new Image("icon-locked");
+                    image.addListener(new HandCursorListener());
                     list.add(image).size(size).pad(3);
 
                     if(control.database().isUnlocked(unlock)){