diff --git a/core/assets-raw/sprites/blocks/environment/stone-cliff.png b/core/assets-raw/sprites/blocks/environment/stone-cliff.png
deleted file mode 100644
index da6d483bd5..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/stone-cliff.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/stone/cliff-0.png b/core/assets-raw/sprites/blocks/environment/stone/cliff-0.png
deleted file mode 100644
index 9f2b11b52d..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/stone/cliff-0.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/water-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/water-cliff-edge-1.png
index 072a0eb9e4..271d355d2f 100644
Binary files a/core/assets-raw/sprites/blocks/environment/water-cliff-edge-1.png and b/core/assets-raw/sprites/blocks/environment/water-cliff-edge-1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/water-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/water-cliff-edge-2.png
index 3ffbd1c147..e843c6cd20 100644
Binary files a/core/assets-raw/sprites/blocks/environment/water-cliff-edge-2.png and b/core/assets-raw/sprites/blocks/environment/water-cliff-edge-2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/water-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/water-cliff-edge.png
index d3dad2cf88..7962b0c445 100644
Binary files a/core/assets-raw/sprites/blocks/environment/water-cliff-edge.png and b/core/assets-raw/sprites/blocks/environment/water-cliff-edge.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-elevation.png b/core/assets-raw/sprites/ui/icons/icon-elevation.png
new file mode 100644
index 0000000000..b484f8093d
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-elevation.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 6f437d4f4d..5fd6ee2819 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,196 +13,196 @@ background
   index: -1
 bridgeconduit
   rotate: false
-  xy: 175, 28
+  xy: 217, 56
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit-arrow
   rotate: false
-  xy: 175, 18
+  xy: 227, 59
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit-bridge
   rotate: false
-  xy: 175, 8
+  xy: 217, 46
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit-end
   rotate: false
-  xy: 227, 89
+  xy: 227, 49
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor
   rotate: false
-  xy: 225, 79
+  xy: 197, 30
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-arrow
   rotate: false
-  xy: 225, 69
+  xy: 197, 20
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-bridge
   rotate: false
-  xy: 225, 59
+  xy: 197, 10
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-end
   rotate: false
-  xy: 225, 49
+  xy: 207, 32
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 445, 116
+  xy: 227, 19
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top
   rotate: false
-  xy: 435, 95
+  xy: 673, 227
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduittunnel
   rotate: false
-  xy: 445, 96
+  xy: 685, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor
   rotate: false
-  xy: 643, 114
+  xy: 695, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyormove
   rotate: false
-  xy: 653, 114
+  xy: 759, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyortunnel
   rotate: false
-  xy: 733, 269
+  xy: 759, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 275, 75
+  xy: 951, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit
   rotate: false
-  xy: 275, 65
+  xy: 961, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-arrow
   rotate: false
-  xy: 275, 55
+  xy: 951, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-bridge
   rotate: false
-  xy: 275, 45
+  xy: 961, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-end
   rotate: false
-  xy: 275, 35
+  xy: 971, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor
   rotate: false
-  xy: 275, 25
+  xy: 961, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-arrow
   rotate: false
-  xy: 245, 7
+  xy: 971, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-bridge
   rotate: false
-  xy: 255, 15
+  xy: 981, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-end
   rotate: false
-  xy: 265, 15
+  xy: 991, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidjunction
   rotate: false
-  xy: 465, 122
+  xy: 1001, 408
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter
   rotate: false
-  xy: 455, 102
+  xy: 1001, 398
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-bottom
   rotate: false
-  xy: 465, 112
+  xy: 1011, 418
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-liquid
   rotate: false
-  xy: 475, 122
+  xy: 1011, 408
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-top
   rotate: false
-  xy: 465, 102
+  xy: 1011, 398
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -230,84 +230,84 @@ liquidtank-top
   index: -1
 multiplexer
   rotate: false
-  xy: 625, 140
+  xy: 607, 140
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 overflowgate
   rotate: false
-  xy: 505, 111
+  xy: 789, 343
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 poweredconveyor
   rotate: false
-  xy: 515, 101
+  xy: 799, 343
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 poweredconveyormove
   rotate: false
-  xy: 525, 111
+  xy: 799, 333
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulseconduit-bottom
   rotate: false
-  xy: 545, 111
+  xy: 445, 126
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulseconduit-top
   rotate: false
-  xy: 545, 101
+  xy: 445, 116
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 505, 91
+  xy: 901, 387
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 651, 275
+  xy: 465, 122
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 splitter
   rotate: false
-  xy: 651, 265
+  xy: 465, 112
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelconveyor
   rotate: false
-  xy: 749, 285
+  xy: 475, 122
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelconveyormove
   rotate: false
-  xy: 761, 352
+  xy: 465, 102
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 teleporter-top
   rotate: false
-  xy: 437, 136
+  xy: 411, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -321,49 +321,49 @@ blackrock1
   index: -1
 blackrockshadow1
   rotate: false
-  xy: 245, 97
+  xy: 615, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone1
   rotate: false
-  xy: 991, 419
+  xy: 183, 90
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone2
   rotate: false
-  xy: 975, 395
+  xy: 669, 295
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 985, 395
+  xy: 643, 291
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstoneblock1
   rotate: false
-  xy: 995, 397
+  xy: 245, 97
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstoneblock2
   rotate: false
-  xy: 145, 30
+  xy: 786, 374
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstoneblock3
   rotate: false
-  xy: 145, 20
+  xy: 797, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -377,49 +377,49 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 225, 9
+  xy: 207, 22
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 435, 125
+  xy: 217, 26
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 435, 115
+  xy: 227, 29
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 751, 390
+  xy: 821, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 751, 380
+  xy: 821, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 751, 370
+  xy: 831, 423
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 751, 360
+  xy: 841, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -433,616 +433,602 @@ dirtedge
   index: -1
 grass1
   rotate: false
-  xy: 783, 393
+  xy: 851, 405
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 793, 393
+  xy: 861, 415
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 803, 393
+  xy: 861, 405
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassblock1
   rotate: false
-  xy: 813, 393
+  xy: 871, 415
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassblock2
   rotate: false
-  xy: 823, 393
+  xy: 871, 405
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 167, 42
+  xy: 733, 281
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 833, 395
+  xy: 881, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 895, 391
+  xy: 881, 415
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 905, 391
+  xy: 881, 405
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iceedge
   rotate: false
-  xy: 991, 446
+  xy: 624, 275
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 915, 391
+  xy: 891, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 995, 387
+  xy: 901, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 185, 16
+  xy: 891, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 185, 16
+  xy: 891, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 195, 16
+  xy: 911, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 195, 16
+  xy: 911, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron1
   rotate: false
-  xy: 205, 6
+  xy: 921, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron2
   rotate: false
-  xy: 215, 6
+  xy: 901, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron3
   rotate: false
-  xy: 155, 2
+  xy: 911, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 275, 15
+  xy: 971, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lavaedge
   rotate: false
-  xy: 255, 95
+  xy: 624, 261
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 265, 5
+  xy: 981, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 275, 5
+  xy: 991, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 455, 122
+  xy: 1001, 418
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 475, 102
+  xy: 703, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 485, 112
+  xy: 775, 363
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 485, 102
+  xy: 774, 353
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 455, 92
+  xy: 769, 343
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 465, 92
+  xy: 769, 333
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 475, 92
+  xy: 779, 343
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalflooredge
   rotate: false
-  xy: 269, 95
+  xy: 638, 275
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mossblock
   rotate: false
-  xy: 485, 92
+  xy: 779, 333
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 495, 111
+  xy: 784, 353
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oiledge
   rotate: false
-  xy: 749, 414
+  xy: 638, 261
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 595, 101
+  xy: 881, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 495, 91
+  xy: 891, 387
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 535, 91
+  xy: 931, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 545, 91
+  xy: 941, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 555, 91
+  xy: 951, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock1
   rotate: false
-  xy: 565, 91
+  xy: 961, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock2
   rotate: false
-  xy: 575, 91
+  xy: 971, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock3
   rotate: false
-  xy: 585, 91
+  xy: 981, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandedge
   rotate: false
-  xy: 749, 400
+  xy: 652, 275
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 495, 81
+  xy: 723, 213
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 505, 81
+  xy: 733, 271
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 535, 81
+  xy: 743, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 545, 81
+  xy: 743, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 555, 81
+  xy: 753, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock1
   rotate: false
-  xy: 565, 81
+  xy: 753, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock2
   rotate: false
-  xy: 575, 81
+  xy: 743, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock3
   rotate: false
-  xy: 585, 81
+  xy: 753, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowedge
   rotate: false
-  xy: 791, 417
+  xy: 645, 247
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 661, 267
+  xy: 455, 102
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 777, 403
+  xy: 645, 233
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
-stone-cliff
-  rotate: false
-  xy: 385, 135
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
 stone-cliff-edge
   rotate: false
-  xy: 781, 362
+  xy: 475, 92
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 781, 352
+  xy: 485, 92
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 779, 342
+  xy: 495, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 779, 332
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-cliff-0
-  rotate: false
-  xy: 225, 39
+  xy: 495, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 769, 332
+  xy: 485, 102
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 781, 382
+  xy: 455, 92
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 781, 372
+  xy: 465, 92
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock1
   rotate: false
-  xy: 791, 383
+  xy: 505, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock2
   rotate: false
-  xy: 801, 383
+  xy: 505, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock3
   rotate: false
-  xy: 791, 373
+  xy: 515, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneedge
   rotate: false
-  xy: 805, 403
+  xy: 659, 233
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 791, 353
+  xy: 535, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 801, 363
+  xy: 545, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 811, 373
+  xy: 545, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 801, 353
+  xy: 555, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 811, 363
+  xy: 555, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 821, 373
+  xy: 565, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 873, 389
+  xy: 525, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 883, 389
+  xy: 535, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 843, 379
+  xy: 545, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 853, 379
+  xy: 555, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 863, 379
+  xy: 565, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 833, 405
+  xy: 694, 265
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 155, 22
+  xy: 217, 76
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 155, 12
+  xy: 227, 79
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustiongenerator-top
   rotate: false
-  xy: 155, 12
+  xy: 227, 79
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 165, 22
+  xy: 217, 66
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 165, 22
+  xy: 217, 66
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 165, 12
+  xy: 227, 69
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 445, 106
+  xy: 747, 285
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 743, 269
+  xy: 821, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-2
   rotate: false
-  xy: 175, 120
+  xy: 517, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1063,7 +1049,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 771, 382
+  xy: 841, 405
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1077,49 +1063,49 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 505, 101
+  xy: 789, 333
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 515, 111
+  xy: 794, 353
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ripples
   rotate: false
-  xy: 955, 405
+  xy: 809, 419
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 rubble-1-0
   rotate: false
-  xy: 625, 122
+  xy: 733, 374
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-1-1
   rotate: false
-  xy: 731, 410
+  xy: 733, 356
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-0
   rotate: false
-  xy: 731, 392
+  xy: 741, 338
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-1
   rotate: false
-  xy: 753, 430
+  xy: 163, 22
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1140,7 +1126,7 @@ rubble-3-1
   index: -1
 shadow-1
   rotate: false
-  xy: 626, 289
+  xy: 763, 382
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1182,7 +1168,7 @@ shadow-6
   index: -1
 shadow-round-1
   rotate: false
-  xy: 624, 277
+  xy: 763, 370
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1210,7 +1196,7 @@ batterylarge
   index: -1
 combustiongenerator
   rotate: false
-  xy: 435, 105
+  xy: 207, 12
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1280,7 +1266,7 @@ largesolarpanel
   index: -1
 liquidcombustiongenerator
   rotate: false
-  xy: 455, 112
+  xy: 991, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1308,84 +1294,84 @@ nuclearreactor-lights
   index: -1
 powerinfinite
   rotate: false
-  xy: 525, 101
+  xy: 435, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powernode
   rotate: false
-  xy: 535, 111
+  xy: 435, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powernodelarge
   rotate: false
-  xy: 571, 121
+  xy: 771, 431
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 535, 101
+  xy: 435, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtgenerator
   rotate: false
-  xy: 515, 91
+  xy: 911, 387
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtgenerator-top
   rotate: false
-  xy: 525, 91
+  xy: 921, 387
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shieldgenerator
   rotate: false
-  xy: 455, 82
+  xy: 1011, 388
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shieldprojector
   rotate: false
-  xy: 771, 431
+  xy: 163, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 solarpanel
   rotate: false
-  xy: 595, 81
+  xy: 455, 122
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 teleporter
   rotate: false
-  xy: 411, 135
+  xy: 385, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 teleporter-top
   rotate: false
-  xy: 587, 232
+  xy: 437, 136
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thermalgenerator
   rotate: false
-  xy: 821, 383
+  xy: 535, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1399,203 +1385,203 @@ alloysmelter
   index: -1
 biomattercompressor
   rotate: false
-  xy: 597, 194
+  xy: 145, 22
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-frame0
   rotate: false
-  xy: 597, 176
+  xy: 145, 4
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-frame1
   rotate: false
-  xy: 597, 158
+  xy: 613, 240
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-frame2
   rotate: false
-  xy: 149, 42
+  xy: 679, 365
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-liquid
   rotate: false
-  xy: 627, 214
+  xy: 677, 347
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-top
   rotate: false
-  xy: 615, 194
+  xy: 679, 313
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 centrifuge
   rotate: false
-  xy: 679, 365
+  xy: 463, 132
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 centrifuge-liquid
   rotate: false
-  xy: 677, 347
+  xy: 481, 132
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 517, 139
+  xy: 165, 100
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 535, 139
+  xy: 613, 222
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 553, 139
+  xy: 697, 365
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 571, 139
+  xy: 695, 347
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 633, 196
+  xy: 715, 367
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 633, 178
+  xy: 697, 313
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 extractor
   rotate: false
-  xy: 771, 372
+  xy: 851, 415
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 fluxpump
   rotate: false
-  xy: 771, 362
+  xy: 871, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 195, 6
+  xy: 901, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 irondrill
   rotate: false
-  xy: 165, 2
+  xy: 911, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 irondrill-rotator
   rotate: false
-  xy: 235, 79
+  xy: 921, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumdrill-rotator
   rotate: false
-  xy: 235, 79
+  xy: 921, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 irondrill-top
   rotate: false
-  xy: 235, 69
+  xy: 921, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 265, 25
+  xy: 951, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 275, 85
+  xy: 941, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserdrill
   rotate: false
-  xy: 227, 99
+  xy: 597, 194
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laserdrill-rotator
   rotate: false
-  xy: 733, 313
+  xy: 597, 176
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laserdrill-top
   rotate: false
-  xy: 733, 295
+  xy: 597, 158
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 lavasmelter
   rotate: false
-  xy: 255, 5
+  xy: 981, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 475, 112
+  xy: 683, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 485, 122
+  xy: 693, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1658,7 +1644,7 @@ oilextractor-top
   index: -1
 oilrefinery
   rotate: false
-  xy: 495, 101
+  xy: 785, 363
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1693,210 +1679,210 @@ plasmadrill-top
   index: -1
 plasticformer
   rotate: false
-  xy: 499, 121
+  xy: 607, 122
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 plasticformer-top
   rotate: false
-  xy: 517, 121
+  xy: 731, 410
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 poweralloysmelter
   rotate: false
-  xy: 535, 121
+  xy: 731, 392
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 poweralloysmelter-top
   rotate: false
-  xy: 553, 121
+  xy: 753, 430
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 powersmelter
   rotate: false
-  xy: 589, 121
+  xy: 789, 431
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 powersmelter-top
   rotate: false
-  xy: 607, 122
+  xy: 807, 431
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 siliconsmelter-top
   rotate: false
-  xy: 607, 122
+  xy: 807, 431
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 555, 111
+  xy: 445, 106
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 555, 101
+  xy: 435, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump
   rotate: false
-  xy: 565, 111
+  xy: 445, 96
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill
   rotate: false
-  xy: 565, 101
+  xy: 817, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill-rotator
   rotate: false
-  xy: 575, 111
+  xy: 827, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill-top
   rotate: false
-  xy: 575, 101
+  xy: 841, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 595, 91
+  xy: 991, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 445, 86
+  xy: 1001, 388
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 siliconextractor
   rotate: false
-  xy: 515, 81
+  xy: 733, 261
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 siliconsmelter
   rotate: false
-  xy: 789, 431
+  xy: 615, 204
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 525, 81
+  xy: 733, 251
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill
   rotate: false
-  xy: 771, 352
+  xy: 475, 112
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill-rotator
   rotate: false
-  xy: 759, 342
+  xy: 485, 122
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill-top
   rotate: false
-  xy: 769, 342
+  xy: 475, 102
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stonedrill
   rotate: false
-  xy: 811, 383
+  xy: 515, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneformer
   rotate: false
-  xy: 791, 363
+  xy: 525, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumdrill
   rotate: false
-  xy: 811, 353
+  xy: 565, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumdrill-top
   rotate: false
-  xy: 821, 363
+  xy: 575, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 waterextractor
   rotate: false
-  xy: 741, 338
+  xy: 625, 132
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 waterextractor-liquid
   rotate: false
-  xy: 643, 142
+  xy: 625, 114
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 waterextractor-rotator
   rotate: false
-  xy: 643, 124
+  xy: 607, 104
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 waterextractor-top
   rotate: false
-  xy: 661, 287
+  xy: 625, 96
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 weaponfactory
   rotate: false
-  xy: 715, 277
+  xy: 183, 72
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1924,42 +1910,42 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 661, 277
+  xy: 455, 112
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 843, 389
+  xy: 495, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vault
   rotate: false
-  xy: 613, 232
+  xy: 587, 232
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 165, 32
+  xy: 227, 89
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-2
   rotate: false
-  xy: 615, 176
+  xy: 175, 120
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-2-top
   rotate: false
-  xy: 615, 158
+  xy: 255, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1994,7 +1980,7 @@ block-4-top
   index: -1
 scatter-heat
   rotate: false
-  xy: 967, 405
+  xy: 797, 407
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -2008,42 +1994,42 @@ arc
   index: -1
 arc-heat
   rotate: false
-  xy: 181, 88
+  xy: 631, 289
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 crux
   rotate: false
-  xy: 255, 109
+  xy: 535, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 crux-heat
   rotate: false
-  xy: 463, 132
+  xy: 553, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 crux-panel-left
   rotate: false
-  xy: 481, 132
+  xy: 571, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 crux-panel-right
   rotate: false
-  xy: 499, 139
+  xy: 209, 114
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 duo
   rotate: false
-  xy: 761, 362
+  xy: 831, 403
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2064,14 +2050,14 @@ spectre
   index: -1
 lancer
   rotate: false
-  xy: 943, 405
+  xy: 773, 395
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 955, 417
+  xy: 785, 407
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -2092,217 +2078,217 @@ ripple
   index: -1
 scatter
   rotate: false
-  xy: 967, 417
+  xy: 785, 395
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scatter-heat
   rotate: false
-  xy: 979, 417
+  xy: 797, 395
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 979, 405
+  xy: 809, 407
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 991, 407
+  xy: 809, 395
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 swarmer
   rotate: false
-  xy: 733, 374
+  xy: 615, 168
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 679, 277
+  xy: 165, 82
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 697, 277
+  xy: 163, 64
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dronefactory
   rotate: false
-  xy: 165, 100
+  xy: 273, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 walkerfactory
   rotate: false
-  xy: 165, 100
+  xy: 273, 109
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dronefactory-top
   rotate: false
-  xy: 697, 365
+  xy: 291, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 walkerfactory-top
   rotate: false
-  xy: 697, 365
+  xy: 291, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dronefactory-top-open
   rotate: false
-  xy: 695, 347
+  xy: 309, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 walkerfactory-top-open
   rotate: false
-  xy: 695, 347
+  xy: 309, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 droppoint
   rotate: false
-  xy: 761, 372
+  xy: 841, 415
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repairpoint
   rotate: false
-  xy: 585, 111
+  xy: 851, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repairpoint-turret
   rotate: false
-  xy: 585, 101
+  xy: 861, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupplypoint
   rotate: false
-  xy: 595, 111
+  xy: 871, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 compositewall
   rotate: false
-  xy: 445, 126
+  xy: 217, 16
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 763, 392
+  xy: 831, 413
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door-large
   rotate: false
-  xy: 633, 160
+  xy: 679, 295
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-large-open
   rotate: false
-  xy: 209, 114
+  xy: 697, 295
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 761, 382
+  xy: 851, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 duriumwall
   rotate: false
-  xy: 773, 392
+  xy: 861, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 duriumwall-large
   rotate: false
-  xy: 715, 367
+  xy: 327, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 ironwall
   rotate: false
-  xy: 235, 59
+  xy: 821, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelwall
   rotate: false
-  xy: 759, 332
+  xy: 485, 112
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelwall-large
   rotate: false
-  xy: 807, 431
+  xy: 615, 186
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 stonewall
   rotate: false
-  xy: 801, 373
+  xy: 525, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumshieldwall
   rotate: false
-  xy: 821, 353
+  xy: 575, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumwall
   rotate: false
-  xy: 833, 385
+  xy: 585, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumwall-large
   rotate: false
-  xy: 733, 356
+  xy: 625, 150
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2330,14 +2316,14 @@ blank
   index: -1
 bullet
   rotate: false
-  xy: 624, 266
+  xy: 631, 222
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 bullet-back
   rotate: false
-  xy: 931, 394
+  xy: 763, 359
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -2365,7 +2351,7 @@ enemyarrow
   index: -1
 laser
   rotate: false
-  xy: 1019, 499
+  xy: 666, 275
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
@@ -2386,7 +2372,7 @@ laserfull
   index: -1
 minelaser
   rotate: false
-  xy: 1022, 499
+  xy: 607, 218
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
@@ -2400,238 +2386,238 @@ minelaser-end
   index: -1
 shell
   rotate: false
-  xy: 942, 394
+  xy: 775, 384
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 953, 394
+  xy: 775, 373
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 485, 82
+  xy: 723, 223
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 1021, 446
+  xy: 610, 218
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 831, 375
+  xy: 585, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 transfer-end
   rotate: false
-  xy: 607, 212
+  xy: 149, 40
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 item-armor-piercing-bullet
   rotate: false
-  xy: 235, 49
+  xy: 831, 393
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-composite-flak
   rotate: false
-  xy: 235, 9
+  xy: 871, 395
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-explosive-shell
   rotate: false
-  xy: 245, 87
+  xy: 881, 395
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-frag-shell
   rotate: false
-  xy: 245, 77
+  xy: 891, 397
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-homing-bullet
   rotate: false
-  xy: 255, 85
+  xy: 901, 397
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-incendiary-mortar-shell
   rotate: false
-  xy: 245, 67
+  xy: 911, 397
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead-bullet
   rotate: false
-  xy: 245, 57
+  xy: 227, 9
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-scythe-missile
   rotate: false
-  xy: 245, 47
+  xy: 673, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-mortar-shell
   rotate: false
-  xy: 265, 55
+  xy: 715, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-swarm-missile
   rotate: false
-  xy: 245, 27
+  xy: 725, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium-shell
   rotate: false
-  xy: 245, 17
+  xy: 941, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-tracer-bullet
   rotate: false
-  xy: 265, 35
+  xy: 941, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 235, 39
+  xy: 841, 395
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 235, 29
+  xy: 851, 395
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 235, 19
+  xy: 861, 395
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-iron
   rotate: false
-  xy: 255, 75
+  xy: 921, 397
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 265, 85
+  xy: 217, 6
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastic
   rotate: false
-  xy: 255, 65
+  xy: 207, 2
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 265, 75
+  xy: 747, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 255, 55
+  xy: 683, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-steel
   rotate: false
-  xy: 265, 65
+  xy: 693, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 245, 37
+  xy: 705, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 255, 45
+  xy: 703, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thermite
   rotate: false
-  xy: 255, 35
+  xy: 931, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 265, 45
+  xy: 931, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 255, 25
+  xy: 931, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 standard-mech
   rotate: false
-  xy: 805, 417
+  xy: 642, 219
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 standard-ship
   rotate: false
-  xy: 791, 403
+  xy: 659, 247
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -2780,7 +2766,7 @@ check-over
   index: -1
 clear
   rotate: false
-  xy: 181, 76
+  xy: 708, 267
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -2808,7 +2794,7 @@ discord-banner-over
   index: -1
 controller-cursor
   rotate: false
-  xy: 679, 313
+  xy: 499, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2843,56 +2829,56 @@ icon-admin-small
   index: -1
 icon-areaDelete
   rotate: false
-  xy: 167, 56
+  xy: 720, 267
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow
   rotate: false
-  xy: 697, 313
+  xy: 345, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 697, 313
+  xy: 345, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-down
   rotate: false
-  xy: 181, 50
+  xy: 673, 249
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 181, 38
+  xy: 673, 237
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 847, 423
+  xy: 685, 253
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 859, 423
+  xy: 685, 241
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-back
   rotate: false
-  xy: 679, 295
+  xy: 363, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2906,49 +2892,49 @@ icon-ban
   index: -1
 icon-break
   rotate: false
-  xy: 697, 295
+  xy: 381, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 273, 109
+  xy: 399, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 847, 411
+  xy: 697, 253
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-check
   rotate: false
-  xy: 291, 117
+  xy: 417, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 871, 423
+  xy: 697, 241
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 859, 411
+  xy: 709, 255
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 871, 411
+  xy: 709, 243
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -2969,7 +2955,7 @@ icon-discord
   index: -1
 icon-distribution
   rotate: false
-  xy: 847, 399
+  xy: 721, 255
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -3002,475 +2988,482 @@ icon-egg
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-eraser
-  rotate: false
-  xy: 309, 117
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-icon-exit
-  rotate: false
-  xy: 733, 279
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-file
-  rotate: false
-  xy: 327, 117
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-icon-file-image
-  rotate: false
-  xy: 345, 117
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-icon-file-text
-  rotate: false
-  xy: 165, 84
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-fill
-  rotate: false
-  xy: 363, 117
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-icon-floppy
-  rotate: false
-  xy: 163, 68
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-floppy-16
-  rotate: false
-  xy: 381, 117
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-icon-folder
-  rotate: false
-  xy: 209, 80
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-folder-parent
-  rotate: false
-  xy: 193, 74
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-github
-  rotate: false
-  xy: 193, 58
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-google-play
-  rotate: false
-  xy: 209, 64
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-grid
-  rotate: false
-  xy: 399, 117
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-icon-hold
-  rotate: false
-  xy: 859, 399
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-holdDelete
-  rotate: false
-  xy: 871, 399
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-home
-  rotate: false
-  xy: 193, 42
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-host
-  rotate: false
-  xy: 209, 48
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-info
-  rotate: false
-  xy: 883, 423
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-itch.io
-  rotate: false
-  xy: 825, 433
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-items-none
-  rotate: false
-  xy: 185, 6
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-icon-line
-  rotate: false
-  xy: 417, 117
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-icon-link
-  rotate: false
-  xy: 841, 435
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-liquid
-  rotate: false
-  xy: 883, 411
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-load
-  rotate: false
-  xy: 857, 435
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-load-image
+icon-elevation
   rotate: false
   xy: 713, 347
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-load-map
+icon-eraser
   rotate: false
   xy: 715, 313
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-loading
+icon-exit
+  rotate: false
+  xy: 169, 48
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-file
   rotate: false
   xy: 715, 295
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-logic
-  rotate: false
-  xy: 883, 399
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-menu
-  rotate: false
-  xy: 895, 425
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-menu-large
+icon-file-image
   rotate: false
   xy: 589, 139
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-none
+icon-file-text
   rotate: false
-  xy: 907, 425
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-pause
-  rotate: false
-  xy: 895, 413
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-pencil
-  rotate: false
-  xy: 607, 140
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-icon-pencil-small
-  rotate: false
-  xy: 873, 435
+  xy: 201, 74
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-pick
+icon-fill
   rotate: false
   xy: 291, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-play
+icon-floppy
   rotate: false
-  xy: 919, 425
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-play-2
-  rotate: false
-  xy: 889, 437
+  xy: 185, 56
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-players
-  rotate: false
-  xy: 895, 401
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-power
-  rotate: false
-  xy: 907, 413
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-production
-  rotate: false
-  xy: 907, 401
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-quit
-  rotate: false
-  xy: 905, 437
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-redo
+icon-floppy-16
   rotate: false
   xy: 309, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-refresh
+icon-folder
   rotate: false
-  xy: 921, 437
+  xy: 201, 58
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-rename
+icon-folder-parent
   rotate: false
-  xy: 645, 285
+  xy: 185, 40
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-resize
+icon-github
+  rotate: false
+  xy: 201, 42
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-google-play
+  rotate: false
+  xy: 181, 24
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-grid
   rotate: false
   xy: 327, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-rotate
+icon-hold
   rotate: false
-  xy: 209, 32
+  xy: 721, 243
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-holdDelete
+  rotate: false
+  xy: 255, 97
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-home
+  rotate: false
+  xy: 181, 8
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-rotate-arrow
+icon-host
   rotate: false
-  xy: 193, 26
+  xy: 825, 433
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-rotate-left
+icon-info
   rotate: false
-  xy: 937, 429
+  xy: 267, 97
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-itch.io
+  rotate: false
+  xy: 841, 435
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
-icon-rotate-right
+icon-items-none
   rotate: false
-  xy: 953, 429
-  size: 14, 14
-  orig: 14, 14
+  xy: 891, 407
+  size: 8, 8
+  orig: 8, 8
   offset: 0, 0
   index: -1
-icon-save
-  rotate: false
-  xy: 969, 429
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-save-image
+icon-line
   rotate: false
   xy: 345, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-save-map
+icon-link
+  rotate: false
+  xy: 857, 435
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-liquid
+  rotate: false
+  xy: 279, 97
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-load
+  rotate: false
+  xy: 873, 435
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-load-image
   rotate: false
   xy: 363, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-settings
-  rotate: false
-  xy: 919, 413
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-terrain
+icon-load-map
   rotate: false
   xy: 381, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-tools
-  rotate: false
-  xy: 209, 16
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-touch
-  rotate: false
-  xy: 919, 401
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-touchDelete
-  rotate: false
-  xy: 931, 417
-  size: 10, 10
-  orig: 10, 10
-  offset: 0, 0
-  index: -1
-icon-trash
-  rotate: false
-  xy: 985, 429
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-trash-16
+icon-loading
   rotate: false
   xy: 399, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-trello
+icon-logic
   rotate: false
-  xy: 993, 460
-  size: 14, 14
-  orig: 14, 14
+  xy: 749, 416
+  size: 10, 10
+  orig: 10, 10
   offset: 0, 0
   index: -1
-icon-tutorial
+icon-menu
   rotate: false
-  xy: 1009, 460
-  size: 14, 14
-  orig: 14, 14
+  xy: 749, 404
+  size: 10, 10
+  orig: 10, 10
   offset: 0, 0
   index: -1
-icon-undo
+icon-menu-large
   rotate: false
   xy: 417, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-units
+icon-none
   rotate: false
-  xy: 931, 405
+  xy: 749, 392
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
-icon-weapon
+icon-pause
   rotate: false
-  xy: 943, 417
+  xy: 751, 380
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
-icon-wiki
-  rotate: false
-  xy: 1005, 444
-  size: 14, 14
-  orig: 14, 14
-  offset: 0, 0
-  index: -1
-icon-zoom
+icon-pencil
   rotate: false
   xy: 209, 96
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-icon-zoom-small
+icon-pencil-small
+  rotate: false
+  xy: 889, 437
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-pick
+  rotate: false
+  xy: 227, 99
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-play
+  rotate: false
+  xy: 751, 368
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-play-2
+  rotate: false
+  xy: 905, 437
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-players
+  rotate: false
+  xy: 751, 356
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-power
+  rotate: false
+  xy: 761, 418
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-production
+  rotate: false
+  xy: 761, 406
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-quit
+  rotate: false
+  xy: 921, 437
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-redo
+  rotate: false
+  xy: 733, 313
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-refresh
+  rotate: false
+  xy: 937, 429
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-rename
+  rotate: false
+  xy: 953, 429
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-resize
+  rotate: false
+  xy: 733, 295
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-rotate
+  rotate: false
+  xy: 969, 429
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-rotate-arrow
+  rotate: false
+  xy: 985, 429
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-rotate-left
+  rotate: false
+  xy: 993, 460
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-rotate-right
+  rotate: false
+  xy: 1009, 460
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-save
+  rotate: false
+  xy: 1005, 444
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-save-image
+  rotate: false
+  xy: 499, 121
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-save-map
+  rotate: false
+  xy: 517, 121
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-settings
+  rotate: false
+  xy: 761, 394
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-terrain
+  rotate: false
+  xy: 535, 121
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-tools
   rotate: false
   xy: 1001, 428
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
+icon-touch
+  rotate: false
+  xy: 773, 419
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-touchDelete
+  rotate: false
+  xy: 785, 419
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-trash
+  rotate: false
+  xy: 653, 289
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-trash-16
+  rotate: false
+  xy: 553, 121
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-trello
+  rotate: false
+  xy: 669, 279
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-tutorial
+  rotate: false
+  xy: 685, 279
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-undo
+  rotate: false
+  xy: 571, 121
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-units
+  rotate: false
+  xy: 773, 407
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-weapon
+  rotate: false
+  xy: 797, 419
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-wiki
+  rotate: false
+  xy: 701, 279
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
+icon-zoom
+  rotate: false
+  xy: 589, 121
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+icon-zoom-small
+  rotate: false
+  xy: 717, 279
+  size: 14, 14
+  orig: 14, 14
+  offset: 0, 0
+  index: -1
 logotext
   rotate: false
   xy: 143, 172
@@ -3537,14 +3530,14 @@ scroll-knob-vertical-black
   index: -1
 selection
   rotate: false
-  xy: 569, 287
+  xy: 624, 258
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 1017, 434
+  xy: 670, 223
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
@@ -3639,70 +3632,70 @@ window-empty
   index: -1
 drone
   rotate: false
-  xy: 179, 62
+  xy: 991, 446
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 scout
   rotate: false
-  xy: 763, 416
+  xy: 652, 261
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 scout-base
   rotate: false
-  xy: 763, 402
+  xy: 631, 247
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 standard-mech-base
   rotate: false
-  xy: 763, 402
+  xy: 631, 247
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 scout-leg
   rotate: false
-  xy: 777, 417
+  xy: 631, 233
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 standard-mech-leg
   rotate: false
-  xy: 777, 417
+  xy: 631, 233
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol
   rotate: false
-  xy: 819, 417
+  xy: 656, 219
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol-booster-1
   rotate: false
-  xy: 819, 403
+  xy: 666, 261
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol-booster-2
   rotate: false
-  xy: 833, 419
+  xy: 680, 265
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol-flame
   rotate: false
-  xy: 964, 394
+  xy: 786, 384
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -3716,70 +3709,70 @@ beam-equip
   index: -1
 blaster
   rotate: false
-  xy: 145, 10
+  xy: 807, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blaster-equip
   rotate: false
-  xy: 155, 32
+  xy: 217, 86
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 clustergun
   rotate: false
-  xy: 225, 29
+  xy: 217, 36
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 clustergun-equip
   rotate: false
-  xy: 225, 19
+  xy: 227, 39
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shockgun
   rotate: false
-  xy: 465, 82
+  xy: 713, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 475, 82
+  xy: 713, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 triblaster
   rotate: false
-  xy: 831, 365
+  xy: 595, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 triblaster-equip
   rotate: false
-  xy: 831, 355
+  xy: 595, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vulcan
   rotate: false
-  xy: 853, 389
+  xy: 505, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vulcan-equip
   rotate: false
-  xy: 863, 389
+  xy: 515, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index afb8b3156a..287d839890 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/content/blocks/Blocks.java b/core/src/io/anuke/mindustry/content/blocks/Blocks.java
index 1989e210d1..37d0b4c6db 100644
--- a/core/src/io/anuke/mindustry/content/blocks/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/Blocks.java
@@ -12,7 +12,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.*;
 
 public class Blocks extends BlockList implements ContentList{
-    public static Block air, spawn, blockpart, space, metalfloor, deepwater, water, lava, oil, stone, blackstone, iron, lead, coal, titanium, thorium, dirt, sand, ice, snow, grass, sandblock, snowblock, stoneblock, blackstoneblock, grassblock, mossblock, shrub, rock, icerock, blackrock, dirtblock;
+    public static Block air, spawn, blockpart, space, metalfloor, deepwater, water, lava, oil, stone, blackstone, iron, lead, coal, titanium, thorium, dirt, sand, ice, snow, grass, shrub, rock, icerock, blackrock;
 
     @Override
     public void load() {
@@ -138,35 +138,6 @@ public class Blocks extends BlockList implements ContentList{
 
         grass = new Floor("grass");
 
-        sandblock = new StaticBlock("sandblock") {{
-            solid = true;
-            variants = 3;
-        }};
-
-        snowblock = new StaticBlock("snowblock") {{
-            solid = true;
-            variants = 3;
-        }};
-
-        stoneblock = new StaticBlock("stoneblock") {{
-            solid = true;
-            variants = 3;
-        }};
-
-        blackstoneblock = new StaticBlock("blackstoneblock") {{
-            solid = true;
-            variants = 3;
-        }};
-
-        grassblock = new StaticBlock("grassblock") {{
-            solid = true;
-            variants = 2;
-        }};
-
-        mossblock = new StaticBlock("mossblock") {{
-            solid = true;
-        }};
-
         shrub = new Rock("shrub");
 
         rock = new Rock("rock") {{
@@ -183,9 +154,5 @@ public class Blocks extends BlockList implements ContentList{
             variants = 1;
             varyShadow = true;
         }};
-
-        dirtblock = new StaticBlock("dirtblock") {{
-            solid = true;
-        }};
     }
 }
diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java
index b234c96899..c1bfe98750 100644
--- a/core/src/io/anuke/mindustry/editor/EditorTool.java
+++ b/core/src/io/anuke/mindustry/editor/EditorTool.java
@@ -52,6 +52,17 @@ public enum EditorTool{
 			editor.draw(x, y, Blocks.air);
 		}
 	},
+	elevation{
+		{
+			edit = true;
+			draggable = true;
+		}
+
+		@Override
+		public void touched(MapEditor editor, int x, int y){
+			editor.elevate(x, y);
+		}
+	},
 	line{
 		{
 
diff --git a/core/src/io/anuke/mindustry/editor/MapEditor.java b/core/src/io/anuke/mindustry/editor/MapEditor.java
index c563e96c32..cbcd852048 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditor.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditor.java
@@ -182,6 +182,30 @@ public class MapEditor{
 		}
 	}
 
+	public void elevate(int x, int y){
+		if(x < 0 || y < 0 || x >= map.width() || y >= map.height()){
+			return;
+		}
+
+		for (int rx = -brushSize; rx <= brushSize; rx++) {
+			for (int ry = -brushSize; ry <= brushSize; ry++) {
+				if (Mathf.dst(rx, ry) <= brushSize - 0.5f) {
+					int wx = x + rx, wy = y + ry;
+
+					if (wx < 0 || wy < 0 || wx >= map.width() || wy >= map.height()) {
+						continue;
+					}
+
+					TileDataMarker prev = getPrev(wx, wy, true);
+
+					map.write(wx, wy, DataPosition.elevation, elevation);
+
+					onWrite(x + rx, y + ry, prev);
+				}
+			}
+		}
+	}
+
 	private void removeLinked(int x, int y){
 		Block block = Block.getByID(map.read(x, y, DataPosition.wall));
 
diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
index 3607290e93..df6d0c764b 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
@@ -409,12 +409,14 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
 				tools.defaults().size(size, size + 4f).padBottom(-5.1f);
 
-				tools.addImageButton("icon-back", 16*2, () -> tryExit());
+				//tools.addImageButton("icon-back", 16*2, () -> tryExit());
 
 				tools.addImageButton("icon-menu-large", 16*2f, menu::show);
 
 				ImageButton grid = tools.addImageButton("icon-grid", "toggle", 16*2f, () -> view.setGrid(!view.isGrid())).get();
 
+				addTool.accept(EditorTool.zoom);
+
 				tools.row();
 
 				ImageButton undo = tools.addImageButton("icon-undo", 16*2f, () -> view.undo()).get();
@@ -438,7 +440,8 @@ public class MapEditorDialog extends Dialog implements Disposable{
 				tools.row();
 
 				addTool.accept(EditorTool.fill);
-				addTool.accept(EditorTool.zoom);
+				addTool.accept(EditorTool.elevation);
+
 
 				ImageButton rotate = tools.addImageButton("icon-arrow-16", 16*2f, () -> editor.setDrawRotation((editor.getDrawRotation() + 1)%4)).get();
 				rotate.getImage().update(() ->{
diff --git a/core/src/io/anuke/mindustry/editor/MapFilter.java b/core/src/io/anuke/mindustry/editor/MapFilter.java
index ecb42559c4..1a49ec4ac6 100644
--- a/core/src/io/anuke/mindustry/editor/MapFilter.java
+++ b/core/src/io/anuke/mindustry/editor/MapFilter.java
@@ -70,7 +70,7 @@ public class MapFilter{
 						noise += 2 * (dist - 0.8);
 					}
 
-					Block block = noise > 0.6 ? Blocks.stoneblock : Blocks.stone;
+					Block block = Blocks.stone;
 
 					pixmap.drawPixel(x, y, ColorMapper.getColor(block));
 				}
@@ -110,32 +110,6 @@ public class MapFilter{
 
 				double noil = sim.octaveNoise2D(1, 1.0, 1 / 150.0, x + 9999, y) + sim.octaveNoise2D(1, 1.0, 1 / 2.0, x, y) / 290.0;
 
-				if(!floor || prefs.get("replace").enabled){
-					
-					if(prefs.get("allgrass").enabled){
-						block = floor ? Blocks.grass : Blocks.grassblock;
-					}else if(prefs.get("allsnow").enabled){
-						block = floor ? Blocks.snow : Blocks.snowblock;
-					}else if(prefs.get("allsand").enabled){
-						block = floor ? Blocks.sand : Blocks.sandblock;
-					}else if(prefs.get("replace").enabled){
-						block = floor ? Blocks.stone : Blocks.stoneblock;
-					}
-						
-					if(noise > 0.7 && prefs.get("grass").enabled){
-						block = floor ? Blocks.grass : Blocks.grassblock;
-					}
-					if(noise > 0.7 && prefs.get("blackstone").enabled){
-						block = floor ? Blocks.blackstone : Blocks.blackstoneblock;
-					}
-					if(noise > 0.7 && prefs.get("sand").enabled){
-						block = floor ? Blocks.sand : Blocks.sandblock;
-					}
-					if(noise > 0.8 && prefs.get("stone").enabled){
-						block = floor ? Blocks.stone : Blocks.stoneblock;
-					}
-				}
-
 				if(floor){
 					if(nwater > 0.93 && prefs.get("water").enabled){
 						block = Blocks.water;
diff --git a/core/src/io/anuke/mindustry/world/ColorMapper.java b/core/src/io/anuke/mindustry/world/ColorMapper.java
index bdb3a09401..01788b4ecc 100644
--- a/core/src/io/anuke/mindustry/world/ColorMapper.java
+++ b/core/src/io/anuke/mindustry/world/ColorMapper.java
@@ -23,18 +23,13 @@ public class ColorMapper{
 
 		colors = map(
 			"323232", pair(Blocks.stone),
-			"646464", pair(Blocks.stone, Blocks.stoneblock),
 			"50965a", pair(Blocks.grass),
-			"5ab464", pair(Blocks.grass, Blocks.grassblock),
 			"506eb4", pair(Blocks.water),
 			"465a96", pair(Blocks.deepwater),
 			"252525", pair(Blocks.blackstone),
-			"575757", pair(Blocks.blackstone, Blocks.blackstoneblock),
 			"988a67", pair(Blocks.sand),
-			"e5d8bb", pair(Blocks.sand, Blocks.sandblock),
 			"c2d1d2", pair(Blocks.snow),
 			"c4e3e7", pair(Blocks.ice),
-			"f7feff", pair(Blocks.snow, Blocks.snowblock),
 			"6e501e", pair(Blocks.dirt),
 			"ed5334", pair(Blocks.lava),
 			"292929", pair(Blocks.oil),