diff --git a/core/assets-raw/sprites/blocks/production/extractor.png b/core/assets-raw/sprites/blocks/production/extractor.png
deleted file mode 100644
index 8bb66782c4..0000000000
Binary files a/core/assets-raw/sprites/blocks/production/extractor.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png b/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png
new file mode 100644
index 0000000000..986861dd19
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png b/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png
new file mode 100644
index 0000000000..660d664472
Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver.png b/core/assets-raw/sprites/blocks/production/phase-weaver.png
index 79464317e2..b03f62e27b 100644
Binary files a/core/assets-raw/sprites/blocks/production/phase-weaver.png and b/core/assets-raw/sprites/blocks/production/phase-weaver.png differ
diff --git a/core/assets-raw/sprites/items/item-phase-matter.png b/core/assets-raw/sprites/items/item-phase-matter.png
index 7ad343559f..fcacd1e8d2 100644
Binary files a/core/assets-raw/sprites/items/item-phase-matter.png and b/core/assets-raw/sprites/items/item-phase-matter.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index c494657d7b..6c1bbfcf1e 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -290,7 +290,7 @@ text.blocks.inputcapacity=Input capacity
 text.blocks.outputcapacity=Output capacity
 text.placemode=Place Mode
 text.breakmode=Break Mode
-text.health=health
+text.health=Health
 setting.difficulty.easy=easy
 setting.difficulty.normal=normal
 setting.difficulty.hard=hard
@@ -346,12 +346,6 @@ keybind.player_list.name=player_list
 keybind.console.name=console
 keybind.rotate_alt.name=rotate_alt
 keybind.rotate.name=rotate
-keybind.weapon_1.name=weapon_1
-keybind.weapon_2.name=weapon_2
-keybind.weapon_3.name=weapon_3
-keybind.weapon_4.name=weapon_4
-keybind.weapon_5.name=weapon_5
-keybind.weapon_6.name=weapon_6
 mode.text.help.title=Description of modes
 mode.waves.name=waves
 mode.waves.description=the normal mode. limited resources and automatic incoming waves.
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index e52f01a622..90169ba98b 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,28 +13,28 @@ background
   index: -1
 conveyor-arrow
   rotate: false
-  xy: 919, 431
+  xy: 730, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-arrow
   rotate: false
-  xy: 585, 108
+  xy: 767, 370
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-bridge
   rotate: false
-  xy: 595, 108
+  xy: 767, 360
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-end
   rotate: false
-  xy: 585, 98
+  xy: 777, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -90,42 +90,42 @@ blast-drill-top
   index: -1
 carbide-drill
   rotate: false
-  xy: 807, 361
+  xy: 711, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-rotator
   rotate: false
-  xy: 817, 361
+  xy: 717, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-top
   rotate: false
-  xy: 827, 363
+  xy: 719, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laser-drill
   rotate: false
-  xy: 297, 81
+  xy: 297, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laser-drill-rotator
   rotate: false
-  xy: 297, 63
+  xy: 315, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laser-drill-top
   rotate: false
-  xy: 315, 81
+  xy: 315, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -188,49 +188,49 @@ plasma-drill-top
   index: -1
 tungsten-drill
   rotate: false
-  xy: 385, 5
+  xy: 967, 398
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-rotator
   rotate: false
-  xy: 395, 5
+  xy: 977, 408
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-top
   rotate: false
-  xy: 405, 5
+  xy: 957, 378
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-extractor
   rotate: false
-  xy: 405, 81
+  xy: 261, 37
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 405, 63
+  xy: 279, 43
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 423, 81
+  xy: 297, 45
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 423, 63
+  xy: 315, 45
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -272,14 +272,14 @@ block-icon-blackstone
   index: -1
 blackstone2
   rotate: false
-  xy: 727, 241
+  xy: 659, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 955, 443
+  xy: 659, 223
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -293,588 +293,588 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 859, 427
+  xy: 720, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 869, 427
+  xy: 720, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 879, 427
+  xy: 721, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 939, 431
+  xy: 435, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 355, 13
+  xy: 435, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirtedge
   rotate: false
-  xy: 671, 257
+  xy: 669, 241
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 425, 15
+  xy: 307, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 435, 15
+  xy: 317, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 455, 122
+  xy: 327, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 455, 112
+  xy: 337, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 405, 15
+  xy: 445, 106
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 415, 15
+  xy: 297, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 738, 256
+  xy: 683, 227
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 475, 122
+  xy: 295, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 475, 112
+  xy: 305, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 485, 122
+  xy: 315, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 485, 112
+  xy: 325, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 465, 122
+  xy: 347, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 465, 112
+  xy: 357, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iceedge
   rotate: false
-  xy: 752, 258
+  xy: 697, 227
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 455, 102
+  xy: 335, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 465, 102
+  xy: 345, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 465, 102
+  xy: 345, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 475, 102
+  xy: 355, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 475, 102
+  xy: 355, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lavaedge
   rotate: false
-  xy: 713, 245
+  xy: 711, 243
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 605, 100
+  xy: 777, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 445, 96
+  xy: 797, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 455, 92
+  xy: 787, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 505, 91
+  xy: 787, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 515, 91
+  xy: 777, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 525, 91
+  xy: 807, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 535, 91
+  xy: 797, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 545, 91
+  xy: 787, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalflooredge
   rotate: false
-  xy: 625, 110
+  xy: 725, 243
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 oiledge
   rotate: false
-  xy: 639, 110
+  xy: 725, 229
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 869, 417
+  xy: 907, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 909, 421
+  xy: 897, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 919, 421
+  xy: 907, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 929, 421
+  xy: 917, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 939, 421
+  xy: 927, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 889, 419
+  xy: 927, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 899, 421
+  xy: 947, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandedge
   rotate: false
-  xy: 653, 110
+  xy: 739, 244
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 857, 397
+  xy: 927, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 857, 387
+  xy: 907, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 867, 397
+  xy: 917, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 877, 407
+  xy: 927, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 847, 367
+  xy: 937, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 867, 407
+  xy: 937, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 847, 377
+  xy: 947, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowedge
   rotate: false
-  xy: 841, 437
+  xy: 757, 258
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 855, 437
+  xy: 753, 244
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 877, 397
+  xy: 927, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 847, 357
+  xy: 937, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 857, 367
+  xy: 947, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 867, 377
+  xy: 927, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 857, 377
+  xy: 947, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 867, 387
+  xy: 917, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneedge
   rotate: false
-  xy: 869, 437
+  xy: 753, 230
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 877, 387
+  xy: 937, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 857, 357
+  xy: 947, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 867, 367
+  xy: 937, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 877, 377
+  xy: 947, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 867, 357
+  xy: 947, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 877, 367
+  xy: 957, 418
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten1
   rotate: false
-  xy: 857, 347
+  xy: 967, 408
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten2
   rotate: false
-  xy: 867, 347
+  xy: 977, 418
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten3
   rotate: false
-  xy: 877, 347
+  xy: 957, 388
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 435, 5
+  xy: 957, 368
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 445, 17
+  xy: 967, 378
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 445, 7
+  xy: 977, 388
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 769, 350
+  xy: 967, 368
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 339, 33
+  xy: 827, 435
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 389, 25
+  xy: 767, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 399, 25
+  xy: 765, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 399, 25
+  xy: 765, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 807, 381
+  xy: 680, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 807, 381
+  xy: 680, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 797, 371
+  xy: 690, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 787, 361
+  xy: 700, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 899, 431
+  xy: 730, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 929, 431
+  xy: 731, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-2
   rotate: false
-  xy: 381, 99
+  xy: 399, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -895,7 +895,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 385, 15
+  xy: 445, 116
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -909,49 +909,49 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 837, 403
+  xy: 907, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 837, 393
+  xy: 927, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ripples
   rotate: false
-  xy: 307, 21
+  xy: 718, 217
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 rubble-1-0
   rotate: false
-  xy: 351, 63
+  xy: 387, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-1-1
   rotate: false
-  xy: 369, 81
+  xy: 405, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-0
   rotate: false
-  xy: 369, 63
+  xy: 405, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-1
   rotate: false
-  xy: 387, 81
+  xy: 423, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -972,7 +972,7 @@ rubble-3-1
   index: -1
 shadow-1
   rotate: false
-  xy: 355, 23
+  xy: 742, 218
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1014,7 +1014,7 @@ shadow-6
   index: -1
 shadow-round-1
   rotate: false
-  xy: 367, 23
+  xy: 742, 206
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1028,105 +1028,105 @@ shadow-round-2
   index: -1
 bridgeconduit-arrow
   rotate: false
-  xy: 817, 381
+  xy: 710, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit-bridge
   rotate: false
-  xy: 827, 383
+  xy: 661, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit-end
   rotate: false
-  xy: 807, 371
+  xy: 671, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-arrow
   rotate: false
-  xy: 797, 361
+  xy: 681, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-bridge
   rotate: false
-  xy: 817, 371
+  xy: 691, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-end
   rotate: false
-  xy: 827, 373
+  xy: 701, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 889, 429
+  xy: 727, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top
   rotate: false
-  xy: 909, 431
+  xy: 730, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-arrow
   rotate: false
-  xy: 555, 101
+  xy: 767, 400
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-bridge
   rotate: false
-  xy: 565, 101
+  xy: 767, 390
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-end
   rotate: false
-  xy: 575, 101
+  xy: 767, 380
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter
   rotate: false
-  xy: 465, 92
+  xy: 777, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-bottom
   rotate: false
-  xy: 475, 92
+  xy: 807, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-liquid
   rotate: false
-  xy: 485, 92
+  xy: 817, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-top
   rotate: false
-  xy: 495, 91
+  xy: 797, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1154,14 +1154,14 @@ liquidtank-top
   index: -1
 pulseconduit-bottom
   rotate: false
-  xy: 837, 383
+  xy: 897, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulseconduit-top
   rotate: false
-  xy: 837, 373
+  xy: 907, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1266,7 +1266,7 @@ nuclear-reactor-lights
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 879, 417
+  xy: 917, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1278,13 +1278,6 @@ alloy-fuser
   orig: 24, 24
   offset: 0, 0
   index: -1
-phase-weaver
-  rotate: false
-  xy: 887, 453
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
 block-icon-alloy-fuser
   rotate: false
   xy: 887, 453
@@ -1292,13 +1285,6 @@ block-icon-alloy-fuser
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-icon-phase-weaver
-  rotate: false
-  xy: 887, 453
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
 alloy-smelter
   rotate: false
   xy: 677, 339
@@ -1385,112 +1371,126 @@ block-icon-blast-mixer
   index: -1
 centrifuge-liquid
   rotate: false
-  xy: 345, 99
+  xy: 363, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 535, 121
+  xy: 553, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 553, 121
+  xy: 571, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 571, 121
+  xy: 589, 136
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 589, 136
+  xy: 589, 118
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 589, 118
+  xy: 607, 120
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 607, 120
+  xy: 625, 124
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-extractor
-  rotate: false
-  xy: 395, 15
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
 lavasmelter
   rotate: false
-  xy: 595, 98
+  xy: 787, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-plasteel-compressor-top
-  rotate: false
-  xy: 315, 63
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-poweralloysmelter-top
+phase-weaver
   rotate: false
   xy: 333, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-powersmelter-top
+phase-weaver-bottom
   rotate: false
   xy: 333, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+phase-weaver-weave
+  rotate: false
+  xy: 351, 81
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+plasteel-compressor-top
+  rotate: false
+  xy: 351, 63
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+poweralloysmelter-top
+  rotate: false
+  xy: 369, 81
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+powersmelter-top
+  rotate: false
+  xy: 369, 63
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 silicon-smelter-top
   rotate: false
-  xy: 333, 63
+  xy: 369, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 837, 363
+  xy: 917, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 837, 353
+  xy: 937, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 847, 407
+  xy: 937, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1504,7 +1504,7 @@ core-open
   index: -1
 block-1
   rotate: false
-  xy: 379, 25
+  xy: 767, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1567,35 +1567,35 @@ arc-heat
   index: -1
 crux
   rotate: false
-  xy: 399, 99
+  xy: 417, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 crux-heat
   rotate: false
-  xy: 417, 99
+  xy: 499, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 crux-panel-left
   rotate: false
-  xy: 499, 121
+  xy: 517, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 crux-panel-right
   rotate: false
-  xy: 517, 121
+  xy: 535, 121
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 duo
   rotate: false
-  xy: 375, 13
+  xy: 445, 126
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1630,14 +1630,14 @@ scatter
   index: -1
 lancer
   rotate: false
-  xy: 1013, 423
+  xy: 706, 215
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 295, 21
+  xy: 706, 203
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1651,56 +1651,56 @@ meltdown
   index: -1
 scatter-heat
   rotate: false
-  xy: 319, 21
+  xy: 718, 205
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 331, 21
+  xy: 730, 217
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 343, 21
+  xy: 730, 205
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 swarmer
   rotate: false
-  xy: 387, 63
+  xy: 423, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 261, 37
+  xy: 333, 45
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 279, 43
+  xy: 351, 45
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dronefactory-top
   rotate: false
-  xy: 737, 426
+  xy: 755, 430
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dronefactory-top-open
   rotate: false
-  xy: 755, 430
+  xy: 773, 431
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1714,28 +1714,21 @@ mech-factory
   index: -1
 dart-ship-factory-open
   rotate: false
-  xy: 625, 124
+  xy: 643, 124
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 reconstructor-open
   rotate: false
-  xy: 351, 81
+  xy: 387, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-repairpoint
-  rotate: false
-  xy: 849, 417
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
 repairpoint-turret
   rotate: false
-  xy: 859, 417
+  xy: 897, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1749,14 +1742,14 @@ ship-factory
   index: -1
 door-large-open
   rotate: false
-  xy: 643, 124
+  xy: 737, 426
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 365, 13
+  xy: 435, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1812,14 +1805,14 @@ clear
   index: -1
 enemyarrow
   rotate: false
-  xy: 827, 354
+  xy: 985, 438
   size: 8, 7
   orig: 8, 7
   offset: 0, 0
   index: -1
 error
   rotate: false
-  xy: 699, 257
+  xy: 697, 241
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -1903,14 +1896,14 @@ shell
   index: -1
 shell-back
   rotate: false
-  xy: 727, 262
+  xy: 754, 219
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 847, 387
+  xy: 917, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1924,7 +1917,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 877, 357
+  xy: 957, 408
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1959,49 +1952,49 @@ block-icon-blast-drill
   index: -1
 block-icon-bridgeconduit
   rotate: false
-  xy: 409, 25
+  xy: 765, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit
   rotate: false
-  xy: 409, 25
+  xy: 765, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridgeconveyor
   rotate: false
-  xy: 419, 25
+  xy: 827, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor
   rotate: false
-  xy: 419, 25
+  xy: 827, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-drill
   rotate: false
-  xy: 429, 25
+  xy: 670, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-wall
   rotate: false
-  xy: 437, 37
+  xy: 680, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-wall
   rotate: false
-  xy: 437, 37
+  xy: 680, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2036,35 +2029,35 @@ centrifuge
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 439, 27
+  xy: 690, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 439, 27
+  xy: 690, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 766, 294
+  xy: 700, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 766, 284
+  xy: 710, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor
   rotate: false
-  xy: 766, 284
+  xy: 710, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2113,42 +2106,42 @@ dart-ship-factory
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 766, 274
+  xy: 720, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 766, 274
+  xy: 720, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall
   rotate: false
-  xy: 766, 264
+  xy: 730, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 766, 264
+  xy: 730, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 766, 264
+  xy: 730, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 766, 264
+  xy: 730, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2183,28 +2176,28 @@ block-icon-phase-wall-large
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 766, 254
+  xy: 669, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 766, 254
+  xy: 669, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-door
   rotate: false
-  xy: 766, 244
+  xy: 679, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 766, 244
+  xy: 679, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2232,21 +2225,21 @@ block-icon-dronefactory
   index: -1
 block-icon-droppoint
   rotate: false
-  xy: 435, 125
+  xy: 689, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 droppoint
   rotate: false
-  xy: 435, 125
+  xy: 689, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-duo
   rotate: false
-  xy: 435, 115
+  xy: 699, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2267,105 +2260,105 @@ block-icon-fusion-reactor
   index: -1
 block-icon-grass
   rotate: false
-  xy: 435, 105
+  xy: 709, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 435, 105
+  xy: 709, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-hail
   rotate: false
-  xy: 445, 126
+  xy: 841, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-ice
   rotate: false
-  xy: 445, 116
+  xy: 851, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 445, 116
+  xy: 851, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 445, 106
+  xy: 861, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 445, 106
+  xy: 861, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 655, 248
+  xy: 871, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 655, 248
+  xy: 871, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 665, 247
+  xy: 881, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 665, 247
+  xy: 881, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 675, 247
+  xy: 891, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 675, 247
+  xy: 891, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-junction
   rotate: false
-  xy: 685, 247
+  xy: 901, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 685, 247
+  xy: 901, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2400,77 +2393,77 @@ block-icon-laser-drill
   index: -1
 block-icon-laserconduit
   rotate: false
-  xy: 695, 247
+  xy: 911, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit
   rotate: false
-  xy: 695, 247
+  xy: 911, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-laserconveyor
   rotate: false
-  xy: 752, 234
+  xy: 921, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor
   rotate: false
-  xy: 752, 234
+  xy: 921, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-lava
   rotate: false
-  xy: 762, 234
+  xy: 931, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 762, 234
+  xy: 931, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquidjunction
   rotate: false
-  xy: 772, 234
+  xy: 941, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidjunction
   rotate: false
-  xy: 772, 234
+  xy: 941, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquidrouter
   rotate: false
-  xy: 607, 110
+  xy: 951, 431
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 767, 420
+  xy: 961, 428
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 767, 420
+  xy: 961, 428
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2505,14 +2498,14 @@ core-top
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 767, 410
+  xy: 971, 428
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 767, 410
+  xy: 971, 428
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2526,28 +2519,28 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 767, 400
+  xy: 981, 428
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 767, 400
+  xy: 981, 428
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 767, 390
+  xy: 995, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 767, 390
+  xy: 995, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2582,14 +2575,14 @@ nuclear-reactor
   index: -1
 block-icon-oil
   rotate: false
-  xy: 767, 380
+  xy: 1005, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 767, 380
+  xy: 1005, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2603,32 +2596,39 @@ block-icon-oil-extractor
   index: -1
 block-icon-oilrefinery
   rotate: false
-  xy: 767, 370
+  xy: 1015, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 767, 370
+  xy: 1015, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-overflowgate
   rotate: false
-  xy: 767, 360
+  xy: 991, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflowgate
   rotate: false
-  xy: 767, 360
+  xy: 991, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+block-icon-phase-weaver
+  rotate: false
+  xy: 363, 117
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 block-icon-plasma-drill
   rotate: false
   xy: 271, 161
@@ -2638,126 +2638,133 @@ block-icon-plasma-drill
   index: -1
 block-icon-plasteel-compressor
   rotate: false
-  xy: 363, 117
+  xy: 381, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 plasteel-compressor
   rotate: false
-  xy: 363, 117
+  xy: 381, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 777, 421
+  xy: 1001, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 777, 421
+  xy: 1001, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-power-node-large
   rotate: false
-  xy: 381, 117
+  xy: 399, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 power-node-large
   rotate: false
-  xy: 381, 117
+  xy: 399, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 787, 421
+  xy: 1011, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 787, 421
+  xy: 1011, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 777, 411
+  xy: 766, 294
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 777, 411
+  xy: 766, 294
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulseconduit
   rotate: false
-  xy: 797, 421
+  xy: 766, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 787, 411
+  xy: 766, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-reconstructor
   rotate: false
-  xy: 399, 117
+  xy: 417, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dronefactory
   rotate: false
-  xy: 399, 117
+  xy: 417, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 reconstructor
   rotate: false
-  xy: 399, 117
+  xy: 417, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-repairpoint
   rotate: false
-  xy: 777, 401
+  xy: 657, 177
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+repairpoint
+  rotate: false
+  xy: 657, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-resupplypoint
   rotate: false
-  xy: 807, 421
+  xy: 667, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupplypoint
   rotate: false
-  xy: 807, 421
+  xy: 667, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2771,399 +2778,399 @@ block-icon-ripple
   index: -1
 block-icon-rock
   rotate: false
-  xy: 817, 421
+  xy: 677, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 817, 421
+  xy: 677, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-rotary-pump
   rotate: false
-  xy: 417, 117
+  xy: 213, 98
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rotary-pump
   rotate: false
-  xy: 417, 117
+  xy: 213, 98
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-router
   rotate: false
-  xy: 797, 411
+  xy: 687, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 797, 411
+  xy: 687, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 787, 401
+  xy: 697, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 787, 401
+  xy: 697, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sand
   rotate: false
-  xy: 777, 391
+  xy: 707, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 777, 391
+  xy: 707, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 807, 411
+  xy: 771, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 797, 401
+  xy: 650, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 797, 401
+  xy: 650, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 787, 391
+  xy: 650, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 787, 391
+  xy: 650, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-silicon-smelter
   rotate: false
-  xy: 213, 98
+  xy: 231, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 silicon-smelter
   rotate: false
-  xy: 213, 98
+  xy: 231, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 777, 381
+  xy: 650, 147
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 777, 381
+  xy: 650, 147
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 817, 411
+  xy: 660, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 817, 411
+  xy: 660, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 827, 413
+  xy: 670, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 827, 413
+  xy: 670, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sortedunloader
   rotate: false
-  xy: 807, 401
+  xy: 660, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sortedunloader
   rotate: false
-  xy: 807, 401
+  xy: 660, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 797, 391
+  xy: 680, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 797, 391
+  xy: 680, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 787, 381
+  xy: 670, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 787, 381
+  xy: 670, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-splitter
   rotate: false
-  xy: 777, 371
+  xy: 690, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 splitter
   rotate: false
-  xy: 777, 371
+  xy: 690, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-stone
   rotate: false
-  xy: 817, 401
+  xy: 680, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 817, 401
+  xy: 680, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-stoneformer
   rotate: false
-  xy: 827, 403
+  xy: 700, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneformer
   rotate: false
-  xy: 827, 403
+  xy: 700, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-swarmer
   rotate: false
-  xy: 231, 99
+  xy: 207, 80
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thermal-generator
   rotate: false
-  xy: 207, 80
+  xy: 207, 62
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermal-generator
   rotate: false
-  xy: 207, 80
+  xy: 207, 62
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thermal-pump
   rotate: false
-  xy: 207, 62
+  xy: 207, 44
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermal-pump
   rotate: false
-  xy: 207, 62
+  xy: 207, 44
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thermite-mixer
   rotate: false
-  xy: 207, 44
+  xy: 206, 26
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermite-mixer
   rotate: false
-  xy: 207, 44
+  xy: 206, 26
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 807, 391
+  xy: 690, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 807, 391
+  xy: 690, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-thorium-wall-large
   rotate: false
-  xy: 206, 26
+  xy: 632, 142
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thorium-wall-large
   rotate: false
-  xy: 206, 26
+  xy: 632, 142
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 797, 381
+  xy: 700, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor
   rotate: false
-  xy: 797, 381
+  xy: 700, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-drill
   rotate: false
-  xy: 787, 371
+  xy: 710, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-wall
   rotate: false
-  xy: 777, 361
+  xy: 710, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-wall
   rotate: false
-  xy: 777, 361
+  xy: 710, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-wall-large
   rotate: false
-  xy: 632, 142
+  xy: 291, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 tungsten-wall-large
   rotate: false
-  xy: 632, 142
+  xy: 291, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-turbine-generator
   rotate: false
-  xy: 291, 99
+  xy: 309, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 turbine-generator
   rotate: false
-  xy: 291, 99
+  xy: 309, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 817, 391
+  xy: 660, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 817, 391
+  xy: 660, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3198,714 +3205,714 @@ warpgate
   index: -1
 block-icon-water
   rotate: false
-  xy: 827, 393
+  xy: 670, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 827, 393
+  xy: 670, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-water-extractor
   rotate: false
-  xy: 309, 99
+  xy: 327, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-wave
   rotate: false
-  xy: 327, 99
+  xy: 345, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 738, 242
+  xy: 711, 229
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 738, 242
+  xy: 711, 229
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-omega-mech
   rotate: false
-  xy: 738, 242
+  xy: 711, 229
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-tau-mech
   rotate: false
-  xy: 738, 242
+  xy: 711, 229
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 752, 244
+  xy: 719, 257
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-halberd-ship
   rotate: false
-  xy: 752, 244
+  xy: 719, 257
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-javelin-ship
   rotate: false
-  xy: 752, 244
+  xy: 719, 257
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-trident-ship
   rotate: false
-  xy: 752, 244
+  xy: 719, 257
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 555, 91
+  xy: 777, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 565, 91
+  xy: 817, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 575, 91
+  xy: 827, 415
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 585, 88
+  xy: 807, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 595, 88
+  xy: 797, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 605, 90
+  xy: 787, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 441, 86
+  xy: 777, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 441, 76
+  xy: 817, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 441, 66
+  xy: 827, 405
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 441, 56
+  xy: 807, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 451, 82
+  xy: 797, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 461, 82
+  xy: 787, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 451, 72
+  xy: 777, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 471, 82
+  xy: 817, 391
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 451, 62
+  xy: 827, 395
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 461, 72
+  xy: 807, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 481, 82
+  xy: 797, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 461, 62
+  xy: 787, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 471, 72
+  xy: 817, 381
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 471, 62
+  xy: 827, 385
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 481, 72
+  xy: 807, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 481, 62
+  xy: 797, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 451, 52
+  xy: 817, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 461, 52
+  xy: 827, 375
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 471, 52
+  xy: 807, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 481, 52
+  xy: 817, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 491, 81
+  xy: 827, 365
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 491, 71
+  xy: 837, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 501, 81
+  xy: 847, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 491, 61
+  xy: 837, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 501, 71
+  xy: 857, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 511, 81
+  xy: 837, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 501, 61
+  xy: 847, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 511, 71
+  xy: 867, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 521, 81
+  xy: 837, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 511, 61
+  xy: 847, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 521, 71
+  xy: 857, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 531, 81
+  xy: 877, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 521, 61
+  xy: 837, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 531, 71
+  xy: 847, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 541, 81
+  xy: 857, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 531, 61
+  xy: 867, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 541, 71
+  xy: 837, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 551, 81
+  xy: 847, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 541, 61
+  xy: 857, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 551, 71
+  xy: 867, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 561, 81
+  xy: 877, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 551, 61
+  xy: 847, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 561, 71
+  xy: 857, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 571, 81
+  xy: 867, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 561, 61
+  xy: 877, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 571, 71
+  xy: 857, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 571, 61
+  xy: 867, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 491, 51
+  xy: 877, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 501, 51
+  xy: 867, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 511, 51
+  xy: 877, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 521, 51
+  xy: 877, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 531, 51
+  xy: 827, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 541, 51
+  xy: 837, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 551, 51
+  xy: 847, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass1
   rotate: false
-  xy: 561, 51
+  xy: 857, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass2
   rotate: false
-  xy: 571, 51
+  xy: 867, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass3
   rotate: false
-  xy: 581, 78
+  xy: 877, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice1
   rotate: false
-  xy: 581, 68
+  xy: 887, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice2
   rotate: false
-  xy: 591, 78
+  xy: 887, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice3
   rotate: false
-  xy: 581, 58
+  xy: 887, 399
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand1
   rotate: false
-  xy: 591, 68
+  xy: 887, 389
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand2
   rotate: false
-  xy: 591, 58
+  xy: 887, 379
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand3
   rotate: false
-  xy: 581, 48
+  xy: 887, 369
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow1
   rotate: false
-  xy: 591, 48
+  xy: 887, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow2
   rotate: false
-  xy: 601, 78
+  xy: 897, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow3
   rotate: false
-  xy: 601, 68
+  xy: 907, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone1
   rotate: false
-  xy: 601, 58
+  xy: 897, 411
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone2
   rotate: false
-  xy: 601, 48
+  xy: 917, 421
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone3
   rotate: false
-  xy: 837, 413
+  xy: 897, 401
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 495, 111
+  xy: 379, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 505, 111
+  xy: 389, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-carbide
   rotate: false
-  xy: 515, 111
+  xy: 399, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 525, 111
+  xy: 409, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 535, 111
+  xy: 419, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 545, 111
+  xy: 429, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plasteel
   rotate: false
-  xy: 555, 111
+  xy: 439, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 565, 111
+  xy: 607, 110
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 575, 111
+  xy: 754, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 495, 101
+  xy: 764, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 505, 101
+  xy: 775, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thermite
   rotate: false
-  xy: 515, 101
+  xy: 775, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 525, 101
+  xy: 774, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 535, 101
+  xy: 767, 420
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-tungsten
   rotate: false
-  xy: 545, 101
+  xy: 767, 410
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4010,28 +4017,28 @@ scout-leg
   index: -1
 dart-ship
   rotate: false
-  xy: 657, 259
+  xy: 655, 243
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 halberd-ship
   rotate: false
-  xy: 657, 259
+  xy: 655, 243
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 javelin-ship
   rotate: false
-  xy: 657, 259
+  xy: 655, 243
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 657, 259
+  xy: 655, 243
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -4208,7 +4215,7 @@ discord-banner-over
   index: -1
 controller-cursor
   rotate: false
-  xy: 363, 99
+  xy: 381, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4250,14 +4257,14 @@ icon-areaDelete
   index: -1
 icon-arrow
   rotate: false
-  xy: 773, 431
+  xy: 791, 431
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 773, 431
+  xy: 791, 431
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4285,14 +4292,14 @@ icon-arrow-right
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 353, 35
+  xy: 733, 258
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-back
   rotate: false
-  xy: 791, 431
+  xy: 809, 431
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4306,49 +4313,49 @@ icon-ban
   index: -1
 icon-break
   rotate: false
-  xy: 809, 431
+  xy: 731, 408
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 731, 408
+  xy: 731, 390
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 365, 35
+  xy: 745, 258
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-check
   rotate: false
-  xy: 731, 390
+  xy: 731, 372
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 377, 35
+  xy: 841, 439
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 389, 35
+  xy: 853, 439
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 401, 35
+  xy: 865, 439
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -4369,7 +4376,7 @@ icon-discord
   index: -1
 icon-distribution
   rotate: false
-  xy: 413, 35
+  xy: 877, 439
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -4397,483 +4404,483 @@ icon-editor
   index: -1
 icon-egg
   rotate: false
-  xy: 297, 47
+  xy: 369, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-elevation
   rotate: false
-  xy: 731, 372
+  xy: 731, 354
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-eraser
   rotate: false
-  xy: 731, 354
+  xy: 733, 324
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-exit
   rotate: false
-  xy: 313, 47
+  xy: 385, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 733, 324
+  xy: 733, 306
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 733, 306
+  xy: 225, 80
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 329, 47
+  xy: 401, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 225, 80
+  xy: 225, 62
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-floppy
   rotate: false
-  xy: 345, 47
+  xy: 417, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 225, 62
+  xy: 225, 44
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 361, 47
+  xy: 433, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 377, 47
+  xy: 279, 27
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-github
   rotate: false
-  xy: 393, 47
+  xy: 626, 285
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 409, 47
+  xy: 624, 269
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-grid
   rotate: false
-  xy: 225, 44
+  xy: 224, 26
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-hold
   rotate: false
-  xy: 425, 35
+  xy: 889, 441
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 827, 423
+  xy: 901, 441
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 425, 47
+  xy: 642, 285
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 279, 27
+  xy: 640, 269
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 883, 439
+  xy: 913, 441
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 626, 285
+  xy: 658, 289
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 485, 102
+  xy: 369, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 224, 26
+  xy: 749, 408
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-link
   rotate: false
-  xy: 624, 269
+  xy: 674, 287
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 895, 441
+  xy: 925, 441
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 642, 285
+  xy: 690, 287
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 749, 408
+  xy: 749, 390
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 749, 390
+  xy: 749, 372
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 749, 372
+  xy: 749, 354
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 907, 441
+  xy: 937, 441
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 919, 441
+  xy: 949, 441
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 749, 354
+  xy: 751, 322
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 931, 441
+  xy: 658, 211
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 943, 441
+  xy: 658, 199
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 751, 322
+  xy: 751, 304
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 640, 269
+  xy: 706, 287
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 751, 304
+  xy: 243, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 965, 438
+  xy: 657, 187
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 658, 289
+  xy: 722, 289
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 977, 438
+  xy: 670, 215
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 989, 435
+  xy: 670, 203
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 1001, 435
+  xy: 682, 215
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 674, 287
+  xy: 750, 288
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 243, 81
+  xy: 243, 63
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 690, 287
+  xy: 722, 273
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 706, 287
+  xy: 639, 242
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 243, 63
+  xy: 243, 45
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 722, 289
+  xy: 642, 216
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 750, 288
+  xy: 642, 200
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 722, 273
+  xy: 641, 184
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 639, 242
+  xy: 750, 272
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 642, 216
+  xy: 658, 273
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 243, 45
+  xy: 261, 91
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 261, 91
+  xy: 261, 73
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 1013, 435
+  xy: 682, 203
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 261, 73
+  xy: 261, 55
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 642, 200
+  xy: 674, 271
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 965, 426
+  xy: 694, 215
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 977, 426
+  xy: 694, 203
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 641, 184
+  xy: 690, 271
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 261, 55
+  xy: 279, 79
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-trello
   rotate: false
-  xy: 750, 272
+  xy: 706, 271
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 658, 273
+  xy: 657, 257
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 279, 79
+  xy: 279, 61
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 989, 423
+  xy: 961, 438
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-weapon
   rotate: false
-  xy: 1001, 423
+  xy: 973, 438
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 674, 271
+  xy: 673, 255
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 279, 61
+  xy: 297, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 690, 271
+  xy: 689, 255
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5046,42 +5053,42 @@ window-empty
   index: -1
 drone
   rotate: false
-  xy: 685, 257
+  xy: 683, 241
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 scout
   rotate: false
-  xy: 827, 435
+  xy: 739, 230
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol
   rotate: false
-  xy: 297, 33
+  xy: 625, 110
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol-booster-1
   rotate: false
-  xy: 311, 33
+  xy: 639, 110
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol-booster-2
   rotate: false
-  xy: 325, 33
+  xy: 653, 110
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol-flame
   rotate: false
-  xy: 727, 251
+  xy: 754, 208
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -5095,77 +5102,77 @@ beam-equip
   index: -1
 blaster
   rotate: false
-  xy: 955, 433
+  xy: 767, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blaster-equip
   rotate: false
-  xy: 706, 273
+  xy: 705, 257
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 clustergun
   rotate: false
-  xy: 839, 425
+  xy: 729, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 clustergun-equip
   rotate: false
-  xy: 849, 427
+  xy: 720, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-weapon
   rotate: false
-  xy: 713, 259
+  xy: 669, 227
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shockgun
   rotate: false
-  xy: 847, 397
+  xy: 897, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 857, 407
+  xy: 907, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 triblaster
   rotate: false
-  xy: 949, 423
+  xy: 967, 418
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 triblaster-equip
   rotate: false
-  xy: 847, 347
+  xy: 957, 398
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vulcan
   rotate: false
-  xy: 415, 5
+  xy: 967, 388
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vulcan-equip
   rotate: false
-  xy: 425, 5
+  xy: 977, 398
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 432a321560..74a143345d 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/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java
index 196037c0ec..d1974979c5 100644
--- a/core/src/io/anuke/mindustry/content/Recipes.java
+++ b/core/src/io/anuke/mindustry/content/Recipes.java
@@ -59,7 +59,6 @@ public class Recipes implements ContentList{
         new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.tungsten, 60), new ItemStack(Items.lead, 50));
 
         //other crafting
-        //TODO phaseweaver sprites
         new Recipe(crafting, CraftingBlocks.phaseweaver, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 160), new ItemStack(Items.thorium, 150));
         //TODO implement alloy smelter
         // new Recipe(crafting, CraftingBlocks.alloySmelter, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 160), new ItemStack(Items.thorium, 140));
diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
index f63526aafd..8751d252c2 100644
--- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
@@ -68,14 +68,14 @@ public class CraftingBlocks extends BlockList implements ContentList {
             updateEffect = BlockFx.plasticburn;
         }};
 
-        phaseweaver = new PowerSmelter("phase-weaver") {{
+        phaseweaver = new PhaseWeaver("phase-weaver") {{
             health = 90;
             craftEffect = BlockFx.smeltsmoke;
-            inputs = new ItemStack[]{new ItemStack(Items.thorium, 2), new ItemStack(Items.sand, 6)};
+            inputs = new ItemStack[]{new ItemStack(Items.thorium, 4), new ItemStack(Items.sand, 10)};
             result = Items.phasematter;
             powerUse = 0.4f;
-            craftTime = 100f;
-            size = 3;
+            craftTime = 120f;
+            size = 2;
         }};
 
         alloysmelter = new PowerSmelter("alloy-smelter") {{
diff --git a/core/src/io/anuke/mindustry/core/ContentLoader.java b/core/src/io/anuke/mindustry/core/ContentLoader.java
index b0b2dd4303..27bc0385e9 100644
--- a/core/src/io/anuke/mindustry/core/ContentLoader.java
+++ b/core/src/io/anuke/mindustry/core/ContentLoader.java
@@ -111,7 +111,7 @@ public class ContentLoader {
         }
 
         if(Block.all().size >= 256){
-            throw new IllegalArgumentException("THE TIME HAS COME. More than 256 blocks have been created..");
+            throw new IllegalArgumentException("THE TIME HAS COME. More than 256 blocks have been created.");
         }
 
         Log.info("--- CONTENT INFO ---");
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java
new file mode 100644
index 0000000000..baa50bb952
--- /dev/null
+++ b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java
@@ -0,0 +1,69 @@
+package io.anuke.mindustry.world.blocks.production;
+
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.graphics.Palette;
+import io.anuke.mindustry.graphics.Shaders;
+import io.anuke.mindustry.world.Tile;
+import io.anuke.ucore.core.Graphics;
+import io.anuke.ucore.graphics.Draw;
+import io.anuke.ucore.graphics.Lines;
+import io.anuke.ucore.util.Mathf;
+
+public class PhaseWeaver extends PowerSmelter{
+    protected TextureRegion bottomRegion;
+    protected TextureRegion weaveRegion;
+
+    public PhaseWeaver(String name) {
+        super(name);
+    }
+
+    @Override
+    public void load() {
+        super.load();
+
+        bottomRegion = Draw.region(name + "-bottom");
+        weaveRegion = Draw.region(name + "-weave");
+    }
+
+    @Override
+    public TextureRegion[] getIcon() {
+        if(icon == null){
+            icon = new TextureRegion[]{Draw.region(name + "-bottom"), Draw.region(name)};
+        }
+        return icon;
+    }
+
+    @Override
+    public void draw(Tile tile) {
+        PowerSmelterEntity entity = tile.entity();
+
+        Draw.rect(bottomRegion, tile.drawx(), tile.drawy());
+
+        if(entity.heat > 0.001f){
+            float progress = 0.5f;
+
+            Shaders.build.region = weaveRegion;
+            Shaders.build.progress = progress;
+            Shaders.build.color.set(Palette.accent);
+            Shaders.build.time = -entity.time / 10f;
+
+            Graphics.shader(Shaders.build, false);
+            Shaders.build.apply();
+            Draw.rect(weaveRegion, tile.drawx(), tile.drawy(), entity.time);
+            Graphics.shader();
+
+            Draw.color(Palette.accent);
+
+            Lines.lineAngleCenter(
+                    tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size),
+                    tile.drawy(),
+                    90,
+                    size * Vars.tilesize /2f);
+
+            Draw.reset();
+        }
+
+        Draw.rect(name, tile.drawx(), tile.drawy());
+    }
+}
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
index 46bf59f58c..a113a965f9 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
@@ -100,6 +100,7 @@ public class PowerSmelter extends PowerBlock {
         }
 
         entity.heat = Mathf.clamp(entity.heat);
+        entity.time += entity.heat * Timers.delta();
 
         //make sure it has all the items
         for(ItemStack item : inputs){
@@ -191,6 +192,7 @@ public class PowerSmelter extends PowerBlock {
 
     class PowerSmelterEntity extends TileEntity{
         public float heat;
+        public float time;
 
         @Override
         public void write(DataOutputStream stream) throws IOException {