diff --git a/core/assets-raw/sprites/blocks/environment/scrap1.png b/core/assets-raw/sprites/blocks/environment/scrap1.png
new file mode 100644
index 0000000000..c509773e5b
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/scrap1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/scrap2.png b/core/assets-raw/sprites/blocks/environment/scrap2.png
new file mode 100644
index 0000000000..567a887bf7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/scrap2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/scrap3.png b/core/assets-raw/sprites/blocks/environment/scrap3.png
new file mode 100644
index 0000000000..f491b722e8
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/scrap3.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/block-border.png b/core/assets-raw/sprites/blocks/extra/block-border.png
new file mode 100644
index 0000000000..58c5afd372
Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/block-border.png differ
diff --git a/core/assets-raw/sprites/items/item-scrap.png b/core/assets-raw/sprites/items/item-scrap.png
new file mode 100644
index 0000000000..a19374afad
Binary files /dev/null and b/core/assets-raw/sprites/items/item-scrap.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index ec6be2e81e..3aeb9a7f77 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -430,8 +430,10 @@ item.blast-compound.name = Blast Compound
 item.blast-compound.description = A volatile compound used in bombs and explosives. While it can burned as fuel, this is not advised.
 item.pyratite.name = Pyratite
 item.pyratite.description = An extremely flammable substance used in incendiary weapons.
-item.bioglass.name = Bioglass
+item.metaglass.name = Metaglass
+item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
 item.scrap.name = Scrap
+item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
 liquid.water.name = Water
 liquid.lava.name = Lava
 liquid.oil.name = Oil
diff --git a/core/assets/maps/groundZero.mmap b/core/assets/maps/groundZero.mmap
index 91cb1de6d5..ccf66d1959 100644
Binary files a/core/assets/maps/groundZero.mmap and b/core/assets/maps/groundZero.mmap differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 5a4bd4e853..ac9d8c6e63 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -48,7 +48,7 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1989, 1375
+  xy: 1921, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -216,140 +216,140 @@ conveyor-4-3
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1649, 1307
+  xy: 667, 312
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1683, 1307
+  xy: 667, 278
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1717, 1307
+  xy: 667, 244
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1751, 1307
+  xy: 667, 210
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1785, 1307
+  xy: 667, 176
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1819, 1307
+  xy: 667, 142
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1853, 1307
+  xy: 667, 108
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1887, 1307
+  xy: 667, 74
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1921, 1307
+  xy: 701, 310
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1955, 1307
+  xy: 701, 276
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1989, 1307
+  xy: 701, 242
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 777, 951
+  xy: 701, 208
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 777, 917
+  xy: 701, 174
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 811, 959
+  xy: 701, 140
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 811, 925
+  xy: 701, 106
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 851, 1025
+  xy: 701, 72
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 885, 1025
+  xy: 735, 310
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 975, 1149
+  xy: 735, 276
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 975, 1115
+  xy: 735, 242
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1009, 1157
+  xy: 735, 208
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -363,7 +363,7 @@ distributor
   index: -1
 junction
   rotate: false
-  xy: 1623, 1545
+  xy: 1657, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -384,49 +384,49 @@ mass-driver-turret
   index: -1
 overflow-gate
   rotate: false
-  xy: 1207, 1375
+  xy: 1547, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1309, 1409
+  xy: 1615, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1309, 1375
+  xy: 1649, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1343, 1409
+  xy: 1649, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1343, 1375
+  xy: 1683, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1717, 1375
+  xy: 1275, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1649, 1341
+  xy: 1547, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -825,7 +825,7 @@ icerock2
   index: -1
 lava
   rotate: false
-  xy: 1657, 1579
+  xy: 1691, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -839,63 +839,63 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 1725, 1647
+  xy: 1759, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 1759, 1681
+  xy: 1793, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 1793, 1715
+  xy: 1827, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 1895, 1783
+  xy: 1623, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 1623, 1477
+  xy: 1657, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 1657, 1511
+  xy: 1691, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 1691, 1545
+  xy: 1725, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 1725, 1579
+  xy: 1759, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 1759, 1613
+  xy: 1793, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -909,49 +909,49 @@ metalflooredge
   index: -1
 rock1
   rotate: false
-  xy: 1649, 1375
+  xy: 1989, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 1683, 1409
+  xy: 1989, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks1
   rotate: false
-  xy: 1683, 1375
+  xy: 1207, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 1717, 1409
+  xy: 1241, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 1751, 1375
+  xy: 1343, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 1785, 1409
+  xy: 1377, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 1785, 1375
+  xy: 1411, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -963,30 +963,51 @@ sandedge
   orig: 48, 48
   offset: 0, 0
   index: -1
+scrap1
+  rotate: false
+  xy: 1683, 1341
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap2
+  rotate: false
+  xy: 1717, 1341
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap3
+  rotate: false
+  xy: 1751, 1341
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 shrub
   rotate: false
-  xy: 1241, 1341
+  xy: 1989, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 1309, 1341
+  xy: 1207, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1343, 1341
+  xy: 1241, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1377, 1341
+  xy: 1275, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1007,49 +1028,49 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 1955, 1341
+  xy: 1853, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 1989, 1341
+  xy: 1887, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 1173, 1311
+  xy: 1921, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 1207, 1307
+  xy: 1955, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 1853, 1341
+  xy: 1751, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 1887, 1341
+  xy: 1785, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1921, 1341
+  xy: 1819, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1070,70 +1091,70 @@ taredge
   index: -1
 thorium1
   rotate: false
-  xy: 1411, 1307
+  xy: 851, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1445, 1307
+  xy: 885, 1025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1479, 1307
+  xy: 975, 1149
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1547, 1307
+  xy: 1009, 1157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1581, 1307
+  xy: 1009, 1123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1615, 1307
+  xy: 1049, 1223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 667, 312
+  xy: 735, 106
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 667, 278
+  xy: 735, 72
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 667, 244
+  xy: 271, 76
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 667, 210
+  xy: 305, 77
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1217,7 +1238,7 @@ rubble-3-1
   index: -1
 spawn
   rotate: false
-  xy: 1819, 1341
+  xy: 1717, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1364,28 +1385,28 @@ conduit-top-6
   index: -1
 liquid-junction
   rotate: false
-  xy: 1861, 1783
+  xy: 1589, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1623, 1511
+  xy: 1657, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1657, 1545
+  xy: 1691, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1691, 1579
+  xy: 1725, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1413,84 +1434,84 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1827, 1715
+  xy: 1861, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1241, 1409
+  xy: 1547, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1241, 1375
+  xy: 1581, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1275, 1409
+  xy: 1581, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1275, 1375
+  xy: 1615, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1479, 1409
+  xy: 1785, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1479, 1375
+  xy: 1819, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1513, 1409
+  xy: 1819, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1513, 1375
+  xy: 1853, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1547, 1409
+  xy: 1853, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1547, 1375
+  xy: 1887, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1581, 1409
+  xy: 1887, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1651,7 +1672,7 @@ fusion-reactor-top
   index: -1
 power-node
   rotate: false
-  xy: 1377, 1375
+  xy: 1717, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1665,28 +1686,28 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 1411, 1409
+  xy: 1717, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1411, 1375
+  xy: 1751, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 1445, 1409
+  xy: 1751, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 1445, 1375
+  xy: 1785, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1700,14 +1721,14 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1751, 1409
+  xy: 1309, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1547, 1341
+  xy: 1445, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1910,42 +1931,42 @@ incinerator
   index: -1
 item-source
   rotate: false
-  xy: 1725, 1681
+  xy: 1759, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1589, 1511
+  xy: 1623, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lavasmelter
   rotate: false
-  xy: 1691, 1613
+  xy: 1725, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 1759, 1647
+  xy: 1793, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1861, 1749
+  xy: 1895, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 1929, 1783
+  xy: 1657, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1987,14 +2008,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1581, 1375
+  xy: 1921, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1615, 1409
+  xy: 1921, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2008,14 +2029,14 @@ pyratite-mixer
   index: -1
 separator
   rotate: false
-  xy: 1955, 1375
+  xy: 1853, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 1989, 1409
+  xy: 1887, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2029,14 +2050,14 @@ silicon-smelter
   index: -1
 smelter
   rotate: false
-  xy: 1275, 1341
+  xy: 1173, 1311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 1581, 1341
+  xy: 1479, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2078,14 +2099,14 @@ launch-pad
   index: -1
 sortedunloader
   rotate: false
-  xy: 1615, 1341
+  xy: 1513, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1049, 1223
+  xy: 735, 140
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2274,21 +2295,21 @@ salvo-panel-right
   index: -1
 scatter
   rotate: false
-  xy: 1887, 1409
+  xy: 1581, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 1887, 1375
+  xy: 1615, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 1921, 1409
+  xy: 1649, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2456,14 +2477,14 @@ reconstructor-open
   index: -1
 repair-point
   rotate: false
-  xy: 1615, 1375
+  xy: 1955, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-turret
   rotate: false
-  xy: 1649, 1409
+  xy: 1955, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2596,7 +2617,7 @@ door-open
   index: -1
 phase-wall
   rotate: false
-  xy: 1377, 1409
+  xy: 1683, 1375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2610,7 +2631,7 @@ phase-wall-large
   index: -1
 surge-wall
   rotate: false
-  xy: 1241, 1307
+  xy: 1989, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2624,7 +2645,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1513, 1307
+  xy: 975, 1115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2638,7 +2659,7 @@ thorium-wall-large
   index: -1
 beam
   rotate: false
-  xy: 1165, 1281
+  xy: 703, 525
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2666,7 +2687,7 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 740, 693
+  xy: 1197, 1293
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -2715,7 +2736,7 @@ error
   index: -1
 laser
   rotate: false
-  xy: 703, 525
+  xy: 1041, 1199
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2736,7 +2757,7 @@ laserfull
   index: -1
 minelaser
   rotate: false
-  xy: 843, 1001
+  xy: 707, 579
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2820,21 +2841,21 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 1207, 1341
+  xy: 1955, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 1041, 1199
+  xy: 740, 665
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1009, 1123
+  xy: 735, 174
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3947,774 +3968,900 @@ mech-icon-trident-ship
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 1793, 1647
+  xy: 1827, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 1827, 1681
+  xy: 1861, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 1861, 1715
+  xy: 1895, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 1895, 1749
+  xy: 1929, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 1657, 1477
+  xy: 1691, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 1691, 1511
+  xy: 1725, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 1725, 1545
+  xy: 1759, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 1759, 1579
+  xy: 1793, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 1793, 1613
+  xy: 1827, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 1827, 1647
+  xy: 1861, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 1861, 1681
+  xy: 1895, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 1895, 1715
+  xy: 1929, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 1929, 1749
+  xy: 1963, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 1963, 1783
+  xy: 1691, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 1691, 1477
+  xy: 1725, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 1725, 1511
+  xy: 1759, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 1759, 1545
+  xy: 1793, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 1793, 1579
+  xy: 1827, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 1827, 1613
+  xy: 1861, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 1861, 1647
+  xy: 1895, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 1895, 1681
+  xy: 1929, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 1929, 1715
+  xy: 1963, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 1963, 1749
+  xy: 1997, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 1997, 1783
+  xy: 1725, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 1725, 1477
+  xy: 1759, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 1759, 1511
+  xy: 1793, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 1793, 1545
+  xy: 1827, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 1827, 1579
+  xy: 1861, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 1861, 1613
+  xy: 1895, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 1895, 1647
+  xy: 1929, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 1929, 1681
+  xy: 1963, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 1963, 1715
+  xy: 1997, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 1997, 1749
+  xy: 1759, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 1759, 1477
+  xy: 1793, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 1793, 1511
+  xy: 1827, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 1827, 1545
+  xy: 1861, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 1861, 1579
+  xy: 1895, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 1895, 1613
+  xy: 1929, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 1929, 1647
+  xy: 1963, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 1963, 1681
+  xy: 1997, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 1997, 1715
+  xy: 1793, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 1793, 1477
+  xy: 1827, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 1827, 1511
+  xy: 1861, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 1861, 1545
+  xy: 1895, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 1895, 1579
+  xy: 1929, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 1929, 1613
+  xy: 1963, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 1963, 1647
+  xy: 1997, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 1997, 1681
+  xy: 1827, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 1827, 1477
+  xy: 1861, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 1861, 1511
+  xy: 1895, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 1895, 1545
+  xy: 1929, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 1929, 1579
+  xy: 1963, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 1963, 1613
+  xy: 1997, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 1997, 1647
+  xy: 1861, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 1861, 1477
+  xy: 1895, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 1895, 1511
+  xy: 1929, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 1929, 1545
+  xy: 1963, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone3
-  rotate: false
-  xy: 1963, 1579
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-ore-thorium-blackstone1
   rotate: false
   xy: 1997, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-blackstone2
+ore-scrap-blackstone1
   rotate: false
   xy: 1895, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-blackstone3
+ore-scrap-blackstone2
   rotate: false
   xy: 1929, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-grass1
+ore-scrap-blackstone3
   rotate: false
   xy: 1963, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-grass2
+ore-scrap-grass1
   rotate: false
   xy: 1997, 1579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-grass3
+ore-scrap-grass2
   rotate: false
   xy: 1929, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-ice1
+ore-scrap-grass3
   rotate: false
   xy: 1963, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-ice2
+ore-scrap-ice1
   rotate: false
   xy: 1997, 1545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-ice3
+ore-scrap-ice2
   rotate: false
   xy: 1963, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-sand1
+ore-scrap-ice3
   rotate: false
   xy: 1997, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-sand2
+ore-scrap-sand1
   rotate: false
   xy: 1997, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-sand3
+ore-scrap-sand2
   rotate: false
   xy: 1215, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-snow1
+ore-scrap-sand3
   rotate: false
   xy: 1249, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-snow2
+ore-scrap-snow1
   rotate: false
   xy: 1283, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-snow3
+ore-scrap-snow2
   rotate: false
   xy: 1317, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-stone1
+ore-scrap-snow3
   rotate: false
   xy: 1351, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-stone2
+ore-scrap-stone1
   rotate: false
   xy: 1385, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-thorium-stone3
+ore-scrap-stone2
   rotate: false
   xy: 1419, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-blackstone1
+ore-scrap-stone3
   rotate: false
   xy: 1453, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-blackstone2
+ore-thorium-blackstone1
   rotate: false
   xy: 1487, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-blackstone3
+ore-thorium-blackstone2
   rotate: false
   xy: 1521, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-grass1
+ore-thorium-blackstone3
   rotate: false
   xy: 1555, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-grass2
+ore-thorium-grass1
   rotate: false
   xy: 1589, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-grass3
+ore-thorium-grass2
   rotate: false
   xy: 1623, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-ice1
+ore-thorium-grass3
   rotate: false
   xy: 1657, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-ice2
+ore-thorium-ice1
   rotate: false
   xy: 1691, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-ice3
+ore-thorium-ice2
   rotate: false
   xy: 1725, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-sand1
+ore-thorium-ice3
   rotate: false
   xy: 1759, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-sand2
+ore-thorium-sand1
   rotate: false
   xy: 1793, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-sand3
+ore-thorium-sand2
   rotate: false
   xy: 1827, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-snow1
+ore-thorium-sand3
   rotate: false
   xy: 1861, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-snow2
+ore-thorium-snow1
   rotate: false
   xy: 1895, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-snow3
+ore-thorium-snow2
   rotate: false
   xy: 1929, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-stone1
+ore-thorium-snow3
   rotate: false
   xy: 1963, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-stone2
+ore-thorium-stone1
   rotate: false
   xy: 1997, 1443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-ore-titanium-stone3
+ore-thorium-stone2
   rotate: false
   xy: 1207, 1409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+ore-thorium-stone3
+  rotate: false
+  xy: 1207, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-blackstone1
+  rotate: false
+  xy: 1241, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-blackstone2
+  rotate: false
+  xy: 1241, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-blackstone3
+  rotate: false
+  xy: 1275, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-grass1
+  rotate: false
+  xy: 1275, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-grass2
+  rotate: false
+  xy: 1309, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-grass3
+  rotate: false
+  xy: 1309, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-ice1
+  rotate: false
+  xy: 1343, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-ice2
+  rotate: false
+  xy: 1343, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-ice3
+  rotate: false
+  xy: 1377, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-sand1
+  rotate: false
+  xy: 1377, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-sand2
+  rotate: false
+  xy: 1411, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-sand3
+  rotate: false
+  xy: 1411, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-snow1
+  rotate: false
+  xy: 1445, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-snow2
+  rotate: false
+  xy: 1445, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-snow3
+  rotate: false
+  xy: 1479, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-stone1
+  rotate: false
+  xy: 1479, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-stone2
+  rotate: false
+  xy: 1513, 1409
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+ore-titanium-stone3
+  rotate: false
+  xy: 1513, 1375
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 sand-cliff-edge
-  rotate: false
-  xy: 1819, 1409
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-cliff-edge-1
-  rotate: false
-  xy: 1819, 1375
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-cliff-edge-2
-  rotate: false
-  xy: 1853, 1409
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-cliff-side
-  rotate: false
-  xy: 1853, 1375
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snow-cliff-edge
-  rotate: false
-  xy: 1411, 1341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-snow-cliff-edge-1
   rotate: false
   xy: 1445, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-snow-cliff-edge-2
+sand-cliff-edge-1
   rotate: false
   xy: 1479, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-snow-cliff-side
+sand-cliff-edge-2
   rotate: false
   xy: 1513, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-space-cliff-edge
+sand-cliff-side
   rotate: false
-  xy: 1683, 1341
+  xy: 1547, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-space-cliff-edge-1
-  rotate: false
-  xy: 1717, 1341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-space-cliff-edge-2
-  rotate: false
-  xy: 1751, 1341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-space-cliff-side
-  rotate: false
-  xy: 1785, 1341
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-tar-cliff-edge
-  rotate: false
-  xy: 1275, 1307
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-tar-cliff-edge-1
+snow-cliff-edge
   rotate: false
   xy: 1309, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-tar-cliff-edge-2
+snow-cliff-edge-1
   rotate: false
   xy: 1343, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-tar-cliff-side
+snow-cliff-edge-2
   rotate: false
   xy: 1377, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+snow-cliff-side
+  rotate: false
+  xy: 1411, 1307
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+space-cliff-edge
+  rotate: false
+  xy: 1581, 1307
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+space-cliff-edge-1
+  rotate: false
+  xy: 1615, 1307
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+space-cliff-edge-2
+  rotate: false
+  xy: 1649, 1307
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+space-cliff-side
+  rotate: false
+  xy: 1683, 1307
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+tar-cliff-edge
+  rotate: false
+  xy: 777, 951
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+tar-cliff-edge-1
+  rotate: false
+  xy: 777, 917
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+tar-cliff-edge-2
+  rotate: false
+  xy: 811, 959
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+tar-cliff-side
+  rotate: false
+  xy: 811, 925
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 unit-icon-dagger
   rotate: false
   xy: 579, 211
@@ -4855,65 +5002,72 @@ item-sand
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-silicon
+item-scrap
   rotate: false
   xy: 1691, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-stone
+item-silicon
   rotate: false
-  xy: 1759, 1715
+  xy: 1725, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-surge-alloy
+item-stone
   rotate: false
   xy: 1793, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-thorium
+item-surge-alloy
   rotate: false
   xy: 1827, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-item-titanium
+item-thorium
   rotate: false
   xy: 1555, 1477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
+item-titanium
+  rotate: false
+  xy: 1589, 1511
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1827, 1749
+  xy: 1861, 1783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1589, 1477
+  xy: 1623, 1511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1725, 1613
+  xy: 1759, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1793, 1681
+  xy: 1827, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5060,7 +5214,7 @@ circle
   index: -1
 clear
   rotate: false
-  xy: 258, 1825
+  xy: 629, 93
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -5162,28 +5316,28 @@ button-select
   index: -1
 check-off
   rotate: false
-  xy: 271, 76
+  xy: 401, 77
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on
   rotate: false
-  xy: 301, 77
+  xy: 431, 77
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 331, 77
+  xy: 461, 77
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 361, 77
+  xy: 491, 77
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
@@ -5260,28 +5414,28 @@ icon-power
   index: -1
 icon-production
   rotate: false
-  xy: 409, 93
+  xy: 539, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 445, 93
+  xy: 575, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 463, 93
+  xy: 593, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 481, 93
+  xy: 771, 725
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5379,7 +5533,7 @@ icon-back
   index: -1
 icon-ban
   rotate: false
-  xy: 278, 18
+  xy: 1083, 1223
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5428,42 +5582,42 @@ icon-cursor
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 1083, 1223
+  xy: 521, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 391, 77
+  xy: 537, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 517, 95
+  xy: 553, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 407, 77
+  xy: 569, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 533, 95
+  xy: 585, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 423, 77
+  xy: 601, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5484,7 +5638,7 @@ icon-eraser
   index: -1
 icon-exit
   rotate: false
-  xy: 549, 95
+  xy: 789, 799
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5505,7 +5659,7 @@ icon-file-image
   index: -1
 icon-file-text
   rotate: false
-  xy: 439, 77
+  xy: 789, 783
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5519,7 +5673,7 @@ icon-fill
   index: -1
 icon-floppy
   rotate: false
-  xy: 565, 95
+  xy: 789, 767
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5533,14 +5687,14 @@ icon-floppy-16
   index: -1
 icon-folder
   rotate: false
-  xy: 455, 77
+  xy: 789, 751
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 581, 95
+  xy: 789, 735
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5554,14 +5708,14 @@ icon-generated
   index: -1
 icon-github
   rotate: false
-  xy: 471, 77
+  xy: 617, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 597, 95
+  xy: 633, 80
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5582,49 +5736,49 @@ icon-hold
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 801, 825
+  xy: 1165, 1283
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 613, 95
+  xy: 649, 80
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 487, 77
+  xy: 729, 636
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 606, 1832
+  xy: 877, 981
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 503, 77
+  xy: 801, 901
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 618, 1832
+  xy: 891, 997
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 909, 1059
+  xy: 909, 1095
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5638,21 +5792,21 @@ icon-line
   index: -1
 icon-link
   rotate: false
-  xy: 519, 79
+  xy: 801, 885
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 789, 723
+  xy: 907, 1013
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 535, 79
+  xy: 801, 869
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5687,35 +5841,35 @@ icon-locked
   index: -1
 icon-logic
   rotate: false
-  xy: 210, 4
+  xy: 845, 933
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 551, 79
+  xy: 801, 853
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 222, 4
+  xy: 861, 949
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 391, 93
+  xy: 521, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-missing
   rotate: false
-  xy: 234, 4
+  xy: 606, 1832
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5729,35 +5883,35 @@ icon-mission-background
   index: -1
 icon-mission-battle
   rotate: false
-  xy: 246, 4
+  xy: 1177, 1283
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-defense
   rotate: false
-  xy: 258, 4
+  xy: 877, 969
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-done
   rotate: false
-  xy: 909, 1105
+  xy: 618, 1832
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 909, 1093
+  xy: 210, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 801, 815
+  xy: 1207, 1297
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5771,7 +5925,7 @@ icon-paste
   index: -1
 icon-pause
   rotate: false
-  xy: 909, 1081
+  xy: 222, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5785,7 +5939,7 @@ icon-pencil
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 567, 79
+  xy: 801, 837
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5799,35 +5953,35 @@ icon-pick
   index: -1
 icon-play
   rotate: false
-  xy: 909, 1069
+  xy: 234, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 583, 79
+  xy: 801, 821
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 1009, 1111
+  xy: 246, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 1021, 1111
+  xy: 258, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 599, 79
+  xy: 789, 719
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5841,14 +5995,14 @@ icon-redo
   index: -1
 icon-refresh
   rotate: false
-  xy: 615, 79
+  xy: 1165, 1295
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 631, 80
+  xy: 1181, 1295
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5862,35 +6016,35 @@ icon-resize
   index: -1
 icon-rotate
   rotate: false
-  xy: 647, 80
+  xy: 843, 1009
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 789, 799
+  xy: 843, 993
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 789, 783
+  xy: 859, 1009
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 789, 767
+  xy: 859, 993
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 789, 751
+  xy: 845, 977
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5904,14 +6058,14 @@ icon-save-image
   index: -1
 icon-save-map
   rotate: false
-  xy: 427, 93
+  xy: 557, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 1033, 1111
+  xy: 270, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5925,28 +6079,28 @@ icon-terrain
   index: -1
 icon-tools
   rotate: false
-  xy: 789, 735
+  xy: 875, 1009
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 636, 1840
+  xy: 282, 4
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 741, 711
+  xy: 909, 1105
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 729, 636
+  xy: 845, 961
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5960,14 +6114,14 @@ icon-trash-16
   index: -1
 icon-trello
   rotate: false
-  xy: 801, 901
+  xy: 875, 993
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 801, 885
+  xy: 861, 977
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5981,35 +6135,35 @@ icon-undo
   index: -1
 icon-unlocked
   rotate: false
-  xy: 771, 725
+  xy: 611, 93
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 801, 869
+  xy: 891, 1009
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 801, 853
+  xy: 845, 945
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 499, 93
+  xy: 278, 16
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 801, 837
+  xy: 861, 961
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6086,49 +6240,49 @@ scroll-knob-vertical-black
   index: -1
 sector-edge
   rotate: false
-  xy: 1921, 1375
+  xy: 1785, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sector-select
   rotate: false
-  xy: 1955, 1409
+  xy: 1819, 1341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 selection
   rotate: false
-  xy: 258, 1822
+  xy: 258, 1825
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 258, 1812
+  xy: 258, 1815
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 667, 170
+  xy: 339, 71
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 667, 130
+  xy: 370, 71
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 667, 90
+  xy: 370, 71
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 4681388e83..2441d0404b 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.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 1a3f9ba3b0..42a96be490 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -312,10 +312,10 @@ public class Blocks implements ContentList{
 
         separator = new Separator("separator"){{
             results = new ItemStack[]{
-                    new ItemStack(Items.copper, 5),
-                    new ItemStack(Items.lead, 3),
-                    new ItemStack(Items.titanium, 2),
-                    new ItemStack(Items.thorium, 1)
+                new ItemStack(Items.copper, 5),
+                new ItemStack(Items.lead, 3),
+                new ItemStack(Items.titanium, 2),
+                new ItemStack(Items.thorium, 1)
             };
             hasPower = true;
             filterTime = 15f;
diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java
index ba467d687b..a3e7279909 100644
--- a/core/src/io/anuke/mindustry/content/Items.java
+++ b/core/src/io/anuke/mindustry/content/Items.java
@@ -60,7 +60,7 @@ public class Items implements ContentList{
         }};
 
         scrap = new Item("scrap", Color.valueOf("777777")){{
-
+            genOre = true;
         }};
 
         silicon = new Item("silicon", Color.valueOf("53565c")){{
diff --git a/core/src/io/anuke/mindustry/core/GameState.java b/core/src/io/anuke/mindustry/core/GameState.java
index 97c7326e06..b1d19aa9ec 100644
--- a/core/src/io/anuke/mindustry/core/GameState.java
+++ b/core/src/io/anuke/mindustry/core/GameState.java
@@ -38,7 +38,7 @@ public class GameState{
     }
 
     public boolean isPaused(){
-        return (is(State.paused) || gameOver) && !Net.active();
+        return is(State.paused) && !Net.active();
     }
 
     public boolean is(State astate){
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index c71dcf51e7..85108d32c1 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -26,6 +26,7 @@ import io.anuke.mindustry.entities.traits.*;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.gen.Call;
 import io.anuke.mindustry.graphics.Palette;
+import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.input.Binding;
 import io.anuke.mindustry.io.TypeIO;
 import io.anuke.mindustry.net.Net;
@@ -329,7 +330,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
         Floor floor = getFloorOn();
 
         Draw.color();
-        Draw.alpha(hitTime / hitDuration);
+        Draw.alpha(Draw.getShader() != Shaders.mix ? 1f : hitTime / hitDuration);
 
         if(!mech.flying){
             if(floor.isLiquid){
diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java
index 4181cec8f7..6336c798a1 100644
--- a/core/src/io/anuke/mindustry/entities/effect/Decal.java
+++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java
@@ -14,7 +14,7 @@ import static io.anuke.mindustry.Vars.groundEffectGroup;
  * Class for creating block rubble on the ground.
  */
 public abstract class Decal extends TimedEntity implements BelowLiquidTrait, DrawTrait{
-    private static final Color color = Color.valueOf("52504e");
+    private static final Color color = Color.valueOf("2c2928");
 
     @Override
     public float lifetime(){
diff --git a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
index 850f5207ef..fe1ecd0ff7 100644
--- a/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
+++ b/core/src/io/anuke/mindustry/entities/units/FlyingUnit.java
@@ -11,6 +11,7 @@ import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.bullet.BulletType;
 import io.anuke.mindustry.entities.traits.CarriableTrait;
 import io.anuke.mindustry.entities.traits.CarryTrait;
+import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockFlag;
@@ -151,7 +152,7 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
 
     @Override
     public void draw(){
-        Draw.alpha(hitTime / hitDuration);
+        Draw.alpha(Draw.getShader() != Shaders.mix ? 1f : hitTime / hitDuration);
 
         Draw.rect(type.name, x, y, rotation - 90);
 
diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
index f51f4a9a79..9e0f6650e3 100644
--- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
+++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
@@ -12,6 +12,7 @@ import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.entities.Units;
 import io.anuke.mindustry.entities.bullet.BulletType;
 import io.anuke.mindustry.game.Team;
+import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Weapon;
 import io.anuke.mindustry.world.Tile;
@@ -132,7 +133,7 @@ public abstract class GroundUnit extends BaseUnit{
 
     @Override
     public void draw(){
-        Draw.alpha(hitTime / hitDuration);
+        Draw.alpha(Draw.getShader() != Shaders.mix ? 1f : hitTime / hitDuration);
 
         float ft = Mathf.sin(walkTime * type.speed*5f, 6f, 2f);
 
diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
index 4552f3e1c3..299e249553 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
@@ -4,11 +4,14 @@ import io.anuke.arc.Core;
 import io.anuke.arc.Events;
 import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.Sort;
+import io.anuke.arc.entities.EntityDraw;
+import io.anuke.arc.entities.EntityGroup;
 import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.glutils.FrameBuffer;
 import io.anuke.arc.util.Tmp;
 import io.anuke.mindustry.content.Blocks;
+import io.anuke.mindustry.entities.Unit;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
 import io.anuke.mindustry.game.Team;
@@ -71,6 +74,12 @@ public class BlockRenderer{
         Core.graphics.clear(Color.CLEAR);
         Draw.color(shadowColor);
         drawBlocks(Layer.shadow);
+
+        EntityDraw.drawWith(playerGroup, player -> !player.isDead(), Unit::draw);
+        for(EntityGroup group : unitGroups){
+            EntityDraw.drawWith(group, unit -> !unit.isDead(), Unit::draw);
+        }
+
         Draw.color();
         Draw.flush();
         shadows.end();
diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java
index a3a4f06cff..18c95b84f7 100644
--- a/core/src/io/anuke/mindustry/type/Zone.java
+++ b/core/src/io/anuke/mindustry/type/Zone.java
@@ -65,4 +65,5 @@ public class Zone extends UnlockableContent{
     public ContentType getContentType(){
         return ContentType.zone;
     }
+
 }