diff --git a/core/assets-raw/sprites/blocks/environment/rocks-medium1.png b/core/assets-raw/sprites/blocks/environment/rocks-medium1.png
deleted file mode 100644
index 66025d7a45..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/rocks-medium1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/rocks-medium2.png b/core/assets-raw/sprites/blocks/environment/rocks-medium2.png
deleted file mode 100644
index 8db32cb047..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/rocks-medium2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/rocks-small1.png b/core/assets-raw/sprites/blocks/environment/rocks-small1.png
deleted file mode 100644
index 7afb6018a5..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/rocks-small1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/rocks-small2.png b/core/assets-raw/sprites/blocks/environment/rocks-small2.png
deleted file mode 100644
index dfff2c648b..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/rocks-small2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/rocks-small3.png b/core/assets-raw/sprites/blocks/environment/rocks-small3.png
deleted file mode 100644
index cdbc897501..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/rocks-small3.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/rocks1.png b/core/assets-raw/sprites/blocks/environment/rocks1.png
new file mode 100644
index 0000000000..dec78e10e7
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rocks1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rocks2.png b/core/assets-raw/sprites/blocks/environment/rocks2.png
new file mode 100644
index 0000000000..429c6b7709
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/rocks2.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 95564f474b..4f5f954a19 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -27,294 +27,294 @@ overdrive-projector-top
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1043, 1396
+  xy: 1019, 1362
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1053, 1362
+  xy: 1043, 1396
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1049, 1561
+  xy: 1053, 1362
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1409, 1729
+  xy: 1409, 1763
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1443, 1767
+  xy: 1409, 1729
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1477, 1767
+  xy: 1443, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1443, 1733
+  xy: 1477, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1511, 1767
+  xy: 1443, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1477, 1733
+  xy: 1511, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1545, 1767
+  xy: 1477, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1511, 1733
+  xy: 1545, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1579, 1767
+  xy: 1511, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1545, 1733
+  xy: 1579, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1613, 1767
+  xy: 1545, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1579, 1733
+  xy: 1613, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1647, 1767
+  xy: 1579, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1613, 1733
+  xy: 1647, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1681, 1767
+  xy: 1613, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1647, 1733
+  xy: 1681, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1715, 1767
+  xy: 1647, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1681, 1733
+  xy: 1715, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1749, 1767
+  xy: 1681, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1087, 1391
+  xy: 1109, 1459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1087, 1357
+  xy: 1077, 1425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1121, 1391
+  xy: 1111, 1425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1121, 1357
+  xy: 1087, 1391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 687, 373
+  xy: 1087, 1357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 687, 339
+  xy: 1121, 1391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 721, 381
+  xy: 1121, 1357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 721, 347
+  xy: 687, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 755, 381
+  xy: 687, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 789, 382
+  xy: 721, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 823, 383
+  xy: 721, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 755, 347
+  xy: 755, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 789, 348
+  xy: 789, 382
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 823, 349
+  xy: 823, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 705, 305
+  xy: 755, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 705, 271
+  xy: 789, 348
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 705, 237
+  xy: 823, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 705, 203
+  xy: 705, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 705, 169
+  xy: 705, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 263, 118
+  xy: 263, 152
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -328,21 +328,21 @@ mass-driver-turret
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1861, 1665
+  xy: 1827, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1895, 1665
+  xy: 1861, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1929, 1681
+  xy: 1895, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -587,56 +587,56 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 1048, 1527
+  xy: 1049, 1561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 1141, 1559
+  xy: 1048, 1527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 1239, 1751
+  xy: 1141, 1559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 1715, 1733
+  xy: 1749, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 1783, 1767
+  xy: 1715, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 1749, 1733
+  xy: 1783, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 1885, 1733
+  xy: 1919, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 1919, 1733
+  xy: 1885, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -650,70 +650,70 @@ dirtedge
   index: -1
 generic-cliff-edge
   rotate: false
-  xy: 1351, 1691
+  xy: 1317, 1691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 1351, 1691
+  xy: 1317, 1691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 1385, 1695
+  xy: 1351, 1691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 1385, 1695
+  xy: 1351, 1691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 generic-cliff-edge-2
   rotate: false
-  xy: 1419, 1695
+  xy: 1385, 1695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 1419, 1695
+  xy: 1385, 1695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 generic-cliff-side
   rotate: false
-  xy: 1453, 1699
+  xy: 1419, 1695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 1453, 1699
+  xy: 1419, 1695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 1487, 1699
+  xy: 1453, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 1521, 1699
+  xy: 1487, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -727,14 +727,14 @@ grassedge
   index: -1
 ice2
   rotate: false
-  xy: 1725, 1699
+  xy: 1691, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 1759, 1699
+  xy: 1725, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -748,14 +748,14 @@ iceedge
   index: -1
 icerock2
   rotate: false
-  xy: 1793, 1699
+  xy: 1759, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 263, 84
+  xy: 263, 118
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -769,56 +769,56 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 331, 323
+  xy: 297, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 297, 289
+  xy: 331, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 365, 323
+  xy: 297, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 297, 187
+  xy: 433, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 331, 221
+  xy: 297, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 365, 255
+  xy: 331, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 399, 289
+  xy: 365, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 467, 323
+  xy: 399, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -831,43 +831,29 @@ metalflooredge
   offset: 0, 0
   index: -1
 rock2
+  rotate: false
+  xy: 619, 373
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+rocks2
   rotate: false
   xy: 619, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-rocks-medium2
-  rotate: false
-  xy: 653, 373
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-rocks-small2
-  rotate: false
-  xy: 653, 339
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-rocks-small3
-  rotate: false
-  xy: 637, 305
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 sand2
   rotate: false
-  xy: 637, 237
+  xy: 653, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 637, 203
+  xy: 637, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -881,14 +867,14 @@ sandedge
   index: -1
 snow2
   rotate: false
-  xy: 671, 67
+  xy: 671, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 671, 33
+  xy: 671, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -909,42 +895,42 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 1861, 1631
+  xy: 1759, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 1895, 1631
+  xy: 1793, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 1929, 1613
+  xy: 1827, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 1963, 1613
+  xy: 1861, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 1793, 1631
+  xy: 1691, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1827, 1631
+  xy: 1725, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -965,70 +951,70 @@ taredge
   index: -1
 thorium1
   rotate: false
-  xy: 1082, 1527
+  xy: 789, 416
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1109, 1493
+  xy: 823, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1075, 1459
+  xy: 1075, 1493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1109, 1459
+  xy: 1082, 1527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1077, 1425
+  xy: 1109, 1493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1111, 1425
+  xy: 1075, 1459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 705, 101
+  xy: 705, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 705, 67
+  xy: 705, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 705, 33
+  xy: 705, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 739, 313
+  xy: 705, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1056,42 +1042,42 @@ block-elevation
   index: -1
 block-middle
   rotate: false
-  xy: 2014, 1923
+  xy: 2014, 1957
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 2014, 1923
+  xy: 2014, 1957
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 2014, 1889
+  xy: 2014, 1923
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 917, 1363
+  xy: 2014, 1889
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 2014, 1855
+  xy: 767, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 1817, 1767
+  xy: 1749, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1119,7 +1105,7 @@ cross-4
   index: -1
 place-arrow
   rotate: false
-  xy: 1963, 1681
+  xy: 1929, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1175,154 +1161,154 @@ rubble-3-1
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 951, 1362
+  xy: 917, 1363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 951, 1362
+  xy: 917, 1363
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 985, 1362
+  xy: 951, 1362
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1019, 1362
+  xy: 985, 1362
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 877, 1229
+  xy: 785, 1231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 771, 923
+  xy: 877, 1229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 767, 889
+  xy: 771, 923
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 767, 855
+  xy: 767, 889
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 767, 821
+  xy: 767, 855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 767, 787
+  xy: 767, 821
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 767, 753
+  xy: 767, 787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 767, 719
+  xy: 767, 753
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 2001, 1821
+  xy: 2014, 1855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 2001, 1787
+  xy: 2001, 1821
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1273, 1725
+  xy: 2001, 1787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1307, 1725
+  xy: 1273, 1725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1341, 1725
+  xy: 1307, 1725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1375, 1729
+  xy: 1341, 1725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1409, 1763
+  xy: 1375, 1729
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 399, 323
+  xy: 331, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 297, 221
+  xy: 399, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 331, 255
+  xy: 297, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1350,70 +1336,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1759, 1665
+  xy: 1725, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1793, 1665
+  xy: 1759, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1827, 1665
+  xy: 1793, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1997, 1647
+  xy: 1963, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 801, 889
+  xy: 1997, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 801, 855
+  xy: 801, 889
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 801, 821
+  xy: 801, 855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 801, 787
+  xy: 801, 821
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 801, 753
+  xy: 801, 787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 801, 719
+  xy: 801, 753
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1462,7 +1448,7 @@ block-icon-battery-large
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1273, 1759
+  xy: 1239, 1751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1525,7 +1511,7 @@ fusion-reactor-top
   index: -1
 power-node
   rotate: false
-  xy: 1997, 1681
+  xy: 1963, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1539,21 +1525,21 @@ power-node-large
   index: -1
 powerinfinite
   rotate: false
-  xy: 1929, 1647
+  xy: 1997, 1681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 1963, 1647
+  xy: 1929, 1647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 637, 271
+  xy: 653, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1735,14 +1721,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 297, 323
+  xy: 263, 84
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 433, 289
+  xy: 399, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1777,35 +1763,35 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 621, 407
+  xy: 801, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 655, 407
+  xy: 621, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 671, 169
+  xy: 671, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 671, 101
+  xy: 671, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 1589, 1631
+  xy: 1487, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1826,7 +1812,7 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 1623, 1631
+  xy: 1521, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1910,7 +1896,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 1283, 1691
+  xy: 1249, 1691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1924,7 +1910,7 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 1691, 1699
+  xy: 1657, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2008,21 +1994,21 @@ salvo-panel-right
   index: -1
 scatter
   rotate: false
-  xy: 637, 33
+  xy: 637, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 671, 305
+  xy: 637, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 671, 271
+  xy: 637, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2155,7 +2141,7 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 619, 373
+  xy: 655, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2218,7 +2204,7 @@ wraith-factory-top-open
   index: -1
 deflector-wall
   rotate: false
-  xy: 1851, 1733
+  xy: 1885, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2232,7 +2218,7 @@ deflector-wall-large
   index: -1
 dense-alloy-wall
   rotate: false
-  xy: 1919, 1767
+  xy: 1851, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2253,7 +2239,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1249, 1691
+  xy: 1987, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2288,35 +2274,35 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 2039, 1727
+  xy: 1077, 1407
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
   index: -1
 command-attack
   rotate: false
-  xy: 1307, 1759
+  xy: 1273, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 command-idle
   rotate: false
-  xy: 1341, 1759
+  xy: 1307, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 command-patrol
   rotate: false
-  xy: 1375, 1763
+  xy: 1341, 1759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 command-retreat
   rotate: false
-  xy: 785, 1231
+  xy: 1375, 1763
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2393,35 +2379,35 @@ scale_marker
   index: -1
 scorch1
   rotate: false
-  xy: 770, 211
+  xy: 769, 165
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 769, 91
+  xy: 1175, 1559
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 1175, 1559
+  xy: 1205, 1559
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 1205, 1559
+  xy: 1235, 1559
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 1235, 1559
+  xy: 1265, 1589
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
@@ -2442,21 +2428,21 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 671, 135
+  xy: 671, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 799, 143
+  xy: 1313, 1599
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 705, 135
+  xy: 705, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3385,34 +3371,20 @@ rock1
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-icon-rocks-medium
+block-icon-rocks
   rotate: false
   xy: 1141, 1593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-rocks-medium1
+rocks1
   rotate: false
   xy: 1141, 1593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-icon-rocks-small
-  rotate: false
-  xy: 1181, 1693
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-rocks-small1
-  rotate: false
-  xy: 1181, 1693
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
 block-icon-rotary-pump
   rotate: false
   xy: 1386, 1917
@@ -3429,14 +3401,14 @@ rotary-pump
   index: -1
 block-icon-router
   rotate: false
-  xy: 1215, 1693
+  xy: 1181, 1693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1215, 1693
+  xy: 1181, 1693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3464,63 +3436,63 @@ block-icon-salvo
   index: -1
 block-icon-sand
   rotate: false
-  xy: 843, 1289
+  xy: 1215, 1693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 843, 1289
+  xy: 1215, 1693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 843, 1255
+  xy: 843, 1289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 877, 1297
+  xy: 843, 1255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 877, 1297
+  xy: 843, 1255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-shock-mine
   rotate: false
-  xy: 877, 1263
+  xy: 877, 1297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shock-mine
   rotate: false
-  xy: 877, 1263
+  xy: 877, 1297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 771, 957
+  xy: 877, 1263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 771, 957
+  xy: 877, 1263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3541,28 +3513,28 @@ silicon-smelter
   index: -1
 block-icon-snow
   rotate: false
-  xy: 759, 654
+  xy: 771, 957
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 759, 654
+  xy: 771, 957
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 759, 620
+  xy: 759, 654
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 759, 620
+  xy: 759, 654
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3583,42 +3555,42 @@ solar-panel-large
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 759, 586
+  xy: 759, 620
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 759, 586
+  xy: 759, 620
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 759, 552
+  xy: 759, 586
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 759, 552
+  xy: 759, 586
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-spawn
   rotate: false
-  xy: 759, 518
+  xy: 759, 552
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn
   rotate: false
-  xy: 759, 518
+  xy: 759, 552
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3639,28 +3611,28 @@ block-icon-spirit-factory
   index: -1
 block-icon-stone
   rotate: false
-  xy: 759, 484
+  xy: 759, 518
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 759, 484
+  xy: 759, 518
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-icon-surge-wall
   rotate: false
-  xy: 759, 450
+  xy: 759, 484
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 759, 450
+  xy: 759, 484
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3688,14 +3660,14 @@ block-icon-swarmer
   index: -1
 block-icon-tar
   rotate: false
-  xy: 721, 415
+  xy: 759, 450
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 721, 415
+  xy: 759, 450
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3758,14 +3730,14 @@ thorium-reactor
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 1980, 1949
+  xy: 721, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 1980, 1949
+  xy: 721, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3793,14 +3765,14 @@ block-icon-titan-factory
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 1980, 1915
+  xy: 1980, 1949
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1980, 1915
+  xy: 1980, 1949
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3835,14 +3807,14 @@ turbine-generator
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 1980, 1881
+  xy: 1980, 1915
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1980, 1881
+  xy: 1980, 1915
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3863,14 +3835,14 @@ vault
   index: -1
 block-icon-water
   rotate: false
-  xy: 2014, 1957
+  xy: 1980, 1881
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 2014, 1957
+  xy: 1980, 1881
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3898,84 +3870,84 @@ block-icon-wraith-factory
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 1783, 1733
+  xy: 1817, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 1851, 1767
+  xy: 1783, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 1817, 1733
+  xy: 1851, 1767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 1885, 1767
+  xy: 1817, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 1953, 1749
+  xy: 1919, 1733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 1953, 1715
+  xy: 1953, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 1987, 1749
+  xy: 1953, 1715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 1987, 1715
+  xy: 1987, 1749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 1555, 1699
+  xy: 1521, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 1589, 1699
+  xy: 1555, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 1623, 1699
+  xy: 1589, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 1657, 1699
+  xy: 1623, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4031,770 +4003,770 @@ trident-ship
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 297, 153
+  xy: 467, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 331, 187
+  xy: 297, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 365, 221
+  xy: 331, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 399, 255
+  xy: 365, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 501, 323
+  xy: 433, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 297, 119
+  xy: 501, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 331, 153
+  xy: 297, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 365, 187
+  xy: 331, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 399, 221
+  xy: 365, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 433, 255
+  xy: 399, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 467, 289
+  xy: 433, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 297, 85
+  xy: 467, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 331, 119
+  xy: 297, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 365, 153
+  xy: 331, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 399, 187
+  xy: 365, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 433, 221
+  xy: 399, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 467, 255
+  xy: 433, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 501, 289
+  xy: 467, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 331, 85
+  xy: 501, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 365, 119
+  xy: 331, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 399, 153
+  xy: 365, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 433, 187
+  xy: 399, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 467, 221
+  xy: 433, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 501, 255
+  xy: 467, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 365, 85
+  xy: 501, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 399, 119
+  xy: 365, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 433, 153
+  xy: 399, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 467, 187
+  xy: 433, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 501, 221
+  xy: 467, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 399, 85
+  xy: 501, 221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 433, 119
+  xy: 399, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 467, 153
+  xy: 433, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 501, 187
+  xy: 467, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 433, 85
+  xy: 501, 187
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 467, 119
+  xy: 433, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 501, 153
+  xy: 467, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 467, 85
+  xy: 501, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 501, 119
+  xy: 467, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 501, 85
+  xy: 501, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 535, 301
+  xy: 501, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 535, 267
+  xy: 535, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 569, 301
+  xy: 535, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 535, 233
+  xy: 569, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 569, 267
+  xy: 535, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 535, 199
+  xy: 569, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 569, 233
+  xy: 535, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 535, 165
+  xy: 569, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 569, 199
+  xy: 535, 165
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 535, 131
+  xy: 569, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 569, 165
+  xy: 535, 131
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 535, 97
+  xy: 569, 165
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 569, 131
+  xy: 535, 97
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 569, 97
+  xy: 569, 131
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 603, 301
+  xy: 569, 97
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 603, 267
+  xy: 603, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 603, 233
+  xy: 603, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 603, 199
+  xy: 603, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 603, 165
+  xy: 603, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 603, 131
+  xy: 603, 165
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 603, 97
+  xy: 603, 131
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 263, 50
+  xy: 603, 97
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 297, 51
+  xy: 263, 50
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 331, 51
+  xy: 297, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 365, 51
+  xy: 331, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 399, 51
+  xy: 365, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 433, 51
+  xy: 399, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 467, 51
+  xy: 433, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 501, 51
+  xy: 467, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 535, 63
+  xy: 501, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 569, 63
+  xy: 535, 63
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 603, 63
+  xy: 569, 63
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 535, 29
+  xy: 603, 63
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 569, 29
+  xy: 535, 29
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 603, 29
+  xy: 569, 29
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 242, 16
+  xy: 603, 29
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 276, 16
+  xy: 242, 16
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 310, 17
+  xy: 276, 16
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 344, 17
+  xy: 310, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 378, 17
+  xy: 344, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 412, 17
+  xy: 378, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 446, 17
+  xy: 412, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 480, 17
+  xy: 446, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 755, 415
+  xy: 480, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 1385, 1661
+  xy: 755, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 1419, 1661
+  xy: 1385, 1661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 1453, 1665
+  xy: 1419, 1661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 1487, 1665
+  xy: 1453, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 1521, 1665
+  xy: 1487, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 1555, 1665
+  xy: 1521, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 1589, 1665
+  xy: 1555, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 1623, 1665
+  xy: 1589, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 1657, 1665
+  xy: 1623, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 1691, 1665
+  xy: 1657, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 1725, 1665
+  xy: 1691, 1665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 637, 169
+  xy: 637, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 637, 135
+  xy: 637, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 637, 101
+  xy: 637, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 637, 67
+  xy: 637, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 1453, 1631
+  xy: 671, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 1487, 1631
+  xy: 671, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 1521, 1631
+  xy: 671, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 1555, 1631
+  xy: 1453, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 1657, 1631
+  xy: 1555, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 1691, 1631
+  xy: 1589, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 1725, 1631
+  xy: 1623, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 1759, 1631
+  xy: 1657, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge
   rotate: false
-  xy: 1997, 1613
+  xy: 1895, 1631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge-1
   rotate: false
-  xy: 789, 416
+  xy: 1929, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-edge-2
   rotate: false
-  xy: 823, 417
+  xy: 1963, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-cliff-side
   rotate: false
-  xy: 1075, 1493
+  xy: 1997, 1613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4836,147 +4808,147 @@ wraith
   index: -1
 item-bioglass
   rotate: false
-  xy: 1827, 1699
+  xy: 1793, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 1861, 1699
+  xy: 1827, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1895, 1699
+  xy: 1861, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1041, 1488
+  xy: 1895, 1699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 793, 655
+  xy: 1041, 1488
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-dense-alloy
   rotate: false
-  xy: 793, 621
+  xy: 793, 655
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 793, 587
+  xy: 793, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 793, 553
+  xy: 793, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 793, 519
+  xy: 793, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 793, 485
+  xy: 793, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 793, 451
+  xy: 793, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 263, 322
+  xy: 793, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 263, 288
+  xy: 263, 322
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 263, 254
+  xy: 263, 288
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 263, 220
+  xy: 263, 254
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 263, 186
+  xy: 263, 220
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 263, 152
+  xy: 263, 186
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 297, 255
+  xy: 365, 323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 331, 289
+  xy: 297, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 365, 289
+  xy: 331, 255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 433, 323
+  xy: 365, 289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5239,21 +5211,21 @@ check-off
   index: -1
 check-on
   rotate: false
-  xy: 739, 159
+  xy: 739, 233
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 739, 125
+  xy: 739, 199
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 739, 91
+  xy: 739, 165
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
@@ -5281,77 +5253,77 @@ discord-banner
   index: -1
 empty-sector
   rotate: false
-  xy: 1317, 1691
+  xy: 1283, 1691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 229, 54
+  xy: 819, 1247
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 514, 33
+  xy: 801, 701
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 819, 1247
+  xy: 1083, 1577
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-effect
   rotate: false
-  xy: 801, 701
+  xy: 1041, 1470
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 773, 329
+  xy: 21, 3
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 2031, 1655
+  xy: 57, 3
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 2031, 1637
+  xy: 770, 275
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 75, 3
+  xy: 855, 1237
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 111, 8
+  xy: 1283, 1571
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 147, 3
+  xy: 75, 3
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5386,7 +5358,7 @@ icon-admin
   index: -1
 icon-admin-small
   rotate: false
-  xy: 660, 1994
+  xy: 1249, 1725
   size: 6, 6
   orig: 6, 6
   offset: 0, 0
@@ -5400,14 +5372,14 @@ icon-areaDelete
   index: -1
 icon-arrow
   rotate: false
-  xy: 770, 193
+  xy: 204, 1759
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 770, 193
+  xy: 204, 1759
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5442,7 +5414,7 @@ icon-arrow-up
   index: -1
 icon-back
   rotate: false
-  xy: 788, 193
+  xy: 636, 1852
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5456,14 +5428,14 @@ icon-ban
   index: -1
 icon-break
   rotate: false
-  xy: 204, 1759
+  xy: 753, 1147
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 636, 1852
+  xy: 1239, 1733
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5477,14 +5449,14 @@ icon-chat
   index: -1
 icon-check
   rotate: false
-  xy: 753, 1147
+  xy: 229, 54
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-copy
   rotate: false
-  xy: 1239, 1733
+  xy: 514, 33
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5505,112 +5477,112 @@ icon-dev-builds
   index: -1
 icon-discord
   rotate: false
-  xy: 773, 313
+  xy: 1099, 1561
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 1099, 1561
+  xy: 310, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 310, 1
+  xy: 326, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 326, 1
+  xy: 342, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 342, 1
+  xy: 358, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-elevation
   rotate: false
-  xy: 1083, 1577
+  xy: 705, 43
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-eraser
   rotate: false
-  xy: 1041, 1470
+  xy: 770, 329
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-exit
   rotate: false
-  xy: 358, 1
+  xy: 374, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 2021, 1727
+  xy: 1265, 1571
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 21, 3
+  xy: 1295, 1631
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 374, 1
+  xy: 390, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 222, 1759
+  xy: 1295, 1613
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-floppy
   rotate: false
-  xy: 390, 1
+  xy: 406, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 39, 3
+  xy: 1295, 1595
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 406, 1
+  xy: 422, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 422, 1
+  xy: 438, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5624,21 +5596,21 @@ icon-generated
   index: -1
 icon-github
   rotate: false
-  xy: 438, 1
+  xy: 454, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 454, 1
+  xy: 470, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-grid
   rotate: false
-  xy: 240, 1759
+  xy: 768, 105
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5659,14 +5631,14 @@ icon-holdDelete
   index: -1
 icon-home
   rotate: false
-  xy: 470, 1
+  xy: 486, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 486, 1
+  xy: 111, 10
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5680,112 +5652,112 @@ icon-info
   index: -1
 icon-itch.io
   rotate: false
-  xy: 183, 5
+  xy: 1059, 1456
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 724, 21
+  xy: 606, 1832
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 1077, 1415
+  xy: 1077, 1397
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 57, 3
+  xy: 1347, 1673
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-link
   rotate: false
-  xy: 1059, 1456
+  xy: 532, 13
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 708, 5
+  xy: 2035, 1831
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 789, 313
+  xy: 548, 13
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 791, 330
+  xy: 222, 1759
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 771, 1147
+  xy: 770, 311
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 514, 15
+  xy: 1347, 1655
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 819, 1229
+  xy: 1365, 1673
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 606, 1832
+  xy: 618, 1832
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 805, 314
+  xy: 564, 13
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 2035, 1831
+  xy: 2035, 1819
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 819, 701
+  xy: 39, 3
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-missing
   rotate: false
-  xy: 618, 1832
+  xy: 2035, 1807
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5799,287 +5771,287 @@ icon-mission-background
   index: -1
 icon-mission-battle
   rotate: false
-  xy: 2035, 1819
+  xy: 2035, 1795
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-defense
   rotate: false
-  xy: 2035, 1807
+  xy: 2037, 1783
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-done
   rotate: false
-  xy: 2035, 1795
+  xy: 2037, 1771
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 514, 3
+  xy: 2037, 1759
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 2021, 1717
+  xy: 1257, 1725
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-paste
   rotate: false
-  xy: 2031, 1709
+  xy: 240, 1759
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 526, 1
+  xy: 2037, 1747
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 2031, 1691
+  xy: 770, 293
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 845, 333
+  xy: 580, 13
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 2031, 1673
+  xy: 1365, 1655
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 538, 1
+  xy: 2037, 1735
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 532, 13
+  xy: 596, 13
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 550, 1
+  xy: 2037, 1723
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 562, 1
+  xy: 514, 3
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 548, 13
+  xy: 612, 13
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 2031, 1619
+  xy: 771, 1147
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 564, 13
+  xy: 2021, 1771
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 580, 13
+  xy: 2021, 1755
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 2031, 1601
+  xy: 514, 15
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 596, 13
+  xy: 2021, 1739
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 612, 13
+  xy: 2021, 1723
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 628, 13
+  xy: 705, 27
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 644, 17
+  xy: 721, 27
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 644, 1
+  xy: 127, 5
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 809, 330
+  xy: 819, 1229
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 827, 331
+  xy: 819, 701
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 574, 1
+  xy: 526, 1
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 837, 1237
+  xy: 723, 43
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 660, 17
+  xy: 143, 5
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 586, 1
+  xy: 538, 1
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 598, 1
+  xy: 550, 1
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 660, 1
+  xy: 159, 5
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 855, 1237
+  xy: 837, 1237
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-trello
   rotate: false
-  xy: 676, 17
+  xy: 175, 5
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 676, 1
+  xy: 191, 5
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 93, 8
+  xy: 1265, 1553
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocked
   rotate: false
-  xy: 129, 3
+  xy: 1283, 1553
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 692, 17
+  xy: 207, 8
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 692, 1
+  xy: 223, 8
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 165, 3
+  xy: 93, 8
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 708, 17
+  xy: 628, 13
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6093,7 +6065,7 @@ info-banner
   index: -1
 inventory
   rotate: false
-  xy: 768, 49
+  xy: 1295, 1649
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -6124,7 +6096,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 768, 12
+  xy: 1321, 1654
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -6148,7 +6120,7 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 2021, 1745
+  xy: 768, 123
   size: 24, 40
   split: 10, 10, 6, 10
   orig: 24, 40
@@ -6156,14 +6128,14 @@ scroll-knob-vertical-black
   index: -1
 sector-edge
   rotate: false
-  xy: 671, 237
+  xy: 637, 33
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sector-select
   rotate: false
-  xy: 671, 203
+  xy: 671, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6184,21 +6156,21 @@ slider
   index: -1
 slider-knob
   rotate: false
-  xy: 739, 273
+  xy: 705, 61
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 739, 233
+  xy: 739, 307
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 739, 193
+  xy: 739, 267
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
@@ -6235,7 +6207,7 @@ white
   index: -1
 window-empty
   rotate: false
-  xy: 739, 28
+  xy: 739, 102
   size: 27, 61
   split: 8, 8, 44, 11
   orig: 27, 61
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index a01b69b020..37ca946738 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 1ba3a37028..d3520108ef 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -31,7 +31,7 @@ public class Blocks implements ContentList{
 
     //environment
     air, blockpart, spawn, space, metalfloor, deepwater, water, tar, stone, blackstone, dirt, sand, ice, snow,
-    grass, shrub, rock, icerock, blackrock, rocksSmall, rocksMedium,
+    grass, shrub, rock, icerock, blackrock, rocks,
 
     //crafting
     siliconSmelter, plastaniumCompressor, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer,
@@ -210,17 +210,11 @@ public class Blocks implements ContentList{
             variants = 1;
         }};
 
-        rocksSmall = new Rock("rocks-small"){{
+        rocks = new Rock("rocks"){{
            variants = 2;
            breakable = alwaysReplace = false;
            solid = true;
         }};
-
-        rocksMedium = new Rock("rocks-medium"){{
-            variants = 2;
-            breakable = alwaysReplace = false;
-            solid = true;
-        }};
         
         //endregion
         //region crafting
diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java
index 76b0f41aa9..bb333f2f60 100644
--- a/core/src/io/anuke/mindustry/content/Zones.java
+++ b/core/src/io/anuke/mindustry/content/Zones.java
@@ -12,9 +12,10 @@ public class Zones implements ContentList{
     @Override
     public void load(){
 
-        wasteland = new Zone("wasteland", new BasicGenerator(256, 256, Items.lead, Items.copper)){{
+        wasteland = new Zone("wasteland", new BasicGenerator(256, 256, Items.copper)){{
             deployCost = ItemStack.with(Items.copper, 100);
             startingItems = ItemStack.with(Items.copper, 50);
+            alwaysUnlocked = true;
             rules = () -> new Rules(){{
                 waves = true;
                 waveTimer = true;
diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
index fa534655b8..a2f5746606 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
@@ -18,14 +18,12 @@ import io.anuke.arc.scene.ui.layout.Unit;
 import io.anuke.arc.scene.utils.UIUtils;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.core.Platform;
 import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.MapIO;
 import io.anuke.mindustry.maps.Map;
 import io.anuke.mindustry.maps.MapMeta;
 import io.anuke.mindustry.maps.MapTileData;
-import io.anuke.mindustry.type.Recipe;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 import io.anuke.mindustry.world.Block;
 
@@ -501,14 +499,6 @@ public class MapEditorDialog extends Dialog implements Disposable{
 
         for(Block block : Vars.content.blocks()){
             TextureRegion[] regions = block.getCompactIcon();
-            if((block.synthetic() && (Recipe.getByResult(block) == null || !data.isUnlocked(Recipe.getByResult(block))))
-                    && block != Blocks.core){
-                continue;
-            }
-
-            if(Recipe.getByResult(block) != null && !Recipe.getByResult(block).visibility.shown()){
-                continue;
-            }
 
             if(regions.length == 0 || regions[0] == Core.atlas.find("jjfgj")) continue;
 
diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java
index 80b84e6107..f9e5a904bf 100644
--- a/core/src/io/anuke/mindustry/game/GlobalData.java
+++ b/core/src/io/anuke/mindustry/game/GlobalData.java
@@ -6,6 +6,7 @@ import io.anuke.arc.collection.ObjectIntMap;
 import io.anuke.arc.collection.ObjectMap;
 import io.anuke.arc.collection.ObjectSet;
 import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.game.EventType.UnlockEvent;
 import io.anuke.mindustry.type.ContentType;
 import io.anuke.mindustry.type.Item;
@@ -48,8 +49,8 @@ public class GlobalData{
 
     /** Returns whether or not this piece of content is unlocked yet.*/
     public boolean isUnlocked(UnlockableContent content){
-        return true;
-        //return content.alwaysUnlocked() || unlocked.getOr(content.getContentType(), ObjectSet::new).contains(content.getContentName());
+        //return true;
+        return content.alwaysUnlocked() || unlocked.getOr(content.getContentType(), ObjectSet::new).contains(content.getContentName());
     }
 
     /**
@@ -93,6 +94,11 @@ public class GlobalData{
         for(Item item : Vars.content.items()){
             items.put(item, Core.settings.getInt("item-" + item.name, 0));
         }
+
+        //set up default values
+        if(!Core.settings.has("item-" + Items.copper)){
+            addItem(Items.copper, 1000);
+        }
     }
 
     public void save(){
diff --git a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java b/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java
index 7348825262..948272bb68 100644
--- a/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generators/BasicGenerator.java
@@ -53,7 +53,7 @@ public class BasicGenerator extends RandomGenerator{
         }
 
         if(rocks > 0.64){
-            block = Blocks.rocksSmall;
+            block = Blocks.rocks;
         }
     }
 }
diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java
index 5a943029ce..fe922a29f2 100644
--- a/core/src/io/anuke/mindustry/type/Zone.java
+++ b/core/src/io/anuke/mindustry/type/Zone.java
@@ -14,12 +14,18 @@ public class Zone extends UnlockableContent{
     public ItemStack[] deployCost = {};
     public ItemStack[] startingItems = {};
     public Supplier<Rules> rules = Rules::new;
+    public boolean alwaysUnlocked;
 
     public Zone(String name, Generator generator){
         this.name = name;
         this.generator = generator;
     }
 
+    @Override
+    public boolean alwaysUnlocked(){
+        return alwaysUnlocked;
+    }
+
     @Override
     public boolean isHidden(){
         return true;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 5b8e23ebcf..4174fbfbbe 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -76,7 +76,7 @@ public class HudFragment extends Fragment{
                         if(Net.active()){
                             i.getStyle().imageUp = Core.scene.skin.getDrawable("icon-players");
                         }else{
-                            i.setDisabled(Net.active());
+                            i.setDisabled(false);
                             i.getStyle().imageUp = Core.scene.skin.getDrawable(state.is(State.paused) ? "icon-play" : "icon-pause");
                         }
                     }).get();
@@ -131,7 +131,6 @@ public class HudFragment extends Fragment{
             //fps display
             infolabel = cont.table(t -> {
                 IntFormat fps = new IntFormat("fps");
-                IntFormat tps = new IntFormat("tps");
                 IntFormat ping = new IntFormat("ping");
                 t.label(() -> fps.get(Core.graphics.getFramesPerSecond())).padRight(10);
                 t.row();
@@ -364,20 +363,32 @@ public class HudFragment extends Fragment{
         IntFormat wavef = new IntFormat("wave");
         IntFormat enemyf = new IntFormat("wave.enemy");
         IntFormat enemiesf = new IntFormat("wave.enemies");
+        IntFormat waitingf = new IntFormat("wave.waiting");
 
         table.clearChildren();
         table.touchable(Touchable.enabled);
 
-        table.labelWrap(() ->
-                (state.enemies() > 0 && !state.rules.waveTimer ?
-                wavef.get(state.wave) + "\n" + (state.enemies() == 1 ?
-                    enemyf.get(state.enemies()) :
-                    enemiesf.get(state.enemies())) :
-                wavef.get(state.wave) + "\n" +
-                    (state.rules.waveTimer ?
-                    Core.bundle.format("wave.waiting", (int)(state.wavetime/60)) :
-                    Core.bundle.get("waiting")))
-        ).growX().pad(8f);
+        StringBuilder builder = new StringBuilder();
+
+        table.labelWrap(() -> {
+            builder.setLength(0);
+            builder.append(wavef.get(state.wave));
+            builder.append("\n");
+
+            if(state.enemies() > 0 && !state.rules.waveTimer){
+                if(state.enemies() == 1){
+                    builder.append(enemyf.get(state.enemies()));
+                }else{
+                    builder.append(enemiesf.get(state.enemies()));
+                }
+            }else if(state.rules.waveTimer){
+                builder.append(waitingf.get((int)(state.wavetime/60)));
+            }else{
+                builder.append(Core.bundle.get("waiting"));
+            }
+
+            return builder;
+        }).growX().pad(8f);
 
         table.setDisabled(true);
         table.visible(() -> state.rules.waves);
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index 61ea19280d..444995ffaa 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -314,7 +314,7 @@ public class Block extends BaseBlock {
     }
 
     public boolean synthetic(){
-        return update || destructible || solid;
+        return update || destructible;
     }
 
     public void drawConfigure(Tile tile){