diff --git a/core/assets-raw/sprites/backgrounds/background.png b/core/assets-raw/sprites/backgrounds/background.png
index 016328304f..949bac4330 100644
Binary files a/core/assets-raw/sprites/backgrounds/background.png and b/core/assets-raw/sprites/backgrounds/background.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png
index 2d8e45aa34..4a2f7fb61f 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.png
index 3ec3a10f7e..96cad7a850 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-bridge.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png
index c2d5660ad5..1dae00d2b5 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor-end.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png
index ef1ade6a87..de5367fcf9 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png and b/core/assets-raw/sprites/blocks/distribution/bridge-conveyor.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png
index e19afcd6d8..dfb7bc53f3 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png
index d88e1658e2..c04f44c6e6 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png
index f5de8677b9..6ecb113579 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png
index c947fb2a0f..06a488e33e 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-0-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png
index 58df8fd1aa..0555853b1d 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png
index e9388dcdf8..736be72188 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png
index bb07a8db95..0e5a5dd0c6 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png
index c41710079d..d63fb25e24 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png
index 12b665cec1..97892fd317 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png
index 8201f2c3b7..89a2dedf7e 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png
index 13f1269028..d93e101711 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png
index f529d8f8cc..eb37fac0fd 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-2-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png
index 81067402cb..217d48fdda 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png
index 6917615d13..8f95dcae1c 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png
index d05a8df6a7..5747d4e6ba 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png
index 564c6a5569..7bb3eb722b 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-3-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png
index 9e2aa24d12..3a5fbbe8d9 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png
index 5fb6c76bbb..b0d59d5557 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png
index a8dfe74683..f7b33d4a55 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png
index d7f446763c..153a2358ba 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/conveyor-4-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png
index d25210902a..7e97c5edd7 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png
index 681ad7174d..ff833567c3 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png
index 7333800c7d..3c34408531 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png
index 406e7c8a7d..b91acc659d 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-0-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png
index 5f368a57a9..8ff4be5ebe 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png
index 37bba91707..8bab19266e 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png
index 4174dcb536..26856cadfe 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png
index 2ab4ec1027..b457d8354b 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-1-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png
index b46aeabb4a..e6ee15cb4b 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png
index 56ecf051cb..31fd15c0f9 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png
index 73b65851fa..ee3f8ff9c6 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png
index 9043b1851d..fc489f16a1 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-2-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png
index 8295721e88..26cb56dbc4 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png
index 11693aa549..de7ed1bfda 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png
index b51534e4ef..cd4ed0a0e5 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png
index a38e0a6eef..c227ad51f9 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-3-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png
index c869eaa6e8..fdd72b586b 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-0.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png
index b734616c96..ac85179cd5 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-1.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png
index 704d46efa7..35e97c679d 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-2.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png
index 7d82a2037e..f46b1a69de 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png and b/core/assets-raw/sprites/blocks/distribution/conveyors/titanium-conveyor-4-3.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/distributor.png b/core/assets-raw/sprites/blocks/distribution/distributor.png
index b42760f027..ca890d2387 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/distributor.png and b/core/assets-raw/sprites/blocks/distribution/distributor.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/junction.png b/core/assets-raw/sprites/blocks/distribution/junction.png
index b1b9237d42..c9d30e4e94 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/junction.png and b/core/assets-raw/sprites/blocks/distribution/junction.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png b/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png
index dc80819cd5..1ca04e413f 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png and b/core/assets-raw/sprites/blocks/distribution/mass-driver-turret.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/mass-driver.png b/core/assets-raw/sprites/blocks/distribution/mass-driver.png
index cde1d754f9..93be68da7a 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/mass-driver.png and b/core/assets-raw/sprites/blocks/distribution/mass-driver.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/overflow-gate.png b/core/assets-raw/sprites/blocks/distribution/overflow-gate.png
index e67780b897..b5c3cd7265 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/overflow-gate.png and b/core/assets-raw/sprites/blocks/distribution/overflow-gate.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png
index 2b4b2e7d97..a654f2b5d5 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-bridge.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-bridge.png
index bfd04fb31f..b20705be3d 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-bridge.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-bridge.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.png
index 3f6044d038..69d7ad1fc6 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor-end.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png b/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png
index 380d216415..290fa073e9 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png and b/core/assets-raw/sprites/blocks/distribution/phase-conveyor.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/router.png b/core/assets-raw/sprites/blocks/distribution/router.png
new file mode 100644
index 0000000000..712556a016
Binary files /dev/null and b/core/assets-raw/sprites/blocks/distribution/router.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/sorter.png b/core/assets-raw/sprites/blocks/distribution/sorter.png
index 987efbc821..053c736150 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/sorter.png and b/core/assets-raw/sprites/blocks/distribution/sorter.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/splitter.png b/core/assets-raw/sprites/blocks/distribution/splitter.png
deleted file mode 100644
index 8094c272f6..0000000000
Binary files a/core/assets-raw/sprites/blocks/distribution/splitter.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/distribution/titanium-conveyor.png b/core/assets-raw/sprites/blocks/distribution/titanium-conveyor.png
deleted file mode 100644
index d25210902a..0000000000
Binary files a/core/assets-raw/sprites/blocks/distribution/titanium-conveyor.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/distribution/warp-gate-top.png b/core/assets-raw/sprites/blocks/distribution/warp-gate-top.png
index 902a47be8d..57ec334c4e 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/warp-gate-top.png and b/core/assets-raw/sprites/blocks/distribution/warp-gate-top.png differ
diff --git a/core/assets-raw/sprites/blocks/distribution/warp-gate.png b/core/assets-raw/sprites/blocks/distribution/warp-gate.png
index a83c625823..6ccfb3b703 100644
Binary files a/core/assets-raw/sprites/blocks/distribution/warp-gate.png and b/core/assets-raw/sprites/blocks/distribution/warp-gate.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png b/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png
index 70cca857d0..611d85060b 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-rim.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png
index 275d72a825..fe87720d61 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill-top.png b/core/assets-raw/sprites/blocks/drills/blast-drill-top.png
index 77543d3e0d..106df26337 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill-top.png and b/core/assets-raw/sprites/blocks/drills/blast-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/blast-drill.png b/core/assets-raw/sprites/blocks/drills/blast-drill.png
index 48de6544b7..703d4bf7de 100644
Binary files a/core/assets-raw/sprites/blocks/drills/blast-drill.png and b/core/assets-raw/sprites/blocks/drills/blast-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/carbide-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/carbide-drill-rotator.png
deleted file mode 100644
index 493207390b..0000000000
Binary files a/core/assets-raw/sprites/blocks/drills/carbide-drill-rotator.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/drills/carbide-drill-top.png b/core/assets-raw/sprites/blocks/drills/carbide-drill-top.png
deleted file mode 100644
index e22719b47d..0000000000
Binary files a/core/assets-raw/sprites/blocks/drills/carbide-drill-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/drills/carbide-drill.png b/core/assets-raw/sprites/blocks/drills/carbide-drill.png
deleted file mode 100644
index 7eb54a3b3c..0000000000
Binary files a/core/assets-raw/sprites/blocks/drills/carbide-drill.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png
index 1e856fa7af..b28c8f43b0 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill-top.png b/core/assets-raw/sprites/blocks/drills/laser-drill-top.png
index 1c92ebe9f7..b263a0a425 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill-top.png and b/core/assets-raw/sprites/blocks/drills/laser-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/laser-drill.png b/core/assets-raw/sprites/blocks/drills/laser-drill.png
index 2edf982c8f..30571d175c 100644
Binary files a/core/assets-raw/sprites/blocks/drills/laser-drill.png and b/core/assets-raw/sprites/blocks/drills/laser-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png
new file mode 100644
index 0000000000..f9a31015fe
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/mechanical-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png
new file mode 100644
index 0000000000..ed10bc2c35
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/mechanical-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/mechanical-drill.png b/core/assets-raw/sprites/blocks/drills/mechanical-drill.png
new file mode 100644
index 0000000000..14114d5810
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/mechanical-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png
index 5e3f1cea3a..f6b000dea0 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png
index 118a8595ba..ec3082b7a3 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png
index 8f5e693961..5b44c022fa 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/oil-extractor.png b/core/assets-raw/sprites/blocks/drills/oil-extractor.png
index 7a73cd3611..9c5e727f74 100644
Binary files a/core/assets-raw/sprites/blocks/drills/oil-extractor.png and b/core/assets-raw/sprites/blocks/drills/oil-extractor.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/plasma-drill-rim.png b/core/assets-raw/sprites/blocks/drills/plasma-drill-rim.png
index f828a5924b..05b5f843a1 100644
Binary files a/core/assets-raw/sprites/blocks/drills/plasma-drill-rim.png and b/core/assets-raw/sprites/blocks/drills/plasma-drill-rim.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/plasma-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/plasma-drill-rotator.png
index 1a1cccbd05..f216e3f0b3 100644
Binary files a/core/assets-raw/sprites/blocks/drills/plasma-drill-rotator.png and b/core/assets-raw/sprites/blocks/drills/plasma-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/plasma-drill-top.png b/core/assets-raw/sprites/blocks/drills/plasma-drill-top.png
index 04f9c4d1c4..45c3aff97f 100644
Binary files a/core/assets-raw/sprites/blocks/drills/plasma-drill-top.png and b/core/assets-raw/sprites/blocks/drills/plasma-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/plasma-drill.png b/core/assets-raw/sprites/blocks/drills/plasma-drill.png
index 30a8a86d99..1ca3ea1903 100644
Binary files a/core/assets-raw/sprites/blocks/drills/plasma-drill.png and b/core/assets-raw/sprites/blocks/drills/plasma-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png
new file mode 100644
index 0000000000..dc86b53b12
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png
new file mode 100644
index 0000000000..b718b71283
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png b/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png
new file mode 100644
index 0000000000..1277139c04
Binary files /dev/null and b/core/assets-raw/sprites/blocks/drills/pneumatic-drill.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/tungsten-drill-rotator.png b/core/assets-raw/sprites/blocks/drills/tungsten-drill-rotator.png
deleted file mode 100644
index 78dcc4c96a..0000000000
Binary files a/core/assets-raw/sprites/blocks/drills/tungsten-drill-rotator.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/drills/tungsten-drill-top.png b/core/assets-raw/sprites/blocks/drills/tungsten-drill-top.png
deleted file mode 100644
index 3be3c538c0..0000000000
Binary files a/core/assets-raw/sprites/blocks/drills/tungsten-drill-top.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/drills/tungsten-drill.png b/core/assets-raw/sprites/blocks/drills/tungsten-drill.png
deleted file mode 100644
index 7dae0b796e..0000000000
Binary files a/core/assets-raw/sprites/blocks/drills/tungsten-drill.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png b/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png
index 1404f2afd6..047d3a7b2a 100644
Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png and b/core/assets-raw/sprites/blocks/drills/water-extractor-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor-rotator.png b/core/assets-raw/sprites/blocks/drills/water-extractor-rotator.png
index 8f6b5ece25..f4d0d76401 100644
Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor-rotator.png and b/core/assets-raw/sprites/blocks/drills/water-extractor-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor-top.png b/core/assets-raw/sprites/blocks/drills/water-extractor-top.png
index 6917779757..def4187b1c 100644
Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor-top.png and b/core/assets-raw/sprites/blocks/drills/water-extractor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/drills/water-extractor.png b/core/assets-raw/sprites/blocks/drills/water-extractor.png
index 446172f8bd..1a34e8c652 100644
Binary files a/core/assets-raw/sprites/blocks/drills/water-extractor.png and b/core/assets-raw/sprites/blocks/drills/water-extractor.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/blackrock1.png b/core/assets-raw/sprites/blocks/environment/blackrock1.png
index 8a3b7f166b..4a43dbe023 100644
Binary files a/core/assets-raw/sprites/blocks/environment/blackrock1.png and b/core/assets-raw/sprites/blocks/environment/blackrock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/blackrockshadow1.png b/core/assets-raw/sprites/blocks/environment/blackrockshadow1.png
index fcf89d8970..11730b4576 100644
Binary files a/core/assets-raw/sprites/blocks/environment/blackrockshadow1.png and b/core/assets-raw/sprites/blocks/environment/blackrockshadow1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/blackstone1.png b/core/assets-raw/sprites/blocks/environment/blackstone1.png
index 42266645c8..5bc819ae4e 100644
Binary files a/core/assets-raw/sprites/blocks/environment/blackstone1.png and b/core/assets-raw/sprites/blocks/environment/blackstone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/blackstone2.png b/core/assets-raw/sprites/blocks/environment/blackstone2.png
index e62cc82c15..458d40c265 100644
Binary files a/core/assets-raw/sprites/blocks/environment/blackstone2.png and b/core/assets-raw/sprites/blocks/environment/blackstone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/blackstone3.png b/core/assets-raw/sprites/blocks/environment/blackstone3.png
index 10f3b44734..cd064a04cd 100644
Binary files a/core/assets-raw/sprites/blocks/environment/blackstone3.png and b/core/assets-raw/sprites/blocks/environment/blackstone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/blackstoneedge.png b/core/assets-raw/sprites/blocks/environment/blackstoneedge.png
index 945f4efdd8..0bd91906aa 100644
Binary files a/core/assets-raw/sprites/blocks/environment/blackstoneedge.png and b/core/assets-raw/sprites/blocks/environment/blackstoneedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/coal1.png b/core/assets-raw/sprites/blocks/environment/coal1.png
index 04e254f3ea..45622ba8a2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/coal1.png and b/core/assets-raw/sprites/blocks/environment/coal1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/coal2.png b/core/assets-raw/sprites/blocks/environment/coal2.png
index 2bdd6177c1..bc54f9fbd2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/coal2.png and b/core/assets-raw/sprites/blocks/environment/coal2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/coal3.png b/core/assets-raw/sprites/blocks/environment/coal3.png
index 1ef60a97b7..7003405d7f 100644
Binary files a/core/assets-raw/sprites/blocks/environment/coal3.png and b/core/assets-raw/sprites/blocks/environment/coal3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/copper1.png b/core/assets-raw/sprites/blocks/environment/copper1.png
new file mode 100644
index 0000000000..22ebe9e501
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/copper2.png b/core/assets-raw/sprites/blocks/environment/copper2.png
new file mode 100644
index 0000000000..1dec4de47f
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/copper3.png b/core/assets-raw/sprites/blocks/environment/copper3.png
new file mode 100644
index 0000000000..57e10aab06
Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/copper3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/deepwater.png b/core/assets-raw/sprites/blocks/environment/deepwater.png
index 373e04e03e..bc4f5312d3 100644
Binary files a/core/assets-raw/sprites/blocks/environment/deepwater.png and b/core/assets-raw/sprites/blocks/environment/deepwater.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt1.png b/core/assets-raw/sprites/blocks/environment/dirt1.png
index 29aa55a74b..8738655fe7 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dirt1.png and b/core/assets-raw/sprites/blocks/environment/dirt1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt2.png b/core/assets-raw/sprites/blocks/environment/dirt2.png
index 993c3071e2..9e04571b90 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dirt2.png and b/core/assets-raw/sprites/blocks/environment/dirt2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirt3.png b/core/assets-raw/sprites/blocks/environment/dirt3.png
index cd2ae7103d..c62c7dcc36 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dirt3.png and b/core/assets-raw/sprites/blocks/environment/dirt3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/dirtedge.png b/core/assets-raw/sprites/blocks/environment/dirtedge.png
index 8b39940e2d..9e2a03cd15 100644
Binary files a/core/assets-raw/sprites/blocks/environment/dirtedge.png and b/core/assets-raw/sprites/blocks/environment/dirtedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png
index 579b161654..eccc9e20a5 100644
Binary files a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png
index 51393d3ac5..d88235bed9 100644
Binary files a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge-2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png
index 12ca285e12..e93dd6f1ac 100644
Binary files a/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png and b/core/assets-raw/sprites/blocks/environment/generic-cliff-edge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png b/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png
index 7dc15898bf..33bc3ca031 100644
Binary files a/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png and b/core/assets-raw/sprites/blocks/environment/generic-cliff-side.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-1.png
index b7db44f2c8..38f7011a99 100644
Binary files a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-1.png and b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-2.png
index 95c438eebe..4625d77cfb 100644
Binary files a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-2.png and b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge-2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge.png
index d13e2f3167..5d93602184 100644
Binary files a/core/assets-raw/sprites/blocks/environment/grass-cliff-edge.png and b/core/assets-raw/sprites/blocks/environment/grass-cliff-edge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/grass-cliff-side.png b/core/assets-raw/sprites/blocks/environment/grass-cliff-side.png
index 19ed554d1e..a165417491 100644
Binary files a/core/assets-raw/sprites/blocks/environment/grass-cliff-side.png and b/core/assets-raw/sprites/blocks/environment/grass-cliff-side.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/grass1.png b/core/assets-raw/sprites/blocks/environment/grass1.png
index 68768bb0d2..d024726eba 100644
Binary files a/core/assets-raw/sprites/blocks/environment/grass1.png and b/core/assets-raw/sprites/blocks/environment/grass1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/grass2.png b/core/assets-raw/sprites/blocks/environment/grass2.png
index 9b17dd53a9..0271e2c0c9 100644
Binary files a/core/assets-raw/sprites/blocks/environment/grass2.png and b/core/assets-raw/sprites/blocks/environment/grass2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/grass3.png b/core/assets-raw/sprites/blocks/environment/grass3.png
index 6896fa10c2..37457a6ad2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/grass3.png and b/core/assets-raw/sprites/blocks/environment/grass3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/grassedge.png b/core/assets-raw/sprites/blocks/environment/grassedge.png
index eadc1f3b14..fdf155f66f 100644
Binary files a/core/assets-raw/sprites/blocks/environment/grassedge.png and b/core/assets-raw/sprites/blocks/environment/grassedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice1.png b/core/assets-raw/sprites/blocks/environment/ice1.png
index 9dbb8ae6d4..dd7af2fd0d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice1.png and b/core/assets-raw/sprites/blocks/environment/ice1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice2.png b/core/assets-raw/sprites/blocks/environment/ice2.png
index 9a742ed753..fa8e08f161 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice2.png and b/core/assets-raw/sprites/blocks/environment/ice2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice3.png b/core/assets-raw/sprites/blocks/environment/ice3.png
index 7e05199777..73908890a1 100644
Binary files a/core/assets-raw/sprites/blocks/environment/ice3.png and b/core/assets-raw/sprites/blocks/environment/ice3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/iceedge.png b/core/assets-raw/sprites/blocks/environment/iceedge.png
index 3e8a2382a0..7065c36213 100644
Binary files a/core/assets-raw/sprites/blocks/environment/iceedge.png and b/core/assets-raw/sprites/blocks/environment/iceedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/icerock1.png b/core/assets-raw/sprites/blocks/environment/icerock1.png
index 88d318c1a4..d81cdfcc84 100644
Binary files a/core/assets-raw/sprites/blocks/environment/icerock1.png and b/core/assets-raw/sprites/blocks/environment/icerock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/icerock2.png b/core/assets-raw/sprites/blocks/environment/icerock2.png
index fe695e87a1..e5adab47a2 100644
Binary files a/core/assets-raw/sprites/blocks/environment/icerock2.png and b/core/assets-raw/sprites/blocks/environment/icerock2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/icerockshadow1.png b/core/assets-raw/sprites/blocks/environment/icerockshadow1.png
index 0b44bf9a7d..daa90b6e0d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/icerockshadow1.png and b/core/assets-raw/sprites/blocks/environment/icerockshadow1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/icerockshadow2.png b/core/assets-raw/sprites/blocks/environment/icerockshadow2.png
index b5a8023d6c..1bbc0af176 100644
Binary files a/core/assets-raw/sprites/blocks/environment/icerockshadow2.png and b/core/assets-raw/sprites/blocks/environment/icerockshadow2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/lava.png b/core/assets-raw/sprites/blocks/environment/lava.png
index 8ef9d3966b..4f1f9cfe10 100644
Binary files a/core/assets-raw/sprites/blocks/environment/lava.png and b/core/assets-raw/sprites/blocks/environment/lava.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/lavaedge.png b/core/assets-raw/sprites/blocks/environment/lavaedge.png
index 69ce2f2332..fc8a770308 100644
Binary files a/core/assets-raw/sprites/blocks/environment/lavaedge.png and b/core/assets-raw/sprites/blocks/environment/lavaedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/lead1.png b/core/assets-raw/sprites/blocks/environment/lead1.png
index 50b937bc47..7cf39fcfeb 100644
Binary files a/core/assets-raw/sprites/blocks/environment/lead1.png and b/core/assets-raw/sprites/blocks/environment/lead1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/lead2.png b/core/assets-raw/sprites/blocks/environment/lead2.png
index 8f6be87470..bb32711c3a 100644
Binary files a/core/assets-raw/sprites/blocks/environment/lead2.png and b/core/assets-raw/sprites/blocks/environment/lead2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/lead3.png b/core/assets-raw/sprites/blocks/environment/lead3.png
index 55effab148..0c54609e7b 100644
Binary files a/core/assets-raw/sprites/blocks/environment/lead3.png and b/core/assets-raw/sprites/blocks/environment/lead3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metalfloor1.png b/core/assets-raw/sprites/blocks/environment/metalfloor1.png
index 7f7bfc043a..2c625b7a77 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metalfloor1.png and b/core/assets-raw/sprites/blocks/environment/metalfloor1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metalfloor2.png b/core/assets-raw/sprites/blocks/environment/metalfloor2.png
index 3d8b339c0a..74c443f2f1 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metalfloor2.png and b/core/assets-raw/sprites/blocks/environment/metalfloor2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metalfloor3.png b/core/assets-raw/sprites/blocks/environment/metalfloor3.png
index 5412971c9e..1215611d66 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metalfloor3.png and b/core/assets-raw/sprites/blocks/environment/metalfloor3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metalfloor4.png b/core/assets-raw/sprites/blocks/environment/metalfloor4.png
index 5d73bcedbc..937133c441 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metalfloor4.png and b/core/assets-raw/sprites/blocks/environment/metalfloor4.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metalfloor5.png b/core/assets-raw/sprites/blocks/environment/metalfloor5.png
index 7800144b67..1d5e775c80 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metalfloor5.png and b/core/assets-raw/sprites/blocks/environment/metalfloor5.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metalfloor6.png b/core/assets-raw/sprites/blocks/environment/metalfloor6.png
index 11118a7fc2..a14136822c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metalfloor6.png and b/core/assets-raw/sprites/blocks/environment/metalfloor6.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/metalflooredge.png b/core/assets-raw/sprites/blocks/environment/metalflooredge.png
index a018513597..b8089a6c63 100644
Binary files a/core/assets-raw/sprites/blocks/environment/metalflooredge.png and b/core/assets-raw/sprites/blocks/environment/metalflooredge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/oil.png b/core/assets-raw/sprites/blocks/environment/oil.png
index fc632673d3..f84183e17b 100644
Binary files a/core/assets-raw/sprites/blocks/environment/oil.png and b/core/assets-raw/sprites/blocks/environment/oil.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/oiledge.png b/core/assets-raw/sprites/blocks/environment/oiledge.png
index cd971062a4..e7f2a2182d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/oiledge.png and b/core/assets-raw/sprites/blocks/environment/oiledge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rock1.png b/core/assets-raw/sprites/blocks/environment/rock1.png
index 4d1fcdddea..5af09f9483 100644
Binary files a/core/assets-raw/sprites/blocks/environment/rock1.png and b/core/assets-raw/sprites/blocks/environment/rock1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rock2.png b/core/assets-raw/sprites/blocks/environment/rock2.png
index c1298987cc..1b1c8cf620 100644
Binary files a/core/assets-raw/sprites/blocks/environment/rock2.png and b/core/assets-raw/sprites/blocks/environment/rock2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rockshadow1.png b/core/assets-raw/sprites/blocks/environment/rockshadow1.png
index 2d9cafbedc..daa90b6e0d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/rockshadow1.png and b/core/assets-raw/sprites/blocks/environment/rockshadow1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/rockshadow2.png b/core/assets-raw/sprites/blocks/environment/rockshadow2.png
index ea2870359e..1bbc0af176 100644
Binary files a/core/assets-raw/sprites/blocks/environment/rockshadow2.png and b/core/assets-raw/sprites/blocks/environment/rockshadow2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand1.png b/core/assets-raw/sprites/blocks/environment/sand1.png
index 119e4a9e8b..6ef1e28bc0 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sand1.png and b/core/assets-raw/sprites/blocks/environment/sand1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand2.png b/core/assets-raw/sprites/blocks/environment/sand2.png
index 21042edd9f..05bedd0bc3 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sand2.png and b/core/assets-raw/sprites/blocks/environment/sand2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sand3.png b/core/assets-raw/sprites/blocks/environment/sand3.png
index 5e0536ef8c..69b1dd2ec7 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sand3.png and b/core/assets-raw/sprites/blocks/environment/sand3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/sandedge.png b/core/assets-raw/sprites/blocks/environment/sandedge.png
index 361c12f800..51b4c9f290 100644
Binary files a/core/assets-raw/sprites/blocks/environment/sandedge.png and b/core/assets-raw/sprites/blocks/environment/sandedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shrub.png b/core/assets-raw/sprites/blocks/environment/shrub.png
index aa5d6ee818..6a7bad1a80 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shrub.png and b/core/assets-raw/sprites/blocks/environment/shrub.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/shrubshadow.png b/core/assets-raw/sprites/blocks/environment/shrubshadow.png
index f78fab2767..7c22d939de 100644
Binary files a/core/assets-raw/sprites/blocks/environment/shrubshadow.png and b/core/assets-raw/sprites/blocks/environment/shrubshadow.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snow1.png b/core/assets-raw/sprites/blocks/environment/snow1.png
index 7ae5cee5cc..87ffafe61c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snow1.png and b/core/assets-raw/sprites/blocks/environment/snow1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snow2.png b/core/assets-raw/sprites/blocks/environment/snow2.png
index 7336d8e818..96c0889c85 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snow2.png and b/core/assets-raw/sprites/blocks/environment/snow2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snow3.png b/core/assets-raw/sprites/blocks/environment/snow3.png
index f423934952..7695fa4265 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snow3.png and b/core/assets-raw/sprites/blocks/environment/snow3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/snowedge.png b/core/assets-raw/sprites/blocks/environment/snowedge.png
index e42c06473c..b3d088df1f 100644
Binary files a/core/assets-raw/sprites/blocks/environment/snowedge.png and b/core/assets-raw/sprites/blocks/environment/snowedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/space.png b/core/assets-raw/sprites/blocks/environment/space.png
index 54eb43362b..9d8e9aade9 100644
Binary files a/core/assets-raw/sprites/blocks/environment/space.png and b/core/assets-raw/sprites/blocks/environment/space.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/spaceedge.png b/core/assets-raw/sprites/blocks/environment/spaceedge.png
index 8f0314574a..20f01523c5 100644
Binary files a/core/assets-raw/sprites/blocks/environment/spaceedge.png and b/core/assets-raw/sprites/blocks/environment/spaceedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/stone-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/stone-cliff-edge-1.png
index d7f7bd6fb9..d86f0adfea 100644
Binary files a/core/assets-raw/sprites/blocks/environment/stone-cliff-edge-1.png and b/core/assets-raw/sprites/blocks/environment/stone-cliff-edge-1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/stone-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/stone-cliff-edge-2.png
index 327f896766..f0f94d1d3a 100644
Binary files a/core/assets-raw/sprites/blocks/environment/stone-cliff-edge-2.png and b/core/assets-raw/sprites/blocks/environment/stone-cliff-edge-2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/stone-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/stone-cliff-edge.png
index 32d291b922..bc3492afc5 100644
Binary files a/core/assets-raw/sprites/blocks/environment/stone-cliff-edge.png and b/core/assets-raw/sprites/blocks/environment/stone-cliff-edge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/stone-cliff-side.png b/core/assets-raw/sprites/blocks/environment/stone-cliff-side.png
index c71d3aeade..d6bd37c898 100644
Binary files a/core/assets-raw/sprites/blocks/environment/stone-cliff-side.png and b/core/assets-raw/sprites/blocks/environment/stone-cliff-side.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/stone1.png b/core/assets-raw/sprites/blocks/environment/stone1.png
index ba1dd7c5a7..7e7bbc6db8 100644
Binary files a/core/assets-raw/sprites/blocks/environment/stone1.png and b/core/assets-raw/sprites/blocks/environment/stone1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/stone2.png b/core/assets-raw/sprites/blocks/environment/stone2.png
index 19f4ea319e..428ca5258f 100644
Binary files a/core/assets-raw/sprites/blocks/environment/stone2.png and b/core/assets-raw/sprites/blocks/environment/stone2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/stone3.png b/core/assets-raw/sprites/blocks/environment/stone3.png
index c5d121ca8d..2fe8643825 100644
Binary files a/core/assets-raw/sprites/blocks/environment/stone3.png and b/core/assets-raw/sprites/blocks/environment/stone3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/stoneedge.png b/core/assets-raw/sprites/blocks/environment/stoneedge.png
index abae1e4174..0a8b5cc987 100644
Binary files a/core/assets-raw/sprites/blocks/environment/stoneedge.png and b/core/assets-raw/sprites/blocks/environment/stoneedge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/thorium1.png b/core/assets-raw/sprites/blocks/environment/thorium1.png
index af0c3945cf..db7eddcd84 100644
Binary files a/core/assets-raw/sprites/blocks/environment/thorium1.png and b/core/assets-raw/sprites/blocks/environment/thorium1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/thorium2.png b/core/assets-raw/sprites/blocks/environment/thorium2.png
index 3770ac936e..90a182d71a 100644
Binary files a/core/assets-raw/sprites/blocks/environment/thorium2.png and b/core/assets-raw/sprites/blocks/environment/thorium2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/thorium3.png b/core/assets-raw/sprites/blocks/environment/thorium3.png
index c81886a2ff..0872ffb168 100644
Binary files a/core/assets-raw/sprites/blocks/environment/thorium3.png and b/core/assets-raw/sprites/blocks/environment/thorium3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/titanium1.png b/core/assets-raw/sprites/blocks/environment/titanium1.png
index d3eb607b41..2496e3bc4c 100644
Binary files a/core/assets-raw/sprites/blocks/environment/titanium1.png and b/core/assets-raw/sprites/blocks/environment/titanium1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/titanium2.png b/core/assets-raw/sprites/blocks/environment/titanium2.png
index 155ec110d4..edf8b6db31 100644
Binary files a/core/assets-raw/sprites/blocks/environment/titanium2.png and b/core/assets-raw/sprites/blocks/environment/titanium2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/titanium3.png b/core/assets-raw/sprites/blocks/environment/titanium3.png
index 4207658ab4..bdb5d318fb 100644
Binary files a/core/assets-raw/sprites/blocks/environment/titanium3.png and b/core/assets-raw/sprites/blocks/environment/titanium3.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/tungsten1.png b/core/assets-raw/sprites/blocks/environment/tungsten1.png
deleted file mode 100644
index e831275a95..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/tungsten1.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/tungsten2.png b/core/assets-raw/sprites/blocks/environment/tungsten2.png
deleted file mode 100644
index fb85738120..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/tungsten2.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/tungsten3.png b/core/assets-raw/sprites/blocks/environment/tungsten3.png
deleted file mode 100644
index 6c7b42a5b0..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/tungsten3.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/water-cliff-edge-1.png b/core/assets-raw/sprites/blocks/environment/water-cliff-edge-1.png
index 271d355d2f..d9dc5602b8 100644
Binary files a/core/assets-raw/sprites/blocks/environment/water-cliff-edge-1.png and b/core/assets-raw/sprites/blocks/environment/water-cliff-edge-1.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/water-cliff-edge-2.png b/core/assets-raw/sprites/blocks/environment/water-cliff-edge-2.png
index e843c6cd20..9bc0ee1962 100644
Binary files a/core/assets-raw/sprites/blocks/environment/water-cliff-edge-2.png and b/core/assets-raw/sprites/blocks/environment/water-cliff-edge-2.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/water-cliff-edge.png b/core/assets-raw/sprites/blocks/environment/water-cliff-edge.png
index 7962b0c445..460663e57d 100644
Binary files a/core/assets-raw/sprites/blocks/environment/water-cliff-edge.png and b/core/assets-raw/sprites/blocks/environment/water-cliff-edge.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/water-cliff-side.png b/core/assets-raw/sprites/blocks/environment/water-cliff-side.png
index e184eb7aa8..7e0402fa97 100644
Binary files a/core/assets-raw/sprites/blocks/environment/water-cliff-side.png and b/core/assets-raw/sprites/blocks/environment/water-cliff-side.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/water.png b/core/assets-raw/sprites/blocks/environment/water.png
index 9855f81c1a..b923481473 100644
Binary files a/core/assets-raw/sprites/blocks/environment/water.png and b/core/assets-raw/sprites/blocks/environment/water.png differ
diff --git a/core/assets-raw/sprites/blocks/environment/wateredge.png b/core/assets-raw/sprites/blocks/environment/wateredge.png
index cca7fdd058..5dcc17b20e 100644
Binary files a/core/assets-raw/sprites/blocks/environment/wateredge.png and b/core/assets-raw/sprites/blocks/environment/wateredge.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/block-border.png b/core/assets-raw/sprites/blocks/extra/block-border.png
index e4f5596ce8..58c5afd372 100644
Binary files a/core/assets-raw/sprites/blocks/extra/block-border.png and b/core/assets-raw/sprites/blocks/extra/block-border.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/block-elevation.png b/core/assets-raw/sprites/blocks/extra/block-elevation.png
index 06b3214b56..6f47e65204 100644
Binary files a/core/assets-raw/sprites/blocks/extra/block-elevation.png and b/core/assets-raw/sprites/blocks/extra/block-elevation.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/block-middle.png b/core/assets-raw/sprites/blocks/extra/block-middle.png
index 601527a90d..1b6c55fb87 100644
Binary files a/core/assets-raw/sprites/blocks/extra/block-middle.png and b/core/assets-raw/sprites/blocks/extra/block-middle.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/block-slope.png b/core/assets-raw/sprites/blocks/extra/block-slope.png
index a9a7ce463d..c37587f765 100644
Binary files a/core/assets-raw/sprites/blocks/extra/block-slope.png and b/core/assets-raw/sprites/blocks/extra/block-slope.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/border.png b/core/assets-raw/sprites/blocks/extra/border.png
index 1a5517ac49..6d848e1b72 100644
Binary files a/core/assets-raw/sprites/blocks/extra/border.png and b/core/assets-raw/sprites/blocks/extra/border.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/conduit-liquid.png b/core/assets-raw/sprites/blocks/extra/conduit-liquid.png
index d223f13561..231db3568c 100644
Binary files a/core/assets-raw/sprites/blocks/extra/conduit-liquid.png and b/core/assets-raw/sprites/blocks/extra/conduit-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/cross-1.png b/core/assets-raw/sprites/blocks/extra/cross-1.png
index c3350ae4e2..1c3aa8ae22 100644
Binary files a/core/assets-raw/sprites/blocks/extra/cross-1.png and b/core/assets-raw/sprites/blocks/extra/cross-1.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/cross-2.png b/core/assets-raw/sprites/blocks/extra/cross-2.png
index c2e6418df8..3aa3ceb32b 100644
Binary files a/core/assets-raw/sprites/blocks/extra/cross-2.png and b/core/assets-raw/sprites/blocks/extra/cross-2.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/cross-3.png b/core/assets-raw/sprites/blocks/extra/cross-3.png
index 60567dc1bf..9aacfbb93d 100644
Binary files a/core/assets-raw/sprites/blocks/extra/cross-3.png and b/core/assets-raw/sprites/blocks/extra/cross-3.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/cross-4.png b/core/assets-raw/sprites/blocks/extra/cross-4.png
index 5c24f39694..a1247aeafb 100644
Binary files a/core/assets-raw/sprites/blocks/extra/cross-4.png and b/core/assets-raw/sprites/blocks/extra/cross-4.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/enemyspawn.png b/core/assets-raw/sprites/blocks/extra/enemyspawn.png
index e401b6eaef..c1114724d1 100644
Binary files a/core/assets-raw/sprites/blocks/extra/enemyspawn.png and b/core/assets-raw/sprites/blocks/extra/enemyspawn.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/nuclearreactor-shadow.png b/core/assets-raw/sprites/blocks/extra/nuclearreactor-shadow.png
index b8cd9b59e6..176497866c 100644
Binary files a/core/assets-raw/sprites/blocks/extra/nuclearreactor-shadow.png and b/core/assets-raw/sprites/blocks/extra/nuclearreactor-shadow.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/place-arrow.png b/core/assets-raw/sprites/blocks/extra/place-arrow.png
index 3fc6718d29..84f4b22895 100644
Binary files a/core/assets-raw/sprites/blocks/extra/place-arrow.png and b/core/assets-raw/sprites/blocks/extra/place-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/playerspawn.png b/core/assets-raw/sprites/blocks/extra/playerspawn.png
index 448213f999..16352b3252 100644
Binary files a/core/assets-raw/sprites/blocks/extra/playerspawn.png and b/core/assets-raw/sprites/blocks/extra/playerspawn.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/ripples.png b/core/assets-raw/sprites/blocks/extra/ripples.png
index 7e975a5b4c..d416708543 100644
Binary files a/core/assets-raw/sprites/blocks/extra/ripples.png and b/core/assets-raw/sprites/blocks/extra/ripples.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/rubble-1-0.png b/core/assets-raw/sprites/blocks/extra/rubble-1-0.png
index 50587fa070..9fb247b258 100644
Binary files a/core/assets-raw/sprites/blocks/extra/rubble-1-0.png and b/core/assets-raw/sprites/blocks/extra/rubble-1-0.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/rubble-1-1.png b/core/assets-raw/sprites/blocks/extra/rubble-1-1.png
index 703be71c3c..0ab8fc42cc 100644
Binary files a/core/assets-raw/sprites/blocks/extra/rubble-1-1.png and b/core/assets-raw/sprites/blocks/extra/rubble-1-1.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/rubble-2-0.png b/core/assets-raw/sprites/blocks/extra/rubble-2-0.png
index 5a69b696a0..ff0eceb5ec 100644
Binary files a/core/assets-raw/sprites/blocks/extra/rubble-2-0.png and b/core/assets-raw/sprites/blocks/extra/rubble-2-0.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/rubble-2-1.png b/core/assets-raw/sprites/blocks/extra/rubble-2-1.png
index 3638d6ee3e..0fdfd0d596 100644
Binary files a/core/assets-raw/sprites/blocks/extra/rubble-2-1.png and b/core/assets-raw/sprites/blocks/extra/rubble-2-1.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/rubble-3-0.png b/core/assets-raw/sprites/blocks/extra/rubble-3-0.png
index 4fb1a666db..6612263705 100644
Binary files a/core/assets-raw/sprites/blocks/extra/rubble-3-0.png and b/core/assets-raw/sprites/blocks/extra/rubble-3-0.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/rubble-3-1.png b/core/assets-raw/sprites/blocks/extra/rubble-3-1.png
index 4fb1a666db..6612263705 100644
Binary files a/core/assets-raw/sprites/blocks/extra/rubble-3-1.png and b/core/assets-raw/sprites/blocks/extra/rubble-3-1.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-1.png b/core/assets-raw/sprites/blocks/extra/shadow-1.png
index ce366cdac9..edc6cdf9bb 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-1.png and b/core/assets-raw/sprites/blocks/extra/shadow-1.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-2.png b/core/assets-raw/sprites/blocks/extra/shadow-2.png
index ecec67ced8..7b3cbfdc75 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-2.png and b/core/assets-raw/sprites/blocks/extra/shadow-2.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-3.png b/core/assets-raw/sprites/blocks/extra/shadow-3.png
index 023a68f210..0bc358b1db 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-3.png and b/core/assets-raw/sprites/blocks/extra/shadow-3.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-4.png b/core/assets-raw/sprites/blocks/extra/shadow-4.png
index 4b55f9be7d..6bb965642b 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-4.png and b/core/assets-raw/sprites/blocks/extra/shadow-4.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-5.png b/core/assets-raw/sprites/blocks/extra/shadow-5.png
index 3d09ca421c..e0020cbf44 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-5.png and b/core/assets-raw/sprites/blocks/extra/shadow-5.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-6.png b/core/assets-raw/sprites/blocks/extra/shadow-6.png
index ed6da05349..b9c81ea3bc 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-6.png and b/core/assets-raw/sprites/blocks/extra/shadow-6.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-corner.png b/core/assets-raw/sprites/blocks/extra/shadow-corner.png
index 3f8f4b5d07..9f27566504 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-corner.png and b/core/assets-raw/sprites/blocks/extra/shadow-corner.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-round-1.png b/core/assets-raw/sprites/blocks/extra/shadow-round-1.png
index 2910e29275..18db67b552 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-round-1.png and b/core/assets-raw/sprites/blocks/extra/shadow-round-1.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-round-2.png b/core/assets-raw/sprites/blocks/extra/shadow-round-2.png
index f7a191914e..5a6c5c4aa3 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-round-2.png and b/core/assets-raw/sprites/blocks/extra/shadow-round-2.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-round-3.png b/core/assets-raw/sprites/blocks/extra/shadow-round-3.png
index f2b116ff67..2bda3d966b 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-round-3.png and b/core/assets-raw/sprites/blocks/extra/shadow-round-3.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/shadow-rounded-2.png b/core/assets-raw/sprites/blocks/extra/shadow-rounded-2.png
index 5dedff2673..9faec224c2 100644
Binary files a/core/assets-raw/sprites/blocks/extra/shadow-rounded-2.png and b/core/assets-raw/sprites/blocks/extra/shadow-rounded-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png
index 3c2ab9921e..225663a2ee 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png
index fb5633fc6e..8465ed415d 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-bridge.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png
index 2392bdb67b..6331c56195 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit-end.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png b/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png
index d815787b4f..3e87ad0b6c 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png and b/core/assets-raw/sprites/blocks/liquid/bridge-conduit.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png
index 04eca38d45..070468711d 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png
index dff4e78e7f..2500feaa67 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png
index 5fec0419e0..42bd75f1bb 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png
index 8983671a0d..9ecfcdf88c 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png
index 3a8d3ac7a8..32755ce6fe 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png
index 5fa2763614..49137fe492 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png
index 931b4d5b87..622c40021b 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png
index 7e3892102f..d3d703fec8 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png and b/core/assets-raw/sprites/blocks/liquid/conduit-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png
index b563812736..ad50ff08af 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png
index 812dd3ce2b..aed29c054f 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png
index 3ca57ad02f..f853e0b116 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png
index c0b406a072..042005c44f 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png
index 1249112f47..18497fa8ea 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png
index 2204378fdc..fa239fc96a 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png
index b1c301f4e8..5235f6bafc 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/conduit-top-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-junction.png b/core/assets-raw/sprites/blocks/liquid/liquid-junction.png
index 29808c9146..a0b9dc4d11 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-junction.png and b/core/assets-raw/sprites/blocks/liquid/liquid-junction.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png
index 655303b3c6..f5b9f85edc 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png
index 08f30e7a73..710b2b325d 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png
index f89dad02bc..484b27d7f9 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router-top.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-router.png b/core/assets-raw/sprites/blocks/liquid/liquid-router.png
index dd4230684e..cfe6203739 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-router.png and b/core/assets-raw/sprites/blocks/liquid/liquid-router.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png
index 082dace989..afc9c8ae33 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png
index 5e1e387d8f..4588b7f33e 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png
index ee332f30fc..2f7ce0005b 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-top.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png b/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png
index 02238bee1a..9900f26875 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png and b/core/assets-raw/sprites/blocks/liquid/mechanical-pump.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png
index aba310f7da..b15fcdb991 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit-arrow.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-bridge.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit-bridge.png
index d6bf45f0cc..386a154356 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit-bridge.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit-bridge.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png
index be40ddf9a0..847f3a4430 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit-end.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/phase-conduit.png b/core/assets-raw/sprites/blocks/liquid/phase-conduit.png
index 0be4509752..8db357f18b 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/phase-conduit.png and b/core/assets-raw/sprites/blocks/liquid/phase-conduit.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png
index a7ac7b2ce0..fcbca7d932 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-0.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png
index 04f4c45fe3..151480fdfd 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-1.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png
index 86c76aa13b..24eddc49a7 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-2.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png
index 43597c1aa3..9638ff8ced 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-3.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png
index f57c2f3d55..c6725d30b2 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-4.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png
index af87bdbf65..8ec425dc02 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-5.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png
index d70994a01a..cdfb0f7b03 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png and b/core/assets-raw/sprites/blocks/liquid/pulse-conduit-top-6.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/rotary-pump.png b/core/assets-raw/sprites/blocks/liquid/rotary-pump.png
index 8f774bef86..b2649131c6 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/rotary-pump.png and b/core/assets-raw/sprites/blocks/liquid/rotary-pump.png differ
diff --git a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png
index 6fe78e5277..47d5349d23 100644
Binary files a/core/assets-raw/sprites/blocks/liquid/thermal-pump.png and b/core/assets-raw/sprites/blocks/liquid/thermal-pump.png differ
diff --git a/core/assets-raw/sprites/blocks/power/battery-large.png b/core/assets-raw/sprites/blocks/power/battery-large.png
index 7800659d35..08ed3aa464 100644
Binary files a/core/assets-raw/sprites/blocks/power/battery-large.png and b/core/assets-raw/sprites/blocks/power/battery-large.png differ
diff --git a/core/assets-raw/sprites/blocks/power/battery.png b/core/assets-raw/sprites/blocks/power/battery.png
index a61a546646..902ab6a6c3 100644
Binary files a/core/assets-raw/sprites/blocks/power/battery.png and b/core/assets-raw/sprites/blocks/power/battery.png differ
diff --git a/core/assets-raw/sprites/blocks/power/combustion-generator-top.png b/core/assets-raw/sprites/blocks/power/combustion-generator-top.png
index 211c6afbec..54726d68f6 100644
Binary files a/core/assets-raw/sprites/blocks/power/combustion-generator-top.png and b/core/assets-raw/sprites/blocks/power/combustion-generator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/power/combustion-generator.png b/core/assets-raw/sprites/blocks/power/combustion-generator.png
index 116811b8e1..2c10d22506 100644
Binary files a/core/assets-raw/sprites/blocks/power/combustion-generator.png and b/core/assets-raw/sprites/blocks/power/combustion-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/fusion-reactor-bottom.png b/core/assets-raw/sprites/blocks/power/fusion-reactor-bottom.png
index a7688ed12d..3960ab07af 100644
Binary files a/core/assets-raw/sprites/blocks/power/fusion-reactor-bottom.png and b/core/assets-raw/sprites/blocks/power/fusion-reactor-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/power/fusion-reactor-light.png b/core/assets-raw/sprites/blocks/power/fusion-reactor-light.png
index deabd2752f..51077471b4 100644
Binary files a/core/assets-raw/sprites/blocks/power/fusion-reactor-light.png and b/core/assets-raw/sprites/blocks/power/fusion-reactor-light.png differ
diff --git a/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-0.png b/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-0.png
index 13efbdd207..e158a66961 100644
Binary files a/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-0.png and b/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-0.png differ
diff --git a/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-1.png b/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-1.png
index 820e15bde2..111451409f 100644
Binary files a/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-1.png and b/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-1.png differ
diff --git a/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-2.png b/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-2.png
index a1032085ff..bc3f9109a1 100644
Binary files a/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-2.png and b/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-2.png differ
diff --git a/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-3.png b/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-3.png
index 2b22128700..62466b9cad 100644
Binary files a/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-3.png and b/core/assets-raw/sprites/blocks/power/fusion-reactor-plasma-3.png differ
diff --git a/core/assets-raw/sprites/blocks/power/fusion-reactor-top.png b/core/assets-raw/sprites/blocks/power/fusion-reactor-top.png
index 165f77c739..baa449e990 100644
Binary files a/core/assets-raw/sprites/blocks/power/fusion-reactor-top.png and b/core/assets-raw/sprites/blocks/power/fusion-reactor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/power/fusion-reactor.png b/core/assets-raw/sprites/blocks/power/fusion-reactor.png
index 11aaf95ad7..ee7e403971 100644
Binary files a/core/assets-raw/sprites/blocks/power/fusion-reactor.png and b/core/assets-raw/sprites/blocks/power/fusion-reactor.png differ
diff --git a/core/assets-raw/sprites/blocks/power/nuclear-reactor-center.png b/core/assets-raw/sprites/blocks/power/nuclear-reactor-center.png
deleted file mode 100644
index bebf831aea..0000000000
Binary files a/core/assets-raw/sprites/blocks/power/nuclear-reactor-center.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/power/nuclear-reactor-lights.png b/core/assets-raw/sprites/blocks/power/nuclear-reactor-lights.png
deleted file mode 100644
index 65f7869f54..0000000000
Binary files a/core/assets-raw/sprites/blocks/power/nuclear-reactor-lights.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/power/nuclear-reactor.png b/core/assets-raw/sprites/blocks/power/nuclear-reactor.png
deleted file mode 100644
index 4f7561e0bb..0000000000
Binary files a/core/assets-raw/sprites/blocks/power/nuclear-reactor.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/power/power-node-large.png b/core/assets-raw/sprites/blocks/power/power-node-large.png
index 4d8d7d5b4e..ee60b08d68 100644
Binary files a/core/assets-raw/sprites/blocks/power/power-node-large.png and b/core/assets-raw/sprites/blocks/power/power-node-large.png differ
diff --git a/core/assets-raw/sprites/blocks/power/power-node.png b/core/assets-raw/sprites/blocks/power/power-node.png
index 696e84ce7d..2191ac583c 100644
Binary files a/core/assets-raw/sprites/blocks/power/power-node.png and b/core/assets-raw/sprites/blocks/power/power-node.png differ
diff --git a/core/assets-raw/sprites/blocks/power/powerinfinite.png b/core/assets-raw/sprites/blocks/power/powerinfinite.png
index ce78153ea0..442501f0fb 100644
Binary files a/core/assets-raw/sprites/blocks/power/powerinfinite.png and b/core/assets-raw/sprites/blocks/power/powerinfinite.png differ
diff --git a/core/assets-raw/sprites/blocks/power/powervoid.png b/core/assets-raw/sprites/blocks/power/powervoid.png
index d91f656faf..85644c900e 100644
Binary files a/core/assets-raw/sprites/blocks/power/powervoid.png and b/core/assets-raw/sprites/blocks/power/powervoid.png differ
diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator-top.png b/core/assets-raw/sprites/blocks/power/rtg-generator-top.png
index 56e04563b4..5db51a87cc 100644
Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator-top.png and b/core/assets-raw/sprites/blocks/power/rtg-generator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/power/rtg-generator.png b/core/assets-raw/sprites/blocks/power/rtg-generator.png
index 9e4a43058f..4f14e35a96 100644
Binary files a/core/assets-raw/sprites/blocks/power/rtg-generator.png and b/core/assets-raw/sprites/blocks/power/rtg-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar-panel-large.png b/core/assets-raw/sprites/blocks/power/solar-panel-large.png
index a0f3d22ba3..6dfa4d7c59 100644
Binary files a/core/assets-raw/sprites/blocks/power/solar-panel-large.png and b/core/assets-raw/sprites/blocks/power/solar-panel-large.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar-panel.png b/core/assets-raw/sprites/blocks/power/solar-panel.png
index 5aafde0e04..48f3deda02 100644
Binary files a/core/assets-raw/sprites/blocks/power/solar-panel.png and b/core/assets-raw/sprites/blocks/power/solar-panel.png differ
diff --git a/core/assets-raw/sprites/blocks/power/thermal-generator.png b/core/assets-raw/sprites/blocks/power/thermal-generator.png
index 10347e1bc4..a6d0e1135d 100644
Binary files a/core/assets-raw/sprites/blocks/power/thermal-generator.png and b/core/assets-raw/sprites/blocks/power/thermal-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png b/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png
new file mode 100644
index 0000000000..914758e9f4
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/thorium-reactor-center.png differ
diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png b/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png
new file mode 100644
index 0000000000..63ee995c34
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/thorium-reactor-lights.png differ
diff --git a/core/assets-raw/sprites/blocks/power/thorium-reactor.png b/core/assets-raw/sprites/blocks/power/thorium-reactor.png
new file mode 100644
index 0000000000..f1d7b96063
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/thorium-reactor.png differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator-top.png b/core/assets-raw/sprites/blocks/power/turbine-generator-top.png
index 4e2f4fa5b4..6a4d4b2f5b 100644
Binary files a/core/assets-raw/sprites/blocks/power/turbine-generator-top.png and b/core/assets-raw/sprites/blocks/power/turbine-generator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/power/turbine-generator.png b/core/assets-raw/sprites/blocks/power/turbine-generator.png
index 4d7dde6b47..566b38a505 100644
Binary files a/core/assets-raw/sprites/blocks/power/turbine-generator.png and b/core/assets-raw/sprites/blocks/power/turbine-generator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/alloy-fuser.png b/core/assets-raw/sprites/blocks/production/alloy-fuser.png
index 79464317e2..19815de0ff 100644
Binary files a/core/assets-raw/sprites/blocks/production/alloy-fuser.png and b/core/assets-raw/sprites/blocks/production/alloy-fuser.png differ
diff --git a/core/assets-raw/sprites/blocks/production/alloy-smelter.png b/core/assets-raw/sprites/blocks/production/alloy-smelter.png
index 7c483b2a4b..a93b551ee3 100644
Binary files a/core/assets-raw/sprites/blocks/production/alloy-smelter.png and b/core/assets-raw/sprites/blocks/production/alloy-smelter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/arc-smelter-top.png b/core/assets-raw/sprites/blocks/production/arc-smelter-top.png
index 67ba01fd18..d6dcef23ef 100644
Binary files a/core/assets-raw/sprites/blocks/production/arc-smelter-top.png and b/core/assets-raw/sprites/blocks/production/arc-smelter-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/arc-smelter.png b/core/assets-raw/sprites/blocks/production/arc-smelter.png
index 5f9212d4b6..58248d838f 100644
Binary files a/core/assets-raw/sprites/blocks/production/arc-smelter.png and b/core/assets-raw/sprites/blocks/production/arc-smelter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor-frame0.png b/core/assets-raw/sprites/blocks/production/biomattercompressor-frame0.png
index 2985c82f70..f83f257b6d 100644
Binary files a/core/assets-raw/sprites/blocks/production/biomattercompressor-frame0.png and b/core/assets-raw/sprites/blocks/production/biomattercompressor-frame0.png differ
diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor-frame1.png b/core/assets-raw/sprites/blocks/production/biomattercompressor-frame1.png
index 8dfd11128c..6cd1f91b99 100644
Binary files a/core/assets-raw/sprites/blocks/production/biomattercompressor-frame1.png and b/core/assets-raw/sprites/blocks/production/biomattercompressor-frame1.png differ
diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor-frame2.png b/core/assets-raw/sprites/blocks/production/biomattercompressor-frame2.png
index cd65d58676..26c5cf37c3 100644
Binary files a/core/assets-raw/sprites/blocks/production/biomattercompressor-frame2.png and b/core/assets-raw/sprites/blocks/production/biomattercompressor-frame2.png differ
diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor-liquid.png b/core/assets-raw/sprites/blocks/production/biomattercompressor-liquid.png
index 17f8bd2e4d..1ea7069753 100644
Binary files a/core/assets-raw/sprites/blocks/production/biomattercompressor-liquid.png and b/core/assets-raw/sprites/blocks/production/biomattercompressor-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor-top.png b/core/assets-raw/sprites/blocks/production/biomattercompressor-top.png
index 0c97e631b8..29ef5f54c7 100644
Binary files a/core/assets-raw/sprites/blocks/production/biomattercompressor-top.png and b/core/assets-raw/sprites/blocks/production/biomattercompressor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/biomattercompressor.png b/core/assets-raw/sprites/blocks/production/biomattercompressor.png
index 0652d74220..a7d633c61b 100644
Binary files a/core/assets-raw/sprites/blocks/production/biomattercompressor.png and b/core/assets-raw/sprites/blocks/production/biomattercompressor.png differ
diff --git a/core/assets-raw/sprites/blocks/production/blast-mixer.png b/core/assets-raw/sprites/blocks/production/blast-mixer.png
index c20530333f..3ba57b3638 100644
Binary files a/core/assets-raw/sprites/blocks/production/blast-mixer.png and b/core/assets-raw/sprites/blocks/production/blast-mixer.png differ
diff --git a/core/assets-raw/sprites/blocks/production/centrifuge-liquid.png b/core/assets-raw/sprites/blocks/production/centrifuge-liquid.png
index 3cf9d7393d..9c215f6166 100644
Binary files a/core/assets-raw/sprites/blocks/production/centrifuge-liquid.png and b/core/assets-raw/sprites/blocks/production/centrifuge-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/centrifuge.png b/core/assets-raw/sprites/blocks/production/centrifuge.png
index af15eab31e..281fb35a9d 100644
Binary files a/core/assets-raw/sprites/blocks/production/centrifuge.png and b/core/assets-raw/sprites/blocks/production/centrifuge.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png
index 51037d3e26..483a190c63 100644
Binary files a/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png
index 47ab49a42f..48b80363ae 100644
Binary files a/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png b/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png
index 64ffa52a5b..e32657f59e 100644
Binary files a/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png and b/core/assets-raw/sprites/blocks/production/cryofluidmixer-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cultivator-middle.png b/core/assets-raw/sprites/blocks/production/cultivator-middle.png
index 636a7c9865..777e48848c 100644
Binary files a/core/assets-raw/sprites/blocks/production/cultivator-middle.png and b/core/assets-raw/sprites/blocks/production/cultivator-middle.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cultivator-top.png b/core/assets-raw/sprites/blocks/production/cultivator-top.png
index c5db5a8ffd..fd4b013d72 100644
Binary files a/core/assets-raw/sprites/blocks/production/cultivator-top.png and b/core/assets-raw/sprites/blocks/production/cultivator-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/cultivator.png b/core/assets-raw/sprites/blocks/production/cultivator.png
index 584451324f..6869527fcf 100644
Binary files a/core/assets-raw/sprites/blocks/production/cultivator.png and b/core/assets-raw/sprites/blocks/production/cultivator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/incinerator.png b/core/assets-raw/sprites/blocks/production/incinerator.png
index 95b2acd3a9..62aa3ad591 100644
Binary files a/core/assets-raw/sprites/blocks/production/incinerator.png and b/core/assets-raw/sprites/blocks/production/incinerator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/itemsource.png b/core/assets-raw/sprites/blocks/production/itemsource.png
index 95ed50bce4..b2cb50b64f 100644
Binary files a/core/assets-raw/sprites/blocks/production/itemsource.png and b/core/assets-raw/sprites/blocks/production/itemsource.png differ
diff --git a/core/assets-raw/sprites/blocks/production/itemvoid.png b/core/assets-raw/sprites/blocks/production/itemvoid.png
index 51b216a3ed..e6f9836868 100644
Binary files a/core/assets-raw/sprites/blocks/production/itemvoid.png and b/core/assets-raw/sprites/blocks/production/itemvoid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/lavasmelter.png b/core/assets-raw/sprites/blocks/production/lavasmelter.png
index df2b3b1f9e..34c1e429ec 100644
Binary files a/core/assets-raw/sprites/blocks/production/lavasmelter.png and b/core/assets-raw/sprites/blocks/production/lavasmelter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/liquidsource.png b/core/assets-raw/sprites/blocks/production/liquidsource.png
index 49e08309f2..b345a398e2 100644
Binary files a/core/assets-raw/sprites/blocks/production/liquidsource.png and b/core/assets-raw/sprites/blocks/production/liquidsource.png differ
diff --git a/core/assets-raw/sprites/blocks/production/melter.png b/core/assets-raw/sprites/blocks/production/melter.png
index ea1207e0bf..aa57e3c0f4 100644
Binary files a/core/assets-raw/sprites/blocks/production/melter.png and b/core/assets-raw/sprites/blocks/production/melter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/oilrefinery.png b/core/assets-raw/sprites/blocks/production/oilrefinery.png
index 445c57ece3..b6fdea3228 100644
Binary files a/core/assets-raw/sprites/blocks/production/oilrefinery.png and b/core/assets-raw/sprites/blocks/production/oilrefinery.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png b/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png
index 986861dd19..7765bb72e4 100644
Binary files a/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png and b/core/assets-raw/sprites/blocks/production/phase-weaver-bottom.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png b/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png
index 660d664472..e3ca869e32 100644
Binary files a/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png and b/core/assets-raw/sprites/blocks/production/phase-weaver-weave.png differ
diff --git a/core/assets-raw/sprites/blocks/production/phase-weaver.png b/core/assets-raw/sprites/blocks/production/phase-weaver.png
index b03f62e27b..cf6b24a25e 100644
Binary files a/core/assets-raw/sprites/blocks/production/phase-weaver.png and b/core/assets-raw/sprites/blocks/production/phase-weaver.png differ
diff --git a/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png b/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png
index 2addf06035..d12e1c1e67 100644
Binary files a/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png and b/core/assets-raw/sprites/blocks/production/plastanium-compressor-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/plastanium-compressor.png b/core/assets-raw/sprites/blocks/production/plastanium-compressor.png
index 2f186d27ad..4bd9a0098f 100644
Binary files a/core/assets-raw/sprites/blocks/production/plastanium-compressor.png and b/core/assets-raw/sprites/blocks/production/plastanium-compressor.png differ
diff --git a/core/assets-raw/sprites/blocks/production/poweralloysmelter-top.png b/core/assets-raw/sprites/blocks/production/poweralloysmelter-top.png
index e3da203391..04220393c4 100644
Binary files a/core/assets-raw/sprites/blocks/production/poweralloysmelter-top.png and b/core/assets-raw/sprites/blocks/production/poweralloysmelter-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png
index f9e5ab3537..56d7b4a878 100644
Binary files a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png and b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pulverizer.png b/core/assets-raw/sprites/blocks/production/pulverizer.png
index 194c4176b4..670f682ff9 100644
Binary files a/core/assets-raw/sprites/blocks/production/pulverizer.png and b/core/assets-raw/sprites/blocks/production/pulverizer.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pump-liquid.png b/core/assets-raw/sprites/blocks/production/pump-liquid.png
index 4ecbc4988c..7bb98b9f61 100644
Binary files a/core/assets-raw/sprites/blocks/production/pump-liquid.png and b/core/assets-raw/sprites/blocks/production/pump-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/pyratite-mixer.png b/core/assets-raw/sprites/blocks/production/pyratite-mixer.png
index 94abd827e4..ca6b893e8b 100644
Binary files a/core/assets-raw/sprites/blocks/production/pyratite-mixer.png and b/core/assets-raw/sprites/blocks/production/pyratite-mixer.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator-liquid.png b/core/assets-raw/sprites/blocks/production/separator-liquid.png
index a87bf0b14b..8b06086201 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator-liquid.png and b/core/assets-raw/sprites/blocks/production/separator-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/production/separator.png b/core/assets-raw/sprites/blocks/production/separator.png
index 6254945930..a7896abda7 100644
Binary files a/core/assets-raw/sprites/blocks/production/separator.png and b/core/assets-raw/sprites/blocks/production/separator.png differ
diff --git a/core/assets-raw/sprites/blocks/production/silicon-smelter-top.png b/core/assets-raw/sprites/blocks/production/silicon-smelter-top.png
index f86c4d8f35..d6dcef23ef 100644
Binary files a/core/assets-raw/sprites/blocks/production/silicon-smelter-top.png and b/core/assets-raw/sprites/blocks/production/silicon-smelter-top.png differ
diff --git a/core/assets-raw/sprites/blocks/production/silicon-smelter.png b/core/assets-raw/sprites/blocks/production/silicon-smelter.png
index 1543289936..cb4d3c93d3 100644
Binary files a/core/assets-raw/sprites/blocks/production/silicon-smelter.png and b/core/assets-raw/sprites/blocks/production/silicon-smelter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/smelter.png b/core/assets-raw/sprites/blocks/production/smelter.png
index f3ff85fa19..9028c08251 100644
Binary files a/core/assets-raw/sprites/blocks/production/smelter.png and b/core/assets-raw/sprites/blocks/production/smelter.png differ
diff --git a/core/assets-raw/sprites/blocks/production/solidifer.png b/core/assets-raw/sprites/blocks/production/solidifer.png
index 1493f92864..0ed4abd7c1 100644
Binary files a/core/assets-raw/sprites/blocks/production/solidifer.png and b/core/assets-raw/sprites/blocks/production/solidifer.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-open.png b/core/assets-raw/sprites/blocks/storage/core-open.png
index dbcc4fbebc..627a4bce64 100644
Binary files a/core/assets-raw/sprites/blocks/storage/core-open.png and b/core/assets-raw/sprites/blocks/storage/core-open.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core-top.png b/core/assets-raw/sprites/blocks/storage/core-top.png
index f1d779149d..ceb1bce59e 100644
Binary files a/core/assets-raw/sprites/blocks/storage/core-top.png and b/core/assets-raw/sprites/blocks/storage/core-top.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/core.png b/core/assets-raw/sprites/blocks/storage/core.png
index 44f0512a37..959c12a291 100644
Binary files a/core/assets-raw/sprites/blocks/storage/core.png and b/core/assets-raw/sprites/blocks/storage/core.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/sortedunloader.png b/core/assets-raw/sprites/blocks/storage/sortedunloader.png
index 1845832275..8d27db0b21 100644
Binary files a/core/assets-raw/sprites/blocks/storage/sortedunloader.png and b/core/assets-raw/sprites/blocks/storage/sortedunloader.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/unloader.png b/core/assets-raw/sprites/blocks/storage/unloader.png
index 7de606ee51..776c9250f3 100644
Binary files a/core/assets-raw/sprites/blocks/storage/unloader.png and b/core/assets-raw/sprites/blocks/storage/unloader.png differ
diff --git a/core/assets-raw/sprites/blocks/storage/vault.png b/core/assets-raw/sprites/blocks/storage/vault.png
index 4bf04a80fb..5e20102b8a 100644
Binary files a/core/assets-raw/sprites/blocks/storage/vault.png and b/core/assets-raw/sprites/blocks/storage/vault.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-1-top.png b/core/assets-raw/sprites/blocks/turrets/bases/block-1-top.png
index 601189e850..3df51ef476 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-1-top.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-1-top.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-1.png b/core/assets-raw/sprites/blocks/turrets/bases/block-1.png
index 9f8b7cfa93..1d6006fd8b 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-1.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-1.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-2-top.png b/core/assets-raw/sprites/blocks/turrets/bases/block-2-top.png
index 62f631c40b..0662ec043d 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-2-top.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-2-top.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-2.png b/core/assets-raw/sprites/blocks/turrets/bases/block-2.png
index 49bef72447..a1c8e9c7d1 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-2.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-2.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-3-top.png b/core/assets-raw/sprites/blocks/turrets/bases/block-3-top.png
index c06f2803fc..01fea4f5ab 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-3-top.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-3-top.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-3.png b/core/assets-raw/sprites/blocks/turrets/bases/block-3.png
index 2a1becda62..ada915bfac 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-3.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-3.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png b/core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png
index d37d0f88bd..cfdcf71204 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-4-top.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png
index 24cae427f5..48271d4fbd 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/bases/block-4.png and b/core/assets-raw/sprites/blocks/turrets/bases/block-4.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png
index dd8046dac7..1a17590712 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png and b/core/assets-raw/sprites/blocks/turrets/turrets/arc-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/arc.png b/core/assets-raw/sprites/blocks/turrets/turrets/arc.png
index 6c083ce15f..76996f694c 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/arc.png and b/core/assets-raw/sprites/blocks/turrets/turrets/arc.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png b/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png
index 350e7c66f4..1e1cbd0cbd 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png and b/core/assets-raw/sprites/blocks/turrets/turrets/cyclone.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/duo.png b/core/assets-raw/sprites/blocks/turrets/turrets/duo.png
index 4489cd4d0a..b890290518 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/duo.png and b/core/assets-raw/sprites/blocks/turrets/turrets/duo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png b/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png
index 2a5edf540a..67d16fc9b5 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png and b/core/assets-raw/sprites/blocks/turrets/turrets/fuse.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/hail-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/hail-heat.png
index 4bec862cb6..ca1d3121d5 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/hail-heat.png and b/core/assets-raw/sprites/blocks/turrets/turrets/hail-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/hail.png b/core/assets-raw/sprites/blocks/turrets/turrets/hail.png
index 5f60ab935c..50c8864fc8 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/hail.png and b/core/assets-raw/sprites/blocks/turrets/turrets/hail.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/lancer-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/lancer-heat.png
index 28edce943f..72def3cdf6 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/lancer-heat.png and b/core/assets-raw/sprites/blocks/turrets/turrets/lancer-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/lancer.png b/core/assets-raw/sprites/blocks/turrets/turrets/lancer.png
index eb1fde9df0..a19e643bac 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/lancer.png and b/core/assets-raw/sprites/blocks/turrets/turrets/lancer.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png
index f873d676fe..e67d0b7dbd 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png and b/core/assets-raw/sprites/blocks/turrets/turrets/meltdown.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/ripple-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/ripple-heat.png
index d58f923fda..fff3a05312 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/ripple-heat.png and b/core/assets-raw/sprites/blocks/turrets/turrets/ripple-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/ripple.png b/core/assets-raw/sprites/blocks/turrets/turrets/ripple.png
index 72062b54b1..3cb1a4401a 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/ripple.png and b/core/assets-raw/sprites/blocks/turrets/turrets/ripple.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/salvo-heat.png b/core/assets-raw/sprites/blocks/turrets/turrets/salvo-heat.png
index 39a14c6daf..a13b2f90cc 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/salvo-heat.png and b/core/assets-raw/sprites/blocks/turrets/turrets/salvo-heat.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/salvo-panel-left.png b/core/assets-raw/sprites/blocks/turrets/turrets/salvo-panel-left.png
index 390e9f178b..ab4c0591a9 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/salvo-panel-left.png and b/core/assets-raw/sprites/blocks/turrets/turrets/salvo-panel-left.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/salvo-panel-right.png b/core/assets-raw/sprites/blocks/turrets/turrets/salvo-panel-right.png
index d647a16e3b..f502682627 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/salvo-panel-right.png and b/core/assets-raw/sprites/blocks/turrets/turrets/salvo-panel-right.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/salvo.png b/core/assets-raw/sprites/blocks/turrets/turrets/salvo.png
index 2264599bdc..879806dfdd 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/salvo.png and b/core/assets-raw/sprites/blocks/turrets/turrets/salvo.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/scatter.png b/core/assets-raw/sprites/blocks/turrets/turrets/scatter.png
index dbf3c6b1e3..15fc509e82 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/scatter.png and b/core/assets-raw/sprites/blocks/turrets/turrets/scatter.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/scorch-shoot.png b/core/assets-raw/sprites/blocks/turrets/turrets/scorch-shoot.png
index 4440fa71db..c72b6c2f37 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/scorch-shoot.png and b/core/assets-raw/sprites/blocks/turrets/turrets/scorch-shoot.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/scorch.png b/core/assets-raw/sprites/blocks/turrets/turrets/scorch.png
index f87936dd22..627e6ebc46 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/scorch.png and b/core/assets-raw/sprites/blocks/turrets/turrets/scorch.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/spectre.png b/core/assets-raw/sprites/blocks/turrets/turrets/spectre.png
index 056a823abc..67d16fc9b5 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/spectre.png and b/core/assets-raw/sprites/blocks/turrets/turrets/spectre.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png b/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png
index ba80299957..a5e681209d 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png and b/core/assets-raw/sprites/blocks/turrets/turrets/swarmer.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/wave-liquid.png b/core/assets-raw/sprites/blocks/turrets/turrets/wave-liquid.png
index 134e93cd0c..88568eb468 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/wave-liquid.png and b/core/assets-raw/sprites/blocks/turrets/turrets/wave-liquid.png differ
diff --git a/core/assets-raw/sprites/blocks/turrets/turrets/wave.png b/core/assets-raw/sprites/blocks/turrets/turrets/wave.png
index 83c67c389d..3fbac758f1 100644
Binary files a/core/assets-raw/sprites/blocks/turrets/turrets/wave.png and b/core/assets-raw/sprites/blocks/turrets/turrets/wave.png differ
diff --git a/core/assets-raw/sprites/blocks/units/command-center.png b/core/assets-raw/sprites/blocks/units/command-center.png
index 5896dc84ee..16d5d7f4ad 100644
Binary files a/core/assets-raw/sprites/blocks/units/command-center.png and b/core/assets-raw/sprites/blocks/units/command-center.png differ
diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png b/core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png
index 812083edcb..63a2bfc560 100644
Binary files a/core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png and b/core/assets-raw/sprites/blocks/units/dagger-pad-top-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad-top.png b/core/assets-raw/sprites/blocks/units/dagger-pad-top.png
index 5fbc8a10d5..9c85ee9b07 100644
Binary files a/core/assets-raw/sprites/blocks/units/dagger-pad-top.png and b/core/assets-raw/sprites/blocks/units/dagger-pad-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/dagger-pad.png b/core/assets-raw/sprites/blocks/units/dagger-pad.png
index f6c0760212..5f4d86aa31 100644
Binary files a/core/assets-raw/sprites/blocks/units/dagger-pad.png and b/core/assets-raw/sprites/blocks/units/dagger-pad.png differ
diff --git a/core/assets-raw/sprites/blocks/units/drone-pad-top-open.png b/core/assets-raw/sprites/blocks/units/drone-pad-top-open.png
index 25db6bb2b2..027540a97b 100644
Binary files a/core/assets-raw/sprites/blocks/units/drone-pad-top-open.png and b/core/assets-raw/sprites/blocks/units/drone-pad-top-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/drone-pad-top.png b/core/assets-raw/sprites/blocks/units/drone-pad-top.png
index 2e6562c82b..9e9b8033f8 100644
Binary files a/core/assets-raw/sprites/blocks/units/drone-pad-top.png and b/core/assets-raw/sprites/blocks/units/drone-pad-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/drone-pad.png b/core/assets-raw/sprites/blocks/units/drone-pad.png
index b703c27481..5f4d86aa31 100644
Binary files a/core/assets-raw/sprites/blocks/units/drone-pad.png and b/core/assets-raw/sprites/blocks/units/drone-pad.png differ
diff --git a/core/assets-raw/sprites/blocks/units/drop-point.png b/core/assets-raw/sprites/blocks/units/drop-point.png
index de57674e8e..f638dbcbb0 100644
Binary files a/core/assets-raw/sprites/blocks/units/drop-point.png and b/core/assets-raw/sprites/blocks/units/drop-point.png differ
diff --git a/core/assets-raw/sprites/blocks/units/fabricator-pad-top-open.png b/core/assets-raw/sprites/blocks/units/fabricator-pad-top-open.png
index 9e99b15561..b523405918 100644
Binary files a/core/assets-raw/sprites/blocks/units/fabricator-pad-top-open.png and b/core/assets-raw/sprites/blocks/units/fabricator-pad-top-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/fabricator-pad-top.png b/core/assets-raw/sprites/blocks/units/fabricator-pad-top.png
index 373223f3cc..e23e8ffa2b 100644
Binary files a/core/assets-raw/sprites/blocks/units/fabricator-pad-top.png and b/core/assets-raw/sprites/blocks/units/fabricator-pad-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/fabricator-pad.png b/core/assets-raw/sprites/blocks/units/fabricator-pad.png
index b703c27481..5f4d86aa31 100644
Binary files a/core/assets-raw/sprites/blocks/units/fabricator-pad.png and b/core/assets-raw/sprites/blocks/units/fabricator-pad.png differ
diff --git a/core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png b/core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png
index 50fc9d3746..e96a93a72c 100644
Binary files a/core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png and b/core/assets-raw/sprites/blocks/units/interceptor-pad-top-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png b/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png
index e716019aa3..91684c4970 100644
Binary files a/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png and b/core/assets-raw/sprites/blocks/units/interceptor-pad-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/interceptor-pad.png b/core/assets-raw/sprites/blocks/units/interceptor-pad.png
index 636a7900b9..5f4d86aa31 100644
Binary files a/core/assets-raw/sprites/blocks/units/interceptor-pad.png and b/core/assets-raw/sprites/blocks/units/interceptor-pad.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mech-factory.png b/core/assets-raw/sprites/blocks/units/mech-factory.png
index 5d7b07b3b7..7bcb543f2e 100644
Binary files a/core/assets-raw/sprites/blocks/units/mech-factory.png and b/core/assets-raw/sprites/blocks/units/mech-factory.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory-open.png b/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory-open.png
index 3dcbb76e63..861bb76e63 100644
Binary files a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory-open.png and b/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png
index 72edb2c28b..e806ab59dd 100644
Binary files a/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png and b/core/assets-raw/sprites/blocks/units/mechs/dart-ship-factory.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png
index 90889dc05c..3d02fc63e4 100644
Binary files a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png and b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png
index 387dd7dc0d..137514164f 100644
Binary files a/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png and b/core/assets-raw/sprites/blocks/units/mechs/delta-mech-factory.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png
index 2e3ed0c350..6d53256df7 100644
Binary files a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png and b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png
index 786be242a0..a47a925e30 100644
Binary files a/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png and b/core/assets-raw/sprites/blocks/units/mechs/javelin-ship-factory.png differ
diff --git a/core/assets-raw/sprites/blocks/units/monsoon-pad-top-open.png b/core/assets-raw/sprites/blocks/units/monsoon-pad-top-open.png
index 56cb95da79..f47586f6b6 100644
Binary files a/core/assets-raw/sprites/blocks/units/monsoon-pad-top-open.png and b/core/assets-raw/sprites/blocks/units/monsoon-pad-top-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/monsoon-pad-top.png b/core/assets-raw/sprites/blocks/units/monsoon-pad-top.png
index 13539369f0..edbff201e8 100644
Binary files a/core/assets-raw/sprites/blocks/units/monsoon-pad-top.png and b/core/assets-raw/sprites/blocks/units/monsoon-pad-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/monsoon-pad.png b/core/assets-raw/sprites/blocks/units/monsoon-pad.png
index fe6b8fa3ea..b94f078dbf 100644
Binary files a/core/assets-raw/sprites/blocks/units/monsoon-pad.png and b/core/assets-raw/sprites/blocks/units/monsoon-pad.png differ
diff --git a/core/assets-raw/sprites/blocks/units/reconstructor-open.png b/core/assets-raw/sprites/blocks/units/reconstructor-open.png
index 32527045b3..0a30025c32 100644
Binary files a/core/assets-raw/sprites/blocks/units/reconstructor-open.png and b/core/assets-raw/sprites/blocks/units/reconstructor-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/reconstructor.png b/core/assets-raw/sprites/blocks/units/reconstructor.png
index b703c27481..5f4d86aa31 100644
Binary files a/core/assets-raw/sprites/blocks/units/reconstructor.png and b/core/assets-raw/sprites/blocks/units/reconstructor.png differ
diff --git a/core/assets-raw/sprites/blocks/units/repair-point-turret.png b/core/assets-raw/sprites/blocks/units/repair-point-turret.png
index f574433e19..129de7a1b4 100644
Binary files a/core/assets-raw/sprites/blocks/units/repair-point-turret.png and b/core/assets-raw/sprites/blocks/units/repair-point-turret.png differ
diff --git a/core/assets-raw/sprites/blocks/units/repair-point.png b/core/assets-raw/sprites/blocks/units/repair-point.png
index 5a50dd76f3..b5d706aa80 100644
Binary files a/core/assets-raw/sprites/blocks/units/repair-point.png and b/core/assets-raw/sprites/blocks/units/repair-point.png differ
diff --git a/core/assets-raw/sprites/blocks/units/resupply-point.png b/core/assets-raw/sprites/blocks/units/resupply-point.png
index a69238a59e..f7571d5e96 100644
Binary files a/core/assets-raw/sprites/blocks/units/resupply-point.png and b/core/assets-raw/sprites/blocks/units/resupply-point.png differ
diff --git a/core/assets-raw/sprites/blocks/units/ship-factory.png b/core/assets-raw/sprites/blocks/units/ship-factory.png
index f662f6ba25..236bf80219 100644
Binary files a/core/assets-raw/sprites/blocks/units/ship-factory.png and b/core/assets-raw/sprites/blocks/units/ship-factory.png differ
diff --git a/core/assets-raw/sprites/blocks/units/titan-pad-top-open.png b/core/assets-raw/sprites/blocks/units/titan-pad-top-open.png
index 56cb95da79..f47586f6b6 100644
Binary files a/core/assets-raw/sprites/blocks/units/titan-pad-top-open.png and b/core/assets-raw/sprites/blocks/units/titan-pad-top-open.png differ
diff --git a/core/assets-raw/sprites/blocks/units/titan-pad-top.png b/core/assets-raw/sprites/blocks/units/titan-pad-top.png
index 13539369f0..edbff201e8 100644
Binary files a/core/assets-raw/sprites/blocks/units/titan-pad-top.png and b/core/assets-raw/sprites/blocks/units/titan-pad-top.png differ
diff --git a/core/assets-raw/sprites/blocks/units/titan-pad.png b/core/assets-raw/sprites/blocks/units/titan-pad.png
index cdc1dd92c7..eade800770 100644
Binary files a/core/assets-raw/sprites/blocks/units/titan-pad.png and b/core/assets-raw/sprites/blocks/units/titan-pad.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png b/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png
deleted file mode 100644
index 0bfb7563ce..0000000000
Binary files a/core/assets-raw/sprites/blocks/walls/carbide-wall-large.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/walls/carbide-wall.png b/core/assets-raw/sprites/blocks/walls/carbide-wall.png
deleted file mode 100644
index ba7cabf436..0000000000
Binary files a/core/assets-raw/sprites/blocks/walls/carbide-wall.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/walls/composite-wall-large.png b/core/assets-raw/sprites/blocks/walls/composite-wall-large.png
new file mode 100644
index 0000000000..3db17bbac3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/composite-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/composite-wall.png b/core/assets-raw/sprites/blocks/walls/composite-wall.png
new file mode 100644
index 0000000000..a725f20c37
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/composite-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/copper-wall-large.png b/core/assets-raw/sprites/blocks/walls/copper-wall-large.png
new file mode 100644
index 0000000000..8f8ea8cfa3
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/copper-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/copper-wall.png b/core/assets-raw/sprites/blocks/walls/copper-wall.png
new file mode 100644
index 0000000000..ebb4ef432d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/walls/copper-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/deflector-wall-large.png b/core/assets-raw/sprites/blocks/walls/deflector-wall-large.png
index 7aa89afbd9..abbce58e93 100644
Binary files a/core/assets-raw/sprites/blocks/walls/deflector-wall-large.png and b/core/assets-raw/sprites/blocks/walls/deflector-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/deflector-wall.png b/core/assets-raw/sprites/blocks/walls/deflector-wall.png
index cdb08fd654..4e234bd1d0 100644
Binary files a/core/assets-raw/sprites/blocks/walls/deflector-wall.png and b/core/assets-raw/sprites/blocks/walls/deflector-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/door-large-open.png b/core/assets-raw/sprites/blocks/walls/door-large-open.png
index d4f26329ec..f696ab8d72 100644
Binary files a/core/assets-raw/sprites/blocks/walls/door-large-open.png and b/core/assets-raw/sprites/blocks/walls/door-large-open.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/door-large.png b/core/assets-raw/sprites/blocks/walls/door-large.png
index d0a93cccbe..4f965b30f9 100644
Binary files a/core/assets-raw/sprites/blocks/walls/door-large.png and b/core/assets-raw/sprites/blocks/walls/door-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/door-open.png b/core/assets-raw/sprites/blocks/walls/door-open.png
index 0112c2cf03..43ef798df0 100644
Binary files a/core/assets-raw/sprites/blocks/walls/door-open.png and b/core/assets-raw/sprites/blocks/walls/door-open.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/door.png b/core/assets-raw/sprites/blocks/walls/door.png
index 84266f37da..59e6f05401 100644
Binary files a/core/assets-raw/sprites/blocks/walls/door.png and b/core/assets-raw/sprites/blocks/walls/door.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/phase-wall-large.png b/core/assets-raw/sprites/blocks/walls/phase-wall-large.png
index 7aa89afbd9..abbce58e93 100644
Binary files a/core/assets-raw/sprites/blocks/walls/phase-wall-large.png and b/core/assets-raw/sprites/blocks/walls/phase-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/phase-wall.png b/core/assets-raw/sprites/blocks/walls/phase-wall.png
index cdb08fd654..4e234bd1d0 100644
Binary files a/core/assets-raw/sprites/blocks/walls/phase-wall.png and b/core/assets-raw/sprites/blocks/walls/phase-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png
index ab909004d6..5993f7da90 100644
Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall-large.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/thorium-wall.png b/core/assets-raw/sprites/blocks/walls/thorium-wall.png
index 4a4e8d83c1..7dc866f4d1 100644
Binary files a/core/assets-raw/sprites/blocks/walls/thorium-wall.png and b/core/assets-raw/sprites/blocks/walls/thorium-wall.png differ
diff --git a/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png b/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png
deleted file mode 100644
index 28f37e4207..0000000000
Binary files a/core/assets-raw/sprites/blocks/walls/tungsten-wall-large.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/walls/tungsten-wall.png b/core/assets-raw/sprites/blocks/walls/tungsten-wall.png
deleted file mode 100644
index 9d0971a89a..0000000000
Binary files a/core/assets-raw/sprites/blocks/walls/tungsten-wall.png and /dev/null differ
diff --git a/core/assets-raw/sprites/effects/beam-end.png b/core/assets-raw/sprites/effects/beam-end.png
index 14bc5b24e9..d0674d380d 100644
Binary files a/core/assets-raw/sprites/effects/beam-end.png and b/core/assets-raw/sprites/effects/beam-end.png differ
diff --git a/core/assets-raw/sprites/effects/beam.png b/core/assets-raw/sprites/effects/beam.png
index d556a4cd07..327fd4b7f6 100644
Binary files a/core/assets-raw/sprites/effects/beam.png and b/core/assets-raw/sprites/effects/beam.png differ
diff --git a/core/assets-raw/sprites/effects/blank.png b/core/assets-raw/sprites/effects/blank.png
index 65099a7b1d..6e438b2f30 100644
Binary files a/core/assets-raw/sprites/effects/blank.png and b/core/assets-raw/sprites/effects/blank.png differ
diff --git a/core/assets-raw/sprites/effects/bullet-back.png b/core/assets-raw/sprites/effects/bullet-back.png
index 0e18b51a45..9e03b3ce0d 100644
Binary files a/core/assets-raw/sprites/effects/bullet-back.png and b/core/assets-raw/sprites/effects/bullet-back.png differ
diff --git a/core/assets-raw/sprites/effects/bullet.png b/core/assets-raw/sprites/effects/bullet.png
index 716f462489..5dac3bfe3c 100644
Binary files a/core/assets-raw/sprites/effects/bullet.png and b/core/assets-raw/sprites/effects/bullet.png differ
diff --git a/core/assets-raw/sprites/effects/casing.png b/core/assets-raw/sprites/effects/casing.png
index 7c46a3ccf7..2dd49226a9 100644
Binary files a/core/assets-raw/sprites/effects/casing.png and b/core/assets-raw/sprites/effects/casing.png differ
diff --git a/core/assets-raw/sprites/effects/clear.png b/core/assets-raw/sprites/effects/clear.png
index 4df27225b0..dc8beb206c 100644
Binary files a/core/assets-raw/sprites/effects/clear.png and b/core/assets-raw/sprites/effects/clear.png differ
diff --git a/core/assets-raw/sprites/effects/command-attack.png b/core/assets-raw/sprites/effects/command-attack.png
index 98d8c8ebbb..655f819338 100644
Binary files a/core/assets-raw/sprites/effects/command-attack.png and b/core/assets-raw/sprites/effects/command-attack.png differ
diff --git a/core/assets-raw/sprites/effects/command-idle.png b/core/assets-raw/sprites/effects/command-idle.png
index 4e5da45157..4271a5a321 100644
Binary files a/core/assets-raw/sprites/effects/command-idle.png and b/core/assets-raw/sprites/effects/command-idle.png differ
diff --git a/core/assets-raw/sprites/effects/command-retreat.png b/core/assets-raw/sprites/effects/command-retreat.png
index fc1aec99f2..f40dcfe5cf 100644
Binary files a/core/assets-raw/sprites/effects/command-retreat.png and b/core/assets-raw/sprites/effects/command-retreat.png differ
diff --git a/core/assets-raw/sprites/effects/enemyarrow.png b/core/assets-raw/sprites/effects/enemyarrow.png
index 04e4f069be..d31e365701 100644
Binary files a/core/assets-raw/sprites/effects/enemyarrow.png and b/core/assets-raw/sprites/effects/enemyarrow.png differ
diff --git a/core/assets-raw/sprites/effects/error.png b/core/assets-raw/sprites/effects/error.png
index 0da635889b..1f7efdb692 100644
Binary files a/core/assets-raw/sprites/effects/error.png and b/core/assets-raw/sprites/effects/error.png differ
diff --git a/core/assets-raw/sprites/effects/laser-end.png b/core/assets-raw/sprites/effects/laser-end.png
index d678fb0a81..7c109d16dd 100644
Binary files a/core/assets-raw/sprites/effects/laser-end.png and b/core/assets-raw/sprites/effects/laser-end.png differ
diff --git a/core/assets-raw/sprites/effects/laser.png b/core/assets-raw/sprites/effects/laser.png
index 4b23a386ca..eba798c01e 100644
Binary files a/core/assets-raw/sprites/effects/laser.png and b/core/assets-raw/sprites/effects/laser.png differ
diff --git a/core/assets-raw/sprites/effects/laserfull.png b/core/assets-raw/sprites/effects/laserfull.png
index 9ea6687b8f..fab831c1c4 100644
Binary files a/core/assets-raw/sprites/effects/laserfull.png and b/core/assets-raw/sprites/effects/laserfull.png differ
diff --git a/core/assets-raw/sprites/effects/minelaser-end.png b/core/assets-raw/sprites/effects/minelaser-end.png
index 7bfed103d6..8a04ee1a6d 100644
Binary files a/core/assets-raw/sprites/effects/minelaser-end.png and b/core/assets-raw/sprites/effects/minelaser-end.png differ
diff --git a/core/assets-raw/sprites/effects/minelaser.png b/core/assets-raw/sprites/effects/minelaser.png
index b6c990e21e..956e4d2311 100644
Binary files a/core/assets-raw/sprites/effects/minelaser.png and b/core/assets-raw/sprites/effects/minelaser.png differ
diff --git a/core/assets-raw/sprites/effects/missile-back.png b/core/assets-raw/sprites/effects/missile-back.png
index 2f0676e058..d0c3073a06 100644
Binary files a/core/assets-raw/sprites/effects/missile-back.png and b/core/assets-raw/sprites/effects/missile-back.png differ
diff --git a/core/assets-raw/sprites/effects/missile.png b/core/assets-raw/sprites/effects/missile.png
index de5f1f0b17..32e5dc39bb 100644
Binary files a/core/assets-raw/sprites/effects/missile.png and b/core/assets-raw/sprites/effects/missile.png differ
diff --git a/core/assets-raw/sprites/effects/scorch1.png b/core/assets-raw/sprites/effects/scorch1.png
index 70f74ca624..375a7c6dbe 100644
Binary files a/core/assets-raw/sprites/effects/scorch1.png and b/core/assets-raw/sprites/effects/scorch1.png differ
diff --git a/core/assets-raw/sprites/effects/scorch2.png b/core/assets-raw/sprites/effects/scorch2.png
index 696f77a9f1..5c78d8dfbc 100644
Binary files a/core/assets-raw/sprites/effects/scorch2.png and b/core/assets-raw/sprites/effects/scorch2.png differ
diff --git a/core/assets-raw/sprites/effects/scorch3.png b/core/assets-raw/sprites/effects/scorch3.png
index 76725325de..a1a70104ac 100644
Binary files a/core/assets-raw/sprites/effects/scorch3.png and b/core/assets-raw/sprites/effects/scorch3.png differ
diff --git a/core/assets-raw/sprites/effects/scorch4.png b/core/assets-raw/sprites/effects/scorch4.png
index 908ac88324..e2593370cf 100644
Binary files a/core/assets-raw/sprites/effects/scorch4.png and b/core/assets-raw/sprites/effects/scorch4.png differ
diff --git a/core/assets-raw/sprites/effects/scorch5.png b/core/assets-raw/sprites/effects/scorch5.png
index 09bc0c4a01..139e235165 100644
Binary files a/core/assets-raw/sprites/effects/scorch5.png and b/core/assets-raw/sprites/effects/scorch5.png differ
diff --git a/core/assets-raw/sprites/effects/shell-back.png b/core/assets-raw/sprites/effects/shell-back.png
index 2e01159935..b9118fa180 100644
Binary files a/core/assets-raw/sprites/effects/shell-back.png and b/core/assets-raw/sprites/effects/shell-back.png differ
diff --git a/core/assets-raw/sprites/effects/shell.png b/core/assets-raw/sprites/effects/shell.png
index ade07f9fc8..ec93fe363d 100644
Binary files a/core/assets-raw/sprites/effects/shell.png and b/core/assets-raw/sprites/effects/shell.png differ
diff --git a/core/assets-raw/sprites/effects/shot.png b/core/assets-raw/sprites/effects/shot.png
index 133c78b5f5..2cd4b51d23 100644
Binary files a/core/assets-raw/sprites/effects/shot.png and b/core/assets-raw/sprites/effects/shot.png differ
diff --git a/core/assets-raw/sprites/effects/transfer-arrow.png b/core/assets-raw/sprites/effects/transfer-arrow.png
index 3f284bd32f..1dae96753b 100644
Binary files a/core/assets-raw/sprites/effects/transfer-arrow.png and b/core/assets-raw/sprites/effects/transfer-arrow.png differ
diff --git a/core/assets-raw/sprites/effects/transfer-end.png b/core/assets-raw/sprites/effects/transfer-end.png
index cc5ced07aa..1a9d615185 100644
Binary files a/core/assets-raw/sprites/effects/transfer-end.png and b/core/assets-raw/sprites/effects/transfer-end.png differ
diff --git a/core/assets-raw/sprites/effects/transfer.png b/core/assets-raw/sprites/effects/transfer.png
index e6ed599706..53910cc90d 100644
Binary files a/core/assets-raw/sprites/effects/transfer.png and b/core/assets-raw/sprites/effects/transfer.png differ
diff --git a/core/assets-raw/sprites/items/item-biomatter.png b/core/assets-raw/sprites/items/item-biomatter.png
index 58aeaaad59..ac2580d8e2 100644
Binary files a/core/assets-raw/sprites/items/item-biomatter.png and b/core/assets-raw/sprites/items/item-biomatter.png differ
diff --git a/core/assets-raw/sprites/items/item-blast-compound.png b/core/assets-raw/sprites/items/item-blast-compound.png
index eda970bf5c..ec2b818853 100644
Binary files a/core/assets-raw/sprites/items/item-blast-compound.png and b/core/assets-raw/sprites/items/item-blast-compound.png differ
diff --git a/core/assets-raw/sprites/items/item-carbide.png b/core/assets-raw/sprites/items/item-carbide.png
deleted file mode 100644
index 44e95c280e..0000000000
Binary files a/core/assets-raw/sprites/items/item-carbide.png and /dev/null differ
diff --git a/core/assets-raw/sprites/items/item-coal.png b/core/assets-raw/sprites/items/item-coal.png
index 1da1774788..0c094a7436 100644
Binary files a/core/assets-raw/sprites/items/item-coal.png and b/core/assets-raw/sprites/items/item-coal.png differ
diff --git a/core/assets-raw/sprites/items/item-copper.png b/core/assets-raw/sprites/items/item-copper.png
new file mode 100644
index 0000000000..1d62eeba29
Binary files /dev/null and b/core/assets-raw/sprites/items/item-copper.png differ
diff --git a/core/assets-raw/sprites/items/item-dense-alloy.png b/core/assets-raw/sprites/items/item-dense-alloy.png
new file mode 100644
index 0000000000..84831fe96c
Binary files /dev/null and b/core/assets-raw/sprites/items/item-dense-alloy.png differ
diff --git a/core/assets-raw/sprites/items/item-lead.png b/core/assets-raw/sprites/items/item-lead.png
index e0bb050697..45ad28106b 100644
Binary files a/core/assets-raw/sprites/items/item-lead.png and b/core/assets-raw/sprites/items/item-lead.png differ
diff --git a/core/assets-raw/sprites/items/item-phase-matter.png b/core/assets-raw/sprites/items/item-phase-matter.png
index fcacd1e8d2..a0c016a8b0 100644
Binary files a/core/assets-raw/sprites/items/item-phase-matter.png and b/core/assets-raw/sprites/items/item-phase-matter.png differ
diff --git a/core/assets-raw/sprites/items/item-plastanium.png b/core/assets-raw/sprites/items/item-plastanium.png
index 81fffc80c0..58dc9afc65 100644
Binary files a/core/assets-raw/sprites/items/item-plastanium.png and b/core/assets-raw/sprites/items/item-plastanium.png differ
diff --git a/core/assets-raw/sprites/items/item-pyratite.png b/core/assets-raw/sprites/items/item-pyratite.png
index 81a89836e6..ac6370a732 100644
Binary files a/core/assets-raw/sprites/items/item-pyratite.png and b/core/assets-raw/sprites/items/item-pyratite.png differ
diff --git a/core/assets-raw/sprites/items/item-sand.png b/core/assets-raw/sprites/items/item-sand.png
index 57a5be0aad..0995dacdf3 100644
Binary files a/core/assets-raw/sprites/items/item-sand.png and b/core/assets-raw/sprites/items/item-sand.png differ
diff --git a/core/assets-raw/sprites/items/item-silicon.png b/core/assets-raw/sprites/items/item-silicon.png
index 348ddd4a55..24f7d495cf 100644
Binary files a/core/assets-raw/sprites/items/item-silicon.png and b/core/assets-raw/sprites/items/item-silicon.png differ
diff --git a/core/assets-raw/sprites/items/item-stone.png b/core/assets-raw/sprites/items/item-stone.png
index 3eabbf1cec..20fcd1b4c7 100644
Binary files a/core/assets-raw/sprites/items/item-stone.png and b/core/assets-raw/sprites/items/item-stone.png differ
diff --git a/core/assets-raw/sprites/items/item-surge-alloy.png b/core/assets-raw/sprites/items/item-surge-alloy.png
index db7d97a9e7..67b185b7f9 100644
Binary files a/core/assets-raw/sprites/items/item-surge-alloy.png and b/core/assets-raw/sprites/items/item-surge-alloy.png differ
diff --git a/core/assets-raw/sprites/items/item-thorium.png b/core/assets-raw/sprites/items/item-thorium.png
index 3f4bc57bfe..02b6b71305 100644
Binary files a/core/assets-raw/sprites/items/item-thorium.png and b/core/assets-raw/sprites/items/item-thorium.png differ
diff --git a/core/assets-raw/sprites/items/item-titanium.png b/core/assets-raw/sprites/items/item-titanium.png
index de982e6445..e4250fea1b 100644
Binary files a/core/assets-raw/sprites/items/item-titanium.png and b/core/assets-raw/sprites/items/item-titanium.png differ
diff --git a/core/assets-raw/sprites/items/item-tungsten.png b/core/assets-raw/sprites/items/item-tungsten.png
deleted file mode 100644
index f6af84f404..0000000000
Binary files a/core/assets-raw/sprites/items/item-tungsten.png and /dev/null differ
diff --git a/core/assets-raw/sprites/items/liquid-icon.png b/core/assets-raw/sprites/items/liquid-icon.png
index 642517ce48..e4a367b63b 100644
Binary files a/core/assets-raw/sprites/items/liquid-icon.png and b/core/assets-raw/sprites/items/liquid-icon.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png
index 50cd656428..277d848d8f 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech-base.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png
index 7204dda0a7..d25325c6bc 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech-leg.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png
index 8d895faf1e..41cad964be 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png b/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png
index 50cd656428..277d848d8f 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech-base.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png
index 7181a138d6..2cdfd02fc6 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech-leg.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech.png b/core/assets-raw/sprites/mechs/mechs/delta-mech.png
index 20ddec3a99..08f034e2ca 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png
index 50cd656428..277d848d8f 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech-base.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png
index 7204dda0a7..d25325c6bc 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech-leg.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech.png b/core/assets-raw/sprites/mechs/mechs/omega-mech.png
index c982a0893b..039c8834b8 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png b/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png
index 50cd656428..277d848d8f 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech-base.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png b/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png
index 7204dda0a7..d25325c6bc 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech-leg.png differ
diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech.png b/core/assets-raw/sprites/mechs/mechs/tau-mech.png
index c982a0893b..039c8834b8 100644
Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech.png differ
diff --git a/core/assets-raw/sprites/mechs/ships/dart-ship.png b/core/assets-raw/sprites/mechs/ships/dart-ship.png
index 6e4993776a..2f67113ab2 100644
Binary files a/core/assets-raw/sprites/mechs/ships/dart-ship.png and b/core/assets-raw/sprites/mechs/ships/dart-ship.png differ
diff --git a/core/assets-raw/sprites/mechs/ships/halberd-ship.png b/core/assets-raw/sprites/mechs/ships/halberd-ship.png
index d0d0dd52ec..f279921242 100644
Binary files a/core/assets-raw/sprites/mechs/ships/halberd-ship.png and b/core/assets-raw/sprites/mechs/ships/halberd-ship.png differ
diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship.png b/core/assets-raw/sprites/mechs/ships/javelin-ship.png
index 2f0f7a7e11..a2f8a2d3e3 100644
Binary files a/core/assets-raw/sprites/mechs/ships/javelin-ship.png and b/core/assets-raw/sprites/mechs/ships/javelin-ship.png differ
diff --git a/core/assets-raw/sprites/mechs/ships/trident-ship.png b/core/assets-raw/sprites/mechs/ships/trident-ship.png
index d0d0dd52ec..f279921242 100644
Binary files a/core/assets-raw/sprites/mechs/ships/trident-ship.png and b/core/assets-raw/sprites/mechs/ships/trident-ship.png differ
diff --git a/core/assets-raw/sprites/shapes/circle.png b/core/assets-raw/sprites/shapes/circle.png
index 52a2d983f8..459e48082a 100644
Binary files a/core/assets-raw/sprites/shapes/circle.png and b/core/assets-raw/sprites/shapes/circle.png differ
diff --git a/core/assets-raw/sprites/shapes/shape-3.png b/core/assets-raw/sprites/shapes/shape-3.png
index db75ca9349..358facf7db 100644
Binary files a/core/assets-raw/sprites/shapes/shape-3.png and b/core/assets-raw/sprites/shapes/shape-3.png differ
diff --git a/core/assets-raw/sprites/shapes/shape-4.png b/core/assets-raw/sprites/shapes/shape-4.png
index 427aa33835..aaa6f23054 100644
Binary files a/core/assets-raw/sprites/shapes/shape-4.png and b/core/assets-raw/sprites/shapes/shape-4.png differ
diff --git a/core/assets-raw/sprites/shapes/shape-5.png b/core/assets-raw/sprites/shapes/shape-5.png
index 34873c6ccb..9177493d46 100644
Binary files a/core/assets-raw/sprites/shapes/shape-5.png and b/core/assets-raw/sprites/shapes/shape-5.png differ
diff --git a/core/assets-raw/sprites/shapes/shape-6.png b/core/assets-raw/sprites/shapes/shape-6.png
index 70a6bf4c9a..696f37e998 100644
Binary files a/core/assets-raw/sprites/shapes/shape-6.png and b/core/assets-raw/sprites/shapes/shape-6.png differ
diff --git a/core/assets-raw/sprites/shapes/shape-7.png b/core/assets-raw/sprites/shapes/shape-7.png
index b1d4298b34..7fa595765a 100644
Binary files a/core/assets-raw/sprites/shapes/shape-7.png and b/core/assets-raw/sprites/shapes/shape-7.png differ
diff --git a/core/assets-raw/sprites/ui/border.9.png b/core/assets-raw/sprites/ui/border.9.png
index 7987b86920..49417e1eca 100644
Binary files a/core/assets-raw/sprites/ui/border.9.png and b/core/assets-raw/sprites/ui/border.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-down.9.png b/core/assets-raw/sprites/ui/button-down.9.png
index 771f74cee4..1af404c087 100644
Binary files a/core/assets-raw/sprites/ui/button-down.9.png and b/core/assets-raw/sprites/ui/button-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-map-down.9.png b/core/assets-raw/sprites/ui/button-map-down.9.png
index 00441b4c4c..41478c08a4 100644
Binary files a/core/assets-raw/sprites/ui/button-map-down.9.png and b/core/assets-raw/sprites/ui/button-map-down.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-map-over.9.png b/core/assets-raw/sprites/ui/button-map-over.9.png
index afd0581f73..41478c08a4 100644
Binary files a/core/assets-raw/sprites/ui/button-map-over.9.png and b/core/assets-raw/sprites/ui/button-map-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-map.9.png b/core/assets-raw/sprites/ui/button-map.9.png
index 06ab4f2546..2617819007 100644
Binary files a/core/assets-raw/sprites/ui/button-map.9.png and b/core/assets-raw/sprites/ui/button-map.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-over.9.png b/core/assets-raw/sprites/ui/button-over.9.png
index 4f979ec719..1af404c087 100644
Binary files a/core/assets-raw/sprites/ui/button-over.9.png and b/core/assets-raw/sprites/ui/button-over.9.png differ
diff --git a/core/assets-raw/sprites/ui/button-select.9.png b/core/assets-raw/sprites/ui/button-select.9.png
index 21fe14ac54..1a058ad31a 100644
Binary files a/core/assets-raw/sprites/ui/button-select.9.png and b/core/assets-raw/sprites/ui/button-select.9.png differ
diff --git a/core/assets-raw/sprites/ui/button.9.png b/core/assets-raw/sprites/ui/button.9.png
index f20f95b827..d27ab20c12 100644
Binary files a/core/assets-raw/sprites/ui/button.9.png and b/core/assets-raw/sprites/ui/button.9.png differ
diff --git a/core/assets-raw/sprites/ui/check-off.png b/core/assets-raw/sprites/ui/check-off.png
index d73a1a6e1f..b5f0e770c1 100644
Binary files a/core/assets-raw/sprites/ui/check-off.png and b/core/assets-raw/sprites/ui/check-off.png differ
diff --git a/core/assets-raw/sprites/ui/check-on-over.png b/core/assets-raw/sprites/ui/check-on-over.png
index 710e173506..4d129d250f 100644
Binary files a/core/assets-raw/sprites/ui/check-on-over.png and b/core/assets-raw/sprites/ui/check-on-over.png differ
diff --git a/core/assets-raw/sprites/ui/check-on.png b/core/assets-raw/sprites/ui/check-on.png
index a067b42e28..38747ac958 100644
Binary files a/core/assets-raw/sprites/ui/check-on.png and b/core/assets-raw/sprites/ui/check-on.png differ
diff --git a/core/assets-raw/sprites/ui/check-over.png b/core/assets-raw/sprites/ui/check-over.png
index 812f0c222e..7ec12243bc 100644
Binary files a/core/assets-raw/sprites/ui/check-over.png and b/core/assets-raw/sprites/ui/check-over.png differ
diff --git a/core/assets-raw/sprites/ui/clear.png b/core/assets-raw/sprites/ui/clear.png
index a38cc5d663..9e1edf5b13 100644
Binary files a/core/assets-raw/sprites/ui/clear.png and b/core/assets-raw/sprites/ui/clear.png differ
diff --git a/core/assets-raw/sprites/ui/cursor.png b/core/assets-raw/sprites/ui/cursor.png
index 67ff25cb9a..83efefe2b3 100644
Binary files a/core/assets-raw/sprites/ui/cursor.png and b/core/assets-raw/sprites/ui/cursor.png differ
diff --git a/core/assets-raw/sprites/ui/discord-banner-over.png b/core/assets-raw/sprites/ui/discord-banner-over.png
index 87a8ab0504..6203acdb8a 100644
Binary files a/core/assets-raw/sprites/ui/discord-banner-over.png and b/core/assets-raw/sprites/ui/discord-banner-over.png differ
diff --git a/core/assets-raw/sprites/ui/discord-banner.png b/core/assets-raw/sprites/ui/discord-banner.png
index 39248244a8..6203acdb8a 100644
Binary files a/core/assets-raw/sprites/ui/discord-banner.png and b/core/assets-raw/sprites/ui/discord-banner.png differ
diff --git a/core/assets-raw/sprites/ui/icons/controller-cursor.png b/core/assets-raw/sprites/ui/icons/controller-cursor.png
index 0fed7f4245..061fc5b62a 100644
Binary files a/core/assets-raw/sprites/ui/icons/controller-cursor.png and b/core/assets-raw/sprites/ui/icons/controller-cursor.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-about.png b/core/assets-raw/sprites/ui/icons/icon-about.png
index 1b03a29a2c..3943975b97 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-about.png and b/core/assets-raw/sprites/ui/icons/icon-about.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-add.png b/core/assets-raw/sprites/ui/icons/icon-add.png
index eb325782ec..2cee82e07d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-add.png and b/core/assets-raw/sprites/ui/icons/icon-add.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-admin-small.png b/core/assets-raw/sprites/ui/icons/icon-admin-small.png
index c5cf9ef819..6a2afe9e24 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-admin-small.png and b/core/assets-raw/sprites/ui/icons/icon-admin-small.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-admin.png b/core/assets-raw/sprites/ui/icons/icon-admin.png
index 3d3811462a..2af8d3eca6 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-admin.png and b/core/assets-raw/sprites/ui/icons/icon-admin.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-areaDelete.png b/core/assets-raw/sprites/ui/icons/icon-areaDelete.png
index 97b95ea94f..e9341daca0 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-areaDelete.png and b/core/assets-raw/sprites/ui/icons/icon-areaDelete.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-arrow-16.png b/core/assets-raw/sprites/ui/icons/icon-arrow-16.png
index 227ea56fdb..954b1995fd 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-arrow-16.png and b/core/assets-raw/sprites/ui/icons/icon-arrow-16.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-arrow-down.png b/core/assets-raw/sprites/ui/icons/icon-arrow-down.png
index b6403714ec..bf9e1ff860 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-arrow-down.png and b/core/assets-raw/sprites/ui/icons/icon-arrow-down.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-arrow-left.png b/core/assets-raw/sprites/ui/icons/icon-arrow-left.png
index ceac5c958a..15678f32b1 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-arrow-left.png and b/core/assets-raw/sprites/ui/icons/icon-arrow-left.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-arrow-right.png b/core/assets-raw/sprites/ui/icons/icon-arrow-right.png
index 23fd286809..b09556172d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-arrow-right.png and b/core/assets-raw/sprites/ui/icons/icon-arrow-right.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-arrow-up.png b/core/assets-raw/sprites/ui/icons/icon-arrow-up.png
index ebf5bab7c6..8a7546126d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-arrow-up.png and b/core/assets-raw/sprites/ui/icons/icon-arrow-up.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-arrow.png b/core/assets-raw/sprites/ui/icons/icon-arrow.png
index 227ea56fdb..954b1995fd 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-arrow.png and b/core/assets-raw/sprites/ui/icons/icon-arrow.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-back.png b/core/assets-raw/sprites/ui/icons/icon-back.png
index be3d74fd80..ef470961d6 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-back.png and b/core/assets-raw/sprites/ui/icons/icon-back.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-ban.png b/core/assets-raw/sprites/ui/icons/icon-ban.png
index f8df32c20c..1ee4a5c3bf 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-ban.png and b/core/assets-raw/sprites/ui/icons/icon-ban.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-break.png b/core/assets-raw/sprites/ui/icons/icon-break.png
index 8f20326533..c4b079735c 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-break.png and b/core/assets-raw/sprites/ui/icons/icon-break.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-cancel.png b/core/assets-raw/sprites/ui/icons/icon-cancel.png
index 2e9914525b..03ea12174f 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-cancel.png and b/core/assets-raw/sprites/ui/icons/icon-cancel.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-chat.png b/core/assets-raw/sprites/ui/icons/icon-chat.png
index b7c02421aa..85f52fa41c 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-chat.png and b/core/assets-raw/sprites/ui/icons/icon-chat.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-check.png b/core/assets-raw/sprites/ui/icons/icon-check.png
index eb282e25ee..1617c299c5 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-check.png and b/core/assets-raw/sprites/ui/icons/icon-check.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-crafting.png b/core/assets-raw/sprites/ui/icons/icon-crafting.png
index 0e156c60c9..2a20c39b0b 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-crafting.png and b/core/assets-raw/sprites/ui/icons/icon-crafting.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-cursor.png b/core/assets-raw/sprites/ui/icons/icon-cursor.png
index 7f8d2c80d8..1025a08a9e 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-cursor.png and b/core/assets-raw/sprites/ui/icons/icon-cursor.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-defense.png b/core/assets-raw/sprites/ui/icons/icon-defense.png
index f807b78001..6e440a647a 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-defense.png and b/core/assets-raw/sprites/ui/icons/icon-defense.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-dev-builds.png b/core/assets-raw/sprites/ui/icons/icon-dev-builds.png
index f845d619d4..7edafcb7c0 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-dev-builds.png and b/core/assets-raw/sprites/ui/icons/icon-dev-builds.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-discord.png b/core/assets-raw/sprites/ui/icons/icon-discord.png
index 9451cfa1a2..76bc4c8c43 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-discord.png and b/core/assets-raw/sprites/ui/icons/icon-discord.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-distribution.png b/core/assets-raw/sprites/ui/icons/icon-distribution.png
index 0c1ea5112e..858ba9bd3f 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-distribution.png and b/core/assets-raw/sprites/ui/icons/icon-distribution.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-donate.png b/core/assets-raw/sprites/ui/icons/icon-donate.png
index ea5c95a660..5c762f79d0 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-donate.png and b/core/assets-raw/sprites/ui/icons/icon-donate.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-dots.png b/core/assets-raw/sprites/ui/icons/icon-dots.png
index 8b597e0dd4..a8d656d6cc 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-dots.png and b/core/assets-raw/sprites/ui/icons/icon-dots.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-editor.png b/core/assets-raw/sprites/ui/icons/icon-editor.png
index 4e25b087a0..bbfabe4141 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-editor.png and b/core/assets-raw/sprites/ui/icons/icon-editor.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-egg.png b/core/assets-raw/sprites/ui/icons/icon-egg.png
index 9f00eb61cd..11f2155605 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-egg.png and b/core/assets-raw/sprites/ui/icons/icon-egg.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-elevation.png b/core/assets-raw/sprites/ui/icons/icon-elevation.png
index b484f8093d..cbc30c8cc1 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-elevation.png and b/core/assets-raw/sprites/ui/icons/icon-elevation.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-eraser.png b/core/assets-raw/sprites/ui/icons/icon-eraser.png
index 76b43c4887..00ba36cc37 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-eraser.png and b/core/assets-raw/sprites/ui/icons/icon-eraser.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-exit.png b/core/assets-raw/sprites/ui/icons/icon-exit.png
index 13d45d242f..fe1de5d9e4 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-exit.png and b/core/assets-raw/sprites/ui/icons/icon-exit.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-file-image.png b/core/assets-raw/sprites/ui/icons/icon-file-image.png
index a16c5170a7..254ea95f3d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-file-image.png and b/core/assets-raw/sprites/ui/icons/icon-file-image.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-file-text.png b/core/assets-raw/sprites/ui/icons/icon-file-text.png
old mode 100755
new mode 100644
index 3aea932bbb..41b4fbc342
Binary files a/core/assets-raw/sprites/ui/icons/icon-file-text.png and b/core/assets-raw/sprites/ui/icons/icon-file-text.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-file.png b/core/assets-raw/sprites/ui/icons/icon-file.png
index f91d5a46a7..0f41e17cbf 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-file.png and b/core/assets-raw/sprites/ui/icons/icon-file.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-fill.png b/core/assets-raw/sprites/ui/icons/icon-fill.png
old mode 100755
new mode 100644
index 027b395162..79bc8b2c39
Binary files a/core/assets-raw/sprites/ui/icons/icon-fill.png and b/core/assets-raw/sprites/ui/icons/icon-fill.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-floppy-16.png b/core/assets-raw/sprites/ui/icons/icon-floppy-16.png
index 7993fad275..6fd3f90850 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-floppy-16.png and b/core/assets-raw/sprites/ui/icons/icon-floppy-16.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-floppy.png b/core/assets-raw/sprites/ui/icons/icon-floppy.png
index 8455ee3b44..e8ba657ab7 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-floppy.png and b/core/assets-raw/sprites/ui/icons/icon-floppy.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-folder-parent.png b/core/assets-raw/sprites/ui/icons/icon-folder-parent.png
old mode 100755
new mode 100644
index 82b70ca831..160f2be902
Binary files a/core/assets-raw/sprites/ui/icons/icon-folder-parent.png and b/core/assets-raw/sprites/ui/icons/icon-folder-parent.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-folder.png b/core/assets-raw/sprites/ui/icons/icon-folder.png
old mode 100755
new mode 100644
index 6d9471196b..c55313ef32
Binary files a/core/assets-raw/sprites/ui/icons/icon-folder.png and b/core/assets-raw/sprites/ui/icons/icon-folder.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-generated.png b/core/assets-raw/sprites/ui/icons/icon-generated.png
index 15a0d6051e..f8630b8242 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-generated.png and b/core/assets-raw/sprites/ui/icons/icon-generated.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-github.png b/core/assets-raw/sprites/ui/icons/icon-github.png
index 4eebcb7ec4..dafadb05fb 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-github.png and b/core/assets-raw/sprites/ui/icons/icon-github.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-google-play.png b/core/assets-raw/sprites/ui/icons/icon-google-play.png
index 944fd50253..b42f628d31 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-google-play.png and b/core/assets-raw/sprites/ui/icons/icon-google-play.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-grid.png b/core/assets-raw/sprites/ui/icons/icon-grid.png
old mode 100755
new mode 100644
index 6e6506ec39..5427571a16
Binary files a/core/assets-raw/sprites/ui/icons/icon-grid.png and b/core/assets-raw/sprites/ui/icons/icon-grid.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-hold.png b/core/assets-raw/sprites/ui/icons/icon-hold.png
index 43e6c78ba1..fc40846ebe 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-hold.png and b/core/assets-raw/sprites/ui/icons/icon-hold.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-holdDelete.png b/core/assets-raw/sprites/ui/icons/icon-holdDelete.png
index ea2f55b269..56c2aff291 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-holdDelete.png and b/core/assets-raw/sprites/ui/icons/icon-holdDelete.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-home.png b/core/assets-raw/sprites/ui/icons/icon-home.png
old mode 100755
new mode 100644
index 087443880f..b97dba2a11
Binary files a/core/assets-raw/sprites/ui/icons/icon-home.png and b/core/assets-raw/sprites/ui/icons/icon-home.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-host.png b/core/assets-raw/sprites/ui/icons/icon-host.png
index 82d5d2d153..6253c986bd 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-host.png and b/core/assets-raw/sprites/ui/icons/icon-host.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-info.png b/core/assets-raw/sprites/ui/icons/icon-info.png
index 759a89dbdb..d3af92f26d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-info.png and b/core/assets-raw/sprites/ui/icons/icon-info.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-itch.io.png b/core/assets-raw/sprites/ui/icons/icon-itch.io.png
index 0bf3a6e71c..4cf4b3cfe6 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-itch.io.png and b/core/assets-raw/sprites/ui/icons/icon-itch.io.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-item.png b/core/assets-raw/sprites/ui/icons/icon-item.png
index 0e99951b81..9dd6da2249 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-item.png and b/core/assets-raw/sprites/ui/icons/icon-item.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-items-none.png b/core/assets-raw/sprites/ui/icons/icon-items-none.png
index 3bfe694cda..b90595d9ee 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-items-none.png and b/core/assets-raw/sprites/ui/icons/icon-items-none.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-line.png b/core/assets-raw/sprites/ui/icons/icon-line.png
index faeb0de7ea..5ce2cfdc78 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-line.png and b/core/assets-raw/sprites/ui/icons/icon-line.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-link.png b/core/assets-raw/sprites/ui/icons/icon-link.png
index 3a0e25bf29..71446afcc0 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-link.png and b/core/assets-raw/sprites/ui/icons/icon-link.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-liquid.png b/core/assets-raw/sprites/ui/icons/icon-liquid.png
index 8511bad640..48c93ed9d2 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-liquid.png and b/core/assets-raw/sprites/ui/icons/icon-liquid.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-load-image.png b/core/assets-raw/sprites/ui/icons/icon-load-image.png
index f20d4a01ed..88a162b628 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-load-image.png and b/core/assets-raw/sprites/ui/icons/icon-load-image.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-load-map.png b/core/assets-raw/sprites/ui/icons/icon-load-map.png
index 336b5efe20..4aa244ab7c 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-load-map.png and b/core/assets-raw/sprites/ui/icons/icon-load-map.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-load.png b/core/assets-raw/sprites/ui/icons/icon-load.png
index 00e35485aa..ecbd0c08cf 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-load.png and b/core/assets-raw/sprites/ui/icons/icon-load.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-loading.png b/core/assets-raw/sprites/ui/icons/icon-loading.png
index d53ace4c51..b857848f9a 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-loading.png and b/core/assets-raw/sprites/ui/icons/icon-loading.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-locked.png b/core/assets-raw/sprites/ui/icons/icon-locked.png
index d87ab09c83..c76abf6346 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-locked.png and b/core/assets-raw/sprites/ui/icons/icon-locked.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-logic.png b/core/assets-raw/sprites/ui/icons/icon-logic.png
index 8e299e06d7..8ad3313701 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-logic.png and b/core/assets-raw/sprites/ui/icons/icon-logic.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-map.png b/core/assets-raw/sprites/ui/icons/icon-map.png
index a3aa72fe12..8891e80a71 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-map.png and b/core/assets-raw/sprites/ui/icons/icon-map.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-menu-large.png b/core/assets-raw/sprites/ui/icons/icon-menu-large.png
index e21d31376c..36175b9942 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-menu-large.png and b/core/assets-raw/sprites/ui/icons/icon-menu-large.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-menu.png b/core/assets-raw/sprites/ui/icons/icon-menu.png
index e244e9f819..0469f99721 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-menu.png and b/core/assets-raw/sprites/ui/icons/icon-menu.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-missing.png b/core/assets-raw/sprites/ui/icons/icon-missing.png
index fcae107678..6a9c5d9012 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-missing.png and b/core/assets-raw/sprites/ui/icons/icon-missing.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-none.png b/core/assets-raw/sprites/ui/icons/icon-none.png
index 427d8006d9..fcf22bc9da 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-none.png and b/core/assets-raw/sprites/ui/icons/icon-none.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-nullitem.png b/core/assets-raw/sprites/ui/icons/icon-nullitem.png
index a15ef92d0c..1897820730 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-nullitem.png and b/core/assets-raw/sprites/ui/icons/icon-nullitem.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-pause.png b/core/assets-raw/sprites/ui/icons/icon-pause.png
index a87060e0b3..7471836eaa 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-pause.png and b/core/assets-raw/sprites/ui/icons/icon-pause.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-pencil-small.png b/core/assets-raw/sprites/ui/icons/icon-pencil-small.png
index fad56e9439..71a25add80 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-pencil-small.png and b/core/assets-raw/sprites/ui/icons/icon-pencil-small.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-pencil.png b/core/assets-raw/sprites/ui/icons/icon-pencil.png
old mode 100755
new mode 100644
index da2f01f479..448e3ef02b
Binary files a/core/assets-raw/sprites/ui/icons/icon-pencil.png and b/core/assets-raw/sprites/ui/icons/icon-pencil.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-pick.png b/core/assets-raw/sprites/ui/icons/icon-pick.png
old mode 100755
new mode 100644
index 05090f51a5..e833f22561
Binary files a/core/assets-raw/sprites/ui/icons/icon-pick.png and b/core/assets-raw/sprites/ui/icons/icon-pick.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-play-2.png b/core/assets-raw/sprites/ui/icons/icon-play-2.png
index 8a4295d1f9..c001e60b04 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-play-2.png and b/core/assets-raw/sprites/ui/icons/icon-play-2.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-play.png b/core/assets-raw/sprites/ui/icons/icon-play.png
index 7d0cb2d206..8530e6b09d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-play.png and b/core/assets-raw/sprites/ui/icons/icon-play.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-players.png b/core/assets-raw/sprites/ui/icons/icon-players.png
index a4493dbd0b..be4746291f 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-players.png and b/core/assets-raw/sprites/ui/icons/icon-players.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-power.png b/core/assets-raw/sprites/ui/icons/icon-power.png
index bc8282d39a..666058d5c7 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-power.png and b/core/assets-raw/sprites/ui/icons/icon-power.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-production.png b/core/assets-raw/sprites/ui/icons/icon-production.png
index 2191bedfac..8e1d914691 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-production.png and b/core/assets-raw/sprites/ui/icons/icon-production.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-quit.png b/core/assets-raw/sprites/ui/icons/icon-quit.png
index dc4f747a45..26a9634945 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-quit.png and b/core/assets-raw/sprites/ui/icons/icon-quit.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-redo.png b/core/assets-raw/sprites/ui/icons/icon-redo.png
old mode 100755
new mode 100644
index 0a0291301a..b563616f62
Binary files a/core/assets-raw/sprites/ui/icons/icon-redo.png and b/core/assets-raw/sprites/ui/icons/icon-redo.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-refresh.png b/core/assets-raw/sprites/ui/icons/icon-refresh.png
index 2b3c7b31f1..ef69be3960 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-refresh.png and b/core/assets-raw/sprites/ui/icons/icon-refresh.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-rename.png b/core/assets-raw/sprites/ui/icons/icon-rename.png
index 73f3fb8391..4a6731a31b 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-rename.png and b/core/assets-raw/sprites/ui/icons/icon-rename.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-resize.png b/core/assets-raw/sprites/ui/icons/icon-resize.png
index 00d11bee80..ee53c8470f 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-resize.png and b/core/assets-raw/sprites/ui/icons/icon-resize.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-rotate-arrow.png b/core/assets-raw/sprites/ui/icons/icon-rotate-arrow.png
index c2ea8f2703..22039f3020 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-rotate-arrow.png and b/core/assets-raw/sprites/ui/icons/icon-rotate-arrow.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-rotate-left.png b/core/assets-raw/sprites/ui/icons/icon-rotate-left.png
index 22b3b3c582..9b05efec5f 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-rotate-left.png and b/core/assets-raw/sprites/ui/icons/icon-rotate-left.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-rotate-right.png b/core/assets-raw/sprites/ui/icons/icon-rotate-right.png
index d163dfcb5c..2009c9394d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-rotate-right.png and b/core/assets-raw/sprites/ui/icons/icon-rotate-right.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-rotate.png b/core/assets-raw/sprites/ui/icons/icon-rotate.png
index 8426b9ef47..3c989a555f 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-rotate.png and b/core/assets-raw/sprites/ui/icons/icon-rotate.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-save-image.png b/core/assets-raw/sprites/ui/icons/icon-save-image.png
index 7971c82f7d..5234c4f2f4 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-save-image.png and b/core/assets-raw/sprites/ui/icons/icon-save-image.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-save-map.png b/core/assets-raw/sprites/ui/icons/icon-save-map.png
index 781664e578..9066752d13 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-save-map.png and b/core/assets-raw/sprites/ui/icons/icon-save-map.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-save.png b/core/assets-raw/sprites/ui/icons/icon-save.png
index f05dfa89d2..1ed3fc4549 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-save.png and b/core/assets-raw/sprites/ui/icons/icon-save.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-settings.png b/core/assets-raw/sprites/ui/icons/icon-settings.png
index 8c0cfc49f6..51a969c401 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-settings.png and b/core/assets-raw/sprites/ui/icons/icon-settings.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-terrain.png b/core/assets-raw/sprites/ui/icons/icon-terrain.png
index da5f25366d..4f6326e012 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-terrain.png and b/core/assets-raw/sprites/ui/icons/icon-terrain.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-tools.png b/core/assets-raw/sprites/ui/icons/icon-tools.png
index 55f8b11575..0c6a1016a1 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-tools.png and b/core/assets-raw/sprites/ui/icons/icon-tools.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-touch.png b/core/assets-raw/sprites/ui/icons/icon-touch.png
index 4e96232fab..54f86930dd 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-touch.png and b/core/assets-raw/sprites/ui/icons/icon-touch.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-touchDelete.png b/core/assets-raw/sprites/ui/icons/icon-touchDelete.png
index 29b2cd89ea..484ecf1bac 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-touchDelete.png and b/core/assets-raw/sprites/ui/icons/icon-touchDelete.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-trash-16.png b/core/assets-raw/sprites/ui/icons/icon-trash-16.png
index 07d2de70a1..a1de49233b 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-trash-16.png and b/core/assets-raw/sprites/ui/icons/icon-trash-16.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-trash.png b/core/assets-raw/sprites/ui/icons/icon-trash.png
index 0f1c0ab56b..e0f419f2f3 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-trash.png and b/core/assets-raw/sprites/ui/icons/icon-trash.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-trello.png b/core/assets-raw/sprites/ui/icons/icon-trello.png
index c1184271b9..8e63ab3208 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-trello.png and b/core/assets-raw/sprites/ui/icons/icon-trello.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-tutorial.png b/core/assets-raw/sprites/ui/icons/icon-tutorial.png
index 77f494c3e6..40ba90a5e4 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-tutorial.png and b/core/assets-raw/sprites/ui/icons/icon-tutorial.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-undo.png b/core/assets-raw/sprites/ui/icons/icon-undo.png
old mode 100755
new mode 100644
index b56d258984..98f74d8de9
Binary files a/core/assets-raw/sprites/ui/icons/icon-undo.png and b/core/assets-raw/sprites/ui/icons/icon-undo.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-units.png b/core/assets-raw/sprites/ui/icons/icon-units.png
index d528133039..2066ab2cdf 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-units.png and b/core/assets-raw/sprites/ui/icons/icon-units.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-unlocks.png b/core/assets-raw/sprites/ui/icons/icon-unlocks.png
index eb9a143a9f..36b637b0b9 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-unlocks.png and b/core/assets-raw/sprites/ui/icons/icon-unlocks.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-weapon.png b/core/assets-raw/sprites/ui/icons/icon-weapon.png
index 003074bc56..e59ec4582d 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-weapon.png and b/core/assets-raw/sprites/ui/icons/icon-weapon.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-wiki.png b/core/assets-raw/sprites/ui/icons/icon-wiki.png
index 6bd8d29014..b97008c439 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-wiki.png and b/core/assets-raw/sprites/ui/icons/icon-wiki.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-zoom-small.png b/core/assets-raw/sprites/ui/icons/icon-zoom-small.png
index 35c117cda3..af547625b0 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-zoom-small.png and b/core/assets-raw/sprites/ui/icons/icon-zoom-small.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-zoom.png b/core/assets-raw/sprites/ui/icons/icon-zoom.png
old mode 100755
new mode 100644
index 7a882ceb06..fb5948a596
Binary files a/core/assets-raw/sprites/ui/icons/icon-zoom.png and b/core/assets-raw/sprites/ui/icons/icon-zoom.png differ
diff --git a/core/assets-raw/sprites/ui/info-banner.png b/core/assets-raw/sprites/ui/info-banner.png
index 4cb1409caa..6f1b392e97 100644
Binary files a/core/assets-raw/sprites/ui/info-banner.png and b/core/assets-raw/sprites/ui/info-banner.png differ
diff --git a/core/assets-raw/sprites/ui/inventory.9.png b/core/assets-raw/sprites/ui/inventory.9.png
index f8fffa50e1..31c5f5c46b 100644
Binary files a/core/assets-raw/sprites/ui/inventory.9.png and b/core/assets-raw/sprites/ui/inventory.9.png differ
diff --git a/core/assets-raw/sprites/ui/logotext.png b/core/assets-raw/sprites/ui/logotext.png
index bc872e39bb..5430d1e567 100644
Binary files a/core/assets-raw/sprites/ui/logotext.png and b/core/assets-raw/sprites/ui/logotext.png differ
diff --git a/core/assets-raw/sprites/ui/pane-button.9.png b/core/assets-raw/sprites/ui/pane-button.9.png
index c870b0de34..4ecdc37357 100644
Binary files a/core/assets-raw/sprites/ui/pane-button.9.png and b/core/assets-raw/sprites/ui/pane-button.9.png differ
diff --git a/core/assets-raw/sprites/ui/pane.9.png b/core/assets-raw/sprites/ui/pane.9.png
index 0d4dcbfff4..19740add72 100644
Binary files a/core/assets-raw/sprites/ui/pane.9.png and b/core/assets-raw/sprites/ui/pane.9.png differ
diff --git a/core/assets-raw/sprites/ui/scroll-horizontal.9.png b/core/assets-raw/sprites/ui/scroll-horizontal.9.png
index 71469bb2e8..70fdf066f2 100644
Binary files a/core/assets-raw/sprites/ui/scroll-horizontal.9.png and b/core/assets-raw/sprites/ui/scroll-horizontal.9.png differ
diff --git a/core/assets-raw/sprites/ui/scroll-knob-horizontal.9.png b/core/assets-raw/sprites/ui/scroll-knob-horizontal.9.png
index 699845f70e..e29eff71ab 100644
Binary files a/core/assets-raw/sprites/ui/scroll-knob-horizontal.9.png and b/core/assets-raw/sprites/ui/scroll-knob-horizontal.9.png differ
diff --git a/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png b/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png
index 80ace6e0c2..ed838ff3bf 100644
Binary files a/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png and b/core/assets-raw/sprites/ui/scroll-knob-vertical-black.9.png differ
diff --git a/core/assets-raw/sprites/ui/scroll-knob-vertical.9.png b/core/assets-raw/sprites/ui/scroll-knob-vertical.9.png
index 7e8f69bce7..4c0d362150 100644
Binary files a/core/assets-raw/sprites/ui/scroll-knob-vertical.9.png and b/core/assets-raw/sprites/ui/scroll-knob-vertical.9.png differ
diff --git a/core/assets-raw/sprites/ui/scroll.9.png b/core/assets-raw/sprites/ui/scroll.9.png
index e83e20b63b..527d2c29c2 100644
Binary files a/core/assets-raw/sprites/ui/scroll.9.png and b/core/assets-raw/sprites/ui/scroll.9.png differ
diff --git a/core/assets-raw/sprites/ui/selection.png b/core/assets-raw/sprites/ui/selection.png
index a8ed5d2767..b75e1ce6d2 100644
Binary files a/core/assets-raw/sprites/ui/selection.png and b/core/assets-raw/sprites/ui/selection.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob-down.png b/core/assets-raw/sprites/ui/slider-knob-down.png
index 369c253da6..bfcc78def6 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob-down.png and b/core/assets-raw/sprites/ui/slider-knob-down.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob-over.png b/core/assets-raw/sprites/ui/slider-knob-over.png
index dce3813656..bfcc78def6 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob-over.png and b/core/assets-raw/sprites/ui/slider-knob-over.png differ
diff --git a/core/assets-raw/sprites/ui/slider-knob.png b/core/assets-raw/sprites/ui/slider-knob.png
index 9e7bd21cc6..6346d62c52 100644
Binary files a/core/assets-raw/sprites/ui/slider-knob.png and b/core/assets-raw/sprites/ui/slider-knob.png differ
diff --git a/core/assets-raw/sprites/ui/slider-vertical.png b/core/assets-raw/sprites/ui/slider-vertical.png
index 5ec9736ba6..91d7c16e1f 100644
Binary files a/core/assets-raw/sprites/ui/slider-vertical.png and b/core/assets-raw/sprites/ui/slider-vertical.png differ
diff --git a/core/assets-raw/sprites/ui/slider.png b/core/assets-raw/sprites/ui/slider.png
index a722706e2b..88dcd70693 100644
Binary files a/core/assets-raw/sprites/ui/slider.png and b/core/assets-raw/sprites/ui/slider.png differ
diff --git a/core/assets-raw/sprites/ui/text-sides-down.png b/core/assets-raw/sprites/ui/text-sides-down.png
index 151c269d38..aa46f4b612 100644
Binary files a/core/assets-raw/sprites/ui/text-sides-down.png and b/core/assets-raw/sprites/ui/text-sides-down.png differ
diff --git a/core/assets-raw/sprites/ui/text-sides-over.png b/core/assets-raw/sprites/ui/text-sides-over.png
index 445ec86471..110491b4d4 100644
Binary files a/core/assets-raw/sprites/ui/text-sides-over.png and b/core/assets-raw/sprites/ui/text-sides-over.png differ
diff --git a/core/assets-raw/sprites/ui/text-sides.png b/core/assets-raw/sprites/ui/text-sides.png
index 93993100bb..6b624de2c3 100644
Binary files a/core/assets-raw/sprites/ui/text-sides.png and b/core/assets-raw/sprites/ui/text-sides.png differ
diff --git a/core/assets-raw/sprites/ui/textarea.9.png b/core/assets-raw/sprites/ui/textarea.9.png
index e8b1e5df84..16f8cb4fe6 100644
Binary files a/core/assets-raw/sprites/ui/textarea.9.png and b/core/assets-raw/sprites/ui/textarea.9.png differ
diff --git a/core/assets-raw/sprites/ui/textfield.9.png b/core/assets-raw/sprites/ui/textfield.9.png
index fda1b6679a..742b040dee 100644
Binary files a/core/assets-raw/sprites/ui/textfield.9.png and b/core/assets-raw/sprites/ui/textfield.9.png differ
diff --git a/core/assets-raw/sprites/ui/window-empty.9.png b/core/assets-raw/sprites/ui/window-empty.9.png
index a5bae440b4..cbc2915f60 100644
Binary files a/core/assets-raw/sprites/ui/window-empty.9.png and b/core/assets-raw/sprites/ui/window-empty.9.png differ
diff --git a/core/assets-raw/sprites/ui/window.9.png b/core/assets-raw/sprites/ui/window.9.png
index 4efe2c7353..7bae102db6 100644
Binary files a/core/assets-raw/sprites/ui/window.9.png and b/core/assets-raw/sprites/ui/window.9.png differ
diff --git a/core/assets-raw/sprites/units/dagger-base.png b/core/assets-raw/sprites/units/dagger-base.png
index 50cd656428..277d848d8f 100644
Binary files a/core/assets-raw/sprites/units/dagger-base.png and b/core/assets-raw/sprites/units/dagger-base.png differ
diff --git a/core/assets-raw/sprites/units/dagger-leg.png b/core/assets-raw/sprites/units/dagger-leg.png
index 7204dda0a7..d25325c6bc 100644
Binary files a/core/assets-raw/sprites/units/dagger-leg.png and b/core/assets-raw/sprites/units/dagger-leg.png differ
diff --git a/core/assets-raw/sprites/units/dagger.png b/core/assets-raw/sprites/units/dagger.png
index ccce8b0729..96a9855621 100644
Binary files a/core/assets-raw/sprites/units/dagger.png and b/core/assets-raw/sprites/units/dagger.png differ
diff --git a/core/assets-raw/sprites/units/drone.png b/core/assets-raw/sprites/units/drone.png
index 75a86d9cdd..d2283645ea 100644
Binary files a/core/assets-raw/sprites/units/drone.png and b/core/assets-raw/sprites/units/drone.png differ
diff --git a/core/assets-raw/sprites/units/fabricator.png b/core/assets-raw/sprites/units/fabricator.png
index ab23162064..f056942a6a 100644
Binary files a/core/assets-raw/sprites/units/fabricator.png and b/core/assets-raw/sprites/units/fabricator.png differ
diff --git a/core/assets-raw/sprites/units/interceptor.png b/core/assets-raw/sprites/units/interceptor.png
index b0da8131f2..3ee75dc1a8 100644
Binary files a/core/assets-raw/sprites/units/interceptor.png and b/core/assets-raw/sprites/units/interceptor.png differ
diff --git a/core/assets-raw/sprites/units/monsoon.png b/core/assets-raw/sprites/units/monsoon.png
index bed8802a5b..cf78f27837 100644
Binary files a/core/assets-raw/sprites/units/monsoon.png and b/core/assets-raw/sprites/units/monsoon.png differ
diff --git a/core/assets-raw/sprites/units/power-cell.png b/core/assets-raw/sprites/units/power-cell.png
index cc8ea4f2dc..fac5e3f3ca 100644
Binary files a/core/assets-raw/sprites/units/power-cell.png and b/core/assets-raw/sprites/units/power-cell.png differ
diff --git a/core/assets-raw/sprites/units/titan-base.png b/core/assets-raw/sprites/units/titan-base.png
index fb5830f3ff..2930249fa3 100644
Binary files a/core/assets-raw/sprites/units/titan-base.png and b/core/assets-raw/sprites/units/titan-base.png differ
diff --git a/core/assets-raw/sprites/units/titan-leg.png b/core/assets-raw/sprites/units/titan-leg.png
index eb21e7da28..3f461f27f2 100644
Binary files a/core/assets-raw/sprites/units/titan-leg.png and b/core/assets-raw/sprites/units/titan-leg.png differ
diff --git a/core/assets-raw/sprites/units/titan.png b/core/assets-raw/sprites/units/titan.png
index a11d23d604..6959fffef2 100644
Binary files a/core/assets-raw/sprites/units/titan.png and b/core/assets-raw/sprites/units/titan.png differ
diff --git a/core/assets-raw/sprites/weapons/blaster-equip.png b/core/assets-raw/sprites/weapons/blaster-equip.png
index b5207231b5..c246dc41de 100644
Binary files a/core/assets-raw/sprites/weapons/blaster-equip.png and b/core/assets-raw/sprites/weapons/blaster-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/chain-blaster-equip.png b/core/assets-raw/sprites/weapons/chain-blaster-equip.png
index 37a3cb4e5e..6591a21135 100644
Binary files a/core/assets-raw/sprites/weapons/chain-blaster-equip.png and b/core/assets-raw/sprites/weapons/chain-blaster-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/flakgun-equip.png b/core/assets-raw/sprites/weapons/flakgun-equip.png
index 02ab411a4c..9b18d74953 100644
Binary files a/core/assets-raw/sprites/weapons/flakgun-equip.png and b/core/assets-raw/sprites/weapons/flakgun-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/flamethrower-equip.png b/core/assets-raw/sprites/weapons/flamethrower-equip.png
index 2ff0908ef5..1d4462bd42 100644
Binary files a/core/assets-raw/sprites/weapons/flamethrower-equip.png and b/core/assets-raw/sprites/weapons/flamethrower-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/missiles-equip.png b/core/assets-raw/sprites/weapons/missiles-equip.png
index 67603de505..1f3be67082 100644
Binary files a/core/assets-raw/sprites/weapons/missiles-equip.png and b/core/assets-raw/sprites/weapons/missiles-equip.png differ
diff --git a/core/assets-raw/sprites/weapons/shockgun-equip.png b/core/assets-raw/sprites/weapons/shockgun-equip.png
index 26e4939de8..90c9705600 100644
Binary files a/core/assets-raw/sprites/weapons/shockgun-equip.png and b/core/assets-raw/sprites/weapons/shockgun-equip.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index d7ea0cddb9..6ac93f58f2 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -398,14 +398,14 @@ content.recipe.name=Blocks
 
 item.stone.name=Stone
 item.stone.description=A common raw material. Used for separating and refining into other materials, or melting into lava.
-item.tungsten.name=Tungsten
-item.tungsten.description=A common, but very useful structure material. Used in drills and heat-resistant blocks such as generators and smelteries.
+item.copper.name=Copper
+item.copper.description=A useful structure material. Used extensively in all types of blocks.
 item.lead.name=Lead
 item.lead.description=A basic starter material. Used extensively in electronics and liquid transportation blocks.
 item.coal.name=Coal
 item.coal.description=A common and readily available fuel.
-item.carbide.name=Carbide
-item.carbide.description=A tough alloy made with tungsten and carbon. Used in advanced transportation blocks and high-tier drills.
+item.dense-alloy.name=Dense Alloy
+item.dense-alloy.description=A tough alloy made with lead and copper. Used in advanced transportation blocks and high-tier drills.
 item.titanium.name=Titanium
 item.titanium.description=A rare super-light metal used extensively in liquid transportation, drills and aircraft.
 item.thorium.name=Thorium
@@ -458,10 +458,12 @@ block.shrub.name=shrub
 block.rock.name=rock
 block.blackrock.name=blackrock
 block.icerock.name=icerock
-block.tungsten-wall.name=Tungsten Wall
-block.tungsten-wall-large.name=Large Tungsten Wall
-block.carbide-wall.name=Carbide Wall
-block.carbide-wall-large.name=Large Carbide Wall
+block.copper-wall.name=Copper Wall
+block.copper-wall-large.name=Large Tungsten Wall
+block.composite-wall.name=Composite Wall
+block.composite-wall-large.name=Large Composite Wall
+block.phase-wall.name=Composite Wall
+block.phase-wall-large.name=Large Composite Wall
 block.thorium-wall.name=Thorium Wall
 block.thorium-wall-large.name=Large Thorium Wall
 block.door.name=Door
@@ -473,8 +475,6 @@ block.lancer.name=Lancer
 block.conveyor.name=Conveyor
 block.titanium-conveyor.name=Titanium Conveyor
 block.junction.name=Junction
-block.splitter.name=Router
-block.splitter.description=Outputs items into three different directions once they are recieved.
 block.router.name=Router
 block.router.description=Splits items into all 4 directions. Can store items as a buffer.
 block.distributor.name=Distributor
@@ -502,8 +502,8 @@ block.battery.name=Battery
 block.battery-large.name=Large Battery
 block.combustion-generator.name=Combustion Generator
 block.turbine-generator.name=Turbine Generator
-block.tungsten-drill.name=Tungsten Drill
-block.carbide-drill.name=Carbide Drill
+block.mechanical-drill.name=Mechanical Drill
+block.pneumatic-drill.name=Pneumatic Drill
 block.laser-drill.name=Laser Drill
 block.water-extractor.name=Water Extractor
 block.cultivator.name=Cultivator
@@ -553,7 +553,7 @@ block.liquid-tank.name=Liquid Tank
 block.liquid-junction.name=Liquid Junction
 block.bridge-conduit.name=Bridge Conduit
 block.rotary-pump.name=Rotary Pump
-block.nuclear-reactor.name=Nuclear Reactor
+block.thorium-reactor.name=Thorium Reactor
 block.command-center.name=Command Center
 block.mass-driver.name=Mass Driver
 block.blast-drill.name=Blast Drill
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 6f31aaff97..ffa0476dab 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,287 +13,287 @@ background
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 823, 258
+  xy: 631, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 813, 238
+  xy: 641, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 823, 248
+  xy: 641, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 843, 258
+  xy: 761, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 843, 248
+  xy: 761, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 843, 238
+  xy: 771, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 843, 228
+  xy: 771, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 843, 218
+  xy: 781, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 843, 208
+  xy: 781, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 843, 198
+  xy: 791, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 843, 188
+  xy: 791, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 853, 286
+  xy: 801, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 863, 281
+  xy: 801, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 853, 276
+  xy: 721, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 853, 266
+  xy: 731, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 863, 271
+  xy: 741, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 853, 256
+  xy: 751, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 863, 261
+  xy: 761, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 853, 246
+  xy: 771, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 863, 251
+  xy: 781, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 853, 236
+  xy: 791, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 863, 241
+  xy: 801, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 943, 283
+  xy: 963, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 943, 273
+  xy: 973, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 953, 283
+  xy: 983, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 943, 263
+  xy: 993, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 953, 273
+  xy: 1003, 241
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 963, 283
+  xy: 1013, 251
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 943, 253
+  xy: 953, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 953, 263
+  xy: 963, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 963, 273
+  xy: 973, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 973, 283
+  xy: 983, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 943, 243
+  xy: 993, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 953, 253
+  xy: 1003, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 963, 263
+  xy: 1013, 241
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 973, 273
+  xy: 963, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 983, 283
+  xy: 973, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 943, 233
+  xy: 983, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 953, 243
+  xy: 993, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 963, 253
+  xy: 1003, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 973, 263
+  xy: 1013, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -307,21 +307,21 @@ mass-driver-turret
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 933, 277
+  xy: 871, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 883, 217
+  xy: 881, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 893, 227
+  xy: 891, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -361,49 +361,42 @@ blast-drill-top
   orig: 24, 24
   offset: 0, 0
   index: -1
-carbide-drill
-  rotate: false
-  xy: 863, 321
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-carbide-drill-rotator
-  rotate: false
-  xy: 881, 321
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-carbide-drill-top
-  rotate: false
-  xy: 899, 321
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
 laser-drill
   rotate: false
-  xy: 357, 117
+  xy: 303, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laser-drill-rotator
   rotate: false
-  xy: 375, 117
+  xy: 321, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-tungsten-drill-rotator
+laser-drill-top
+  rotate: false
+  xy: 339, 117
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+mechanical-drill
+  rotate: false
+  xy: 357, 117
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+mechanical-drill-rotator
   rotate: false
   xy: 375, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-laser-drill-top
+mechanical-drill-top
   rotate: false
   xy: 393, 117
   size: 16, 16
@@ -412,28 +405,28 @@ laser-drill-top
   index: -1
 oil-extractor
   rotate: false
-  xy: 789, 368
+  xy: 741, 316
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-liquid
   rotate: false
-  xy: 789, 342
+  xy: 767, 316
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-rotator
   rotate: false
-  xy: 793, 316
+  xy: 789, 368
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-top
   rotate: false
-  xy: 807, 394
+  xy: 789, 342
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -466,44 +459,51 @@ plasma-drill-top
   orig: 32, 32
   offset: 0, 0
   index: -1
-tungsten-drill
+pneumatic-drill
   rotate: false
-  xy: 319, 99
+  xy: 193, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-tungsten-drill-top
+pneumatic-drill-rotator
   rotate: false
-  xy: 301, 81
+  xy: 175, 81
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+pneumatic-drill-top
+  rotate: false
+  xy: 211, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor
   rotate: false
-  xy: 355, 99
+  xy: 337, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 337, 81
+  xy: 373, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 373, 99
+  xy: 355, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 355, 81
+  xy: 391, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -552,7 +552,7 @@ blackstone2
   index: -1
 blackstone3
   rotate: false
-  xy: 677, 194
+  xy: 1015, 371
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -566,560 +566,560 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 813, 228
+  xy: 651, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 823, 238
+  xy: 651, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 813, 218
+  xy: 661, 174
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+copper1
+  rotate: false
+  xy: 813, 288
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+copper2
+  rotate: false
+  xy: 823, 288
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+copper3
+  rotate: false
+  xy: 811, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 863, 211
+  xy: 823, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 853, 196
+  xy: 813, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirtedge
   rotate: false
-  xy: 921, 307
+  xy: 891, 307
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 generic-cliff-edge
   rotate: false
-  xy: 873, 251
+  xy: 813, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 873, 251
+  xy: 813, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 873, 241
+  xy: 823, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 873, 241
+  xy: 823, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-2
   rotate: false
-  xy: 873, 231
+  xy: 813, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 873, 231
+  xy: 813, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-side
   rotate: false
-  xy: 873, 221
+  xy: 823, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 873, 221
+  xy: 823, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 873, 191
+  xy: 823, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 873, 181
+  xy: 811, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 413, 7
+  xy: 823, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 423, 7
+  xy: 821, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 873, 211
+  xy: 813, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 873, 201
+  xy: 811, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 213, 19
+  xy: 877, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 187, 9
+  xy: 821, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 197, 9
+  xy: 821, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iceedge
   rotate: false
-  xy: 241, 19
+  xy: 905, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 207, 9
+  xy: 833, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 217, 9
+  xy: 833, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 217, 9
+  xy: 833, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 227, 9
+  xy: 833, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 227, 9
+  xy: 833, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lavaedge
   rotate: false
-  xy: 283, 19
+  xy: 947, 303
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 459, 114
+  xy: 853, 286
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 449, 104
+  xy: 863, 283
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 459, 104
+  xy: 873, 283
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 438, 84
+  xy: 853, 256
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 428, 64
+  xy: 863, 263
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 438, 74
+  xy: 873, 273
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 448, 84
+  xy: 853, 246
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 438, 64
+  xy: 863, 253
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalflooredge
   rotate: false
-  xy: 367, 19
+  xy: 975, 289
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 oiledge
   rotate: false
-  xy: 1003, 353
+  xy: 185, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 913, 227
+  xy: 963, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 933, 247
+  xy: 993, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 883, 187
+  xy: 943, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandedge
   rotate: false
-  xy: 1005, 325
+  xy: 213, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 923, 217
+  xy: 953, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 933, 227
+  xy: 963, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 903, 187
+  xy: 973, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowedge
   rotate: false
-  xy: 963, 303
+  xy: 241, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 977, 303
+  xy: 255, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 903, 177
+  xy: 943, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 913, 177
+  xy: 953, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 923, 177
+  xy: 963, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 933, 177
+  xy: 973, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 883, 177
+  xy: 1003, 261
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 893, 177
+  xy: 1013, 271
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneedge
   rotate: false
-  xy: 991, 303
+  xy: 269, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 882, 167
+  xy: 983, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 892, 167
+  xy: 993, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 902, 167
+  xy: 1003, 251
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 912, 167
+  xy: 1013, 261
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 922, 167
+  xy: 943, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 932, 167
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-tungsten1
-  rotate: false
-  xy: 943, 223
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-tungsten2
-  rotate: false
-  xy: 953, 233
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-tungsten3
-  rotate: false
-  xy: 963, 243
+  xy: 953, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 973, 253
+  xy: 983, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 983, 263
+  xy: 993, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 943, 213
+  xy: 1003, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 953, 223
+  xy: 1013, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 1005, 297
+  xy: 297, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 662, 182
+  xy: 1005, 327
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 672, 182
+  xy: 1015, 321
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 672, 182
+  xy: 1015, 321
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 821, 278
+  xy: 704, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 821, 278
+  xy: 704, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 813, 268
+  xy: 611, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 831, 278
+  xy: 611, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 833, 238
+  xy: 721, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 853, 226
+  xy: 833, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-2
   rotate: false
-  xy: 949, 353
+  xy: 899, 321
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1140,7 +1140,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 873, 261
+  xy: 823, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1154,70 +1154,70 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 903, 237
+  xy: 901, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 913, 247
+  xy: 911, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ripples
   rotate: false
-  xy: 641, 192
+  xy: 508, 185
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 rubble-1-0
   rotate: false
-  xy: 211, 99
+  xy: 211, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-1-1
   rotate: false
-  xy: 193, 81
+  xy: 247, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-0
   rotate: false
-  xy: 229, 99
+  xy: 229, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-1
   rotate: false
-  xy: 211, 81
+  xy: 265, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-3-0
   rotate: false
-  xy: 819, 316
+  xy: 815, 368
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rubble-3-1
   rotate: false
-  xy: 819, 316
+  xy: 815, 368
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 shadow-1
   rotate: false
-  xy: 653, 192
+  xy: 520, 185
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1259,14 +1259,14 @@ shadow-6
   index: -1
 shadow-corner
   rotate: false
-  xy: 665, 192
+  xy: 532, 185
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 shadow-round-1
   rotate: false
-  xy: 557, 182
+  xy: 557, 194
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1294,154 +1294,154 @@ shadow-rounded-2
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 813, 258
+  xy: 621, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 823, 268
+  xy: 621, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 813, 248
+  xy: 631, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 813, 198
+  xy: 681, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 823, 208
+  xy: 681, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 813, 188
+  xy: 691, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 823, 198
+  xy: 691, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 823, 188
+  xy: 701, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 833, 268
+  xy: 701, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 833, 258
+  xy: 711, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 833, 248
+  xy: 711, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 833, 228
+  xy: 721, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 833, 218
+  xy: 731, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 833, 208
+  xy: 731, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 833, 198
+  xy: 741, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 833, 188
+  xy: 741, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 841, 278
+  xy: 751, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 843, 268
+  xy: 751, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router
   rotate: false
-  xy: 457, 94
+  xy: 933, 283
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 467, 94
+  xy: 853, 276
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 428, 84
+  xy: 853, 266
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 428, 74
+  xy: 863, 273
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1469,70 +1469,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 903, 247
+  xy: 931, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 913, 257
+  xy: 931, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 923, 267
+  xy: 861, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 923, 257
+  xy: 921, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 933, 267
+  xy: 931, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 883, 207
+  xy: 943, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 893, 217
+  xy: 953, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 903, 227
+  xy: 943, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 913, 237
+  xy: 963, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 923, 247
+  xy: 943, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1621,30 +1621,30 @@ fusion-reactor-top
   orig: 32, 32
   offset: 0, 0
   index: -1
-nuclear-reactor-center
-  rotate: false
-  xy: 741, 316
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-nuclear-reactor-lights
-  rotate: false
-  xy: 767, 316
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
 rtg-generator-top
   rotate: false
-  xy: 923, 237
+  xy: 983, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+thorium-reactor-center
+  rotate: false
+  xy: 819, 316
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+thorium-reactor-lights
+  rotate: false
+  xy: 715, 290
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
 turbine-generator-top
   rotate: false
-  xy: 337, 99
+  xy: 319, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1763,63 +1763,63 @@ block-icon-blast-mixer
   index: -1
 centrifuge-liquid
   rotate: false
-  xy: 919, 339
+  xy: 863, 321
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 967, 353
+  xy: 919, 339
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 985, 353
+  xy: 917, 321
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 687, 249
+  xy: 949, 353
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 687, 231
+  xy: 967, 353
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 687, 213
+  xy: 985, 353
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 705, 249
+  xy: 687, 249
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 lavasmelter
   rotate: false
-  xy: 439, 104
+  xy: 841, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 435, 54
+  xy: 863, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1854,28 +1854,28 @@ plastanium-compressor-top
   index: -1
 poweralloysmelter-top
   rotate: false
-  xy: 193, 99
+  xy: 193, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 933, 257
+  xy: 953, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 883, 197
+  xy: 973, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 903, 197
+  xy: 983, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1896,21 +1896,21 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 923, 197
+  xy: 953, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 642, 182
+  xy: 1005, 337
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 652, 182
+  xy: 1015, 331
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1980,7 +1980,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 873, 271
+  xy: 813, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2001,14 +2001,7 @@ spectre
   index: -1
 hail
   rotate: false
-  xy: 177, 9
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-scatter
-  rotate: false
-  xy: 177, 9
+  xy: 811, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2022,14 +2015,14 @@ hail-heat
   index: -1
 lancer
   rotate: false
-  xy: 321, 117
+  xy: 267, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 339, 117
+  xy: 285, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2043,133 +2036,140 @@ meltdown
   index: -1
 ripple
   rotate: false
-  xy: 815, 368
+  xy: 793, 316
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ripple-heat
   rotate: false
-  xy: 815, 342
+  xy: 807, 394
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 salvo
   rotate: false
-  xy: 247, 99
+  xy: 247, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-heat
   rotate: false
-  xy: 229, 81
+  xy: 283, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-panel-left
   rotate: false
-  xy: 265, 99
+  xy: 265, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-panel-right
   rotate: false
-  xy: 247, 81
+  xy: 301, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+scatter
+  rotate: false
+  xy: 953, 239
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 scorch
   rotate: false
-  xy: 933, 237
+  xy: 963, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 893, 187
+  xy: 973, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 swarmer
   rotate: false
-  xy: 283, 99
+  xy: 283, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 391, 99
+  xy: 373, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 373, 81
+  xy: 391, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dagger-pad-top
   rotate: false
-  xy: 705, 231
+  xy: 687, 231
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dagger-pad-top-open
   rotate: false
-  xy: 705, 213
+  xy: 687, 213
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-pad-top
   rotate: false
-  xy: 723, 218
+  xy: 723, 254
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-pad-top-open
   rotate: false
-  xy: 741, 236
+  xy: 723, 236
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-pad-top
   rotate: false
-  xy: 759, 254
+  xy: 741, 254
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-pad-top-open
   rotate: false
-  xy: 741, 218
+  xy: 723, 218
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 interceptor-pad-top
   rotate: false
-  xy: 267, 117
+  xy: 213, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 interceptor-pad-top-open
   rotate: false
-  xy: 285, 117
+  xy: 231, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2183,21 +2183,21 @@ mech-factory
   index: -1
 dart-ship-factory-open
   rotate: false
-  xy: 723, 254
+  xy: 705, 249
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 delta-mech-factory-open
   rotate: false
-  xy: 723, 236
+  xy: 705, 231
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 javelin-ship-factory-open
   rotate: false
-  xy: 303, 117
+  xy: 249, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2239,28 +2239,28 @@ titan-pad-top-open
   index: -1
 reconstructor-open
   rotate: false
-  xy: 175, 81
+  xy: 229, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 repair-point-turret
   rotate: false
-  xy: 893, 207
+  xy: 943, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupply-point
   rotate: false
-  xy: 903, 217
+  xy: 953, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ship-factory
   rotate: false
-  xy: 715, 290
+  xy: 815, 342
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2274,14 +2274,14 @@ titan-pad
   index: -1
 door-large-open
   rotate: false
-  xy: 741, 254
+  xy: 705, 213
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 873, 281
+  xy: 823, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2337,35 +2337,35 @@ clear
   index: -1
 command-attack
   rotate: false
-  xy: 823, 228
+  xy: 661, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-idle
   rotate: false
-  xy: 813, 208
+  xy: 671, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-retreat
   rotate: false
-  xy: 823, 218
+  xy: 671, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 enemyarrow
   rotate: false
-  xy: 403, 8
+  xy: 544, 185
   size: 8, 7
   orig: 8, 7
   offset: 0, 0
   index: -1
 error
   rotate: false
-  xy: 863, 291
+  xy: 919, 307
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -2407,14 +2407,14 @@ minelaser-end
   index: -1
 missile
   rotate: false
-  xy: 546, 187
+  xy: 569, 195
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 569, 183
+  xy: 580, 193
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -2456,21 +2456,21 @@ scorch5
   index: -1
 shell
   rotate: false
-  xy: 580, 181
+  xy: 591, 193
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 591, 181
+  xy: 602, 193
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 913, 207
+  xy: 943, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2484,7 +2484,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 983, 273
+  xy: 973, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2498,28 +2498,28 @@ transfer-end
   index: -1
 blackstone-cliff-edge
   rotate: false
-  xy: 602, 182
+  xy: 1015, 361
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-1
   rotate: false
-  xy: 612, 182
+  xy: 1015, 351
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-2
   rotate: false
-  xy: 622, 182
+  xy: 1005, 347
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-side
   rotate: false
-  xy: 632, 182
+  xy: 1015, 341
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2547,130 +2547,151 @@ block-icon-blast-drill
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 388, 71
+  xy: 1005, 317
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 388, 71
+  xy: 1005, 317
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 398, 73
+  xy: 1015, 311
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 398, 73
+  xy: 1015, 311
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-block-icon-carbide-drill
+block-icon-centrifuge
   rotate: false
   xy: 775, 272
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-block-icon-carbide-wall
-  rotate: false
-  xy: 481, 174
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-carbide-wall
-  rotate: false
-  xy: 481, 174
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-block-icon-carbide-wall-large
-  rotate: false
-  xy: 793, 278
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-carbide-wall-large
-  rotate: false
-  xy: 793, 278
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-icon-centrifuge
-  rotate: false
-  xy: 427, 160
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
 centrifuge
   rotate: false
-  xy: 427, 160
+  xy: 775, 272
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 491, 175
+  xy: 1015, 301
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 491, 175
+  xy: 1015, 301
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-command-center
   rotate: false
-  xy: 445, 160
+  xy: 793, 278
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 command-center
   rotate: false
-  xy: 445, 160
+  xy: 793, 278
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-icon-composite-wall
+  rotate: false
+  xy: 1015, 291
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+composite-wall
+  rotate: false
+  xy: 1015, 291
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+block-icon-composite-wall-large
+  rotate: false
+  xy: 427, 160
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+composite-wall-large
+  rotate: false
+  xy: 427, 160
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 501, 175
+  xy: 1015, 281
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 511, 175
+  xy: 613, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 511, 175
+  xy: 613, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+block-icon-copper-wall
+  rotate: false
+  xy: 623, 194
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+copper-wall
+  rotate: false
+  xy: 623, 194
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+block-icon-copper-wall-large
+  rotate: false
+  xy: 445, 160
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+copper-wall-large
+  rotate: false
+  xy: 445, 160
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 block-icon-core
   rotate: false
   xy: 203, 135
@@ -2729,42 +2750,42 @@ dart-ship-factory
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 521, 175
+  xy: 633, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 521, 175
+  xy: 633, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall
   rotate: false
-  xy: 531, 175
+  xy: 643, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 531, 175
+  xy: 643, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 531, 175
+  xy: 643, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 531, 175
+  xy: 643, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2813,14 +2834,14 @@ delta-mech-factory
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 481, 164
+  xy: 653, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 481, 164
+  xy: 653, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2841,14 +2862,14 @@ distributor
   index: -1
 block-icon-door
   rotate: false
-  xy: 491, 165
+  xy: 663, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 491, 165
+  xy: 663, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2876,21 +2897,21 @@ block-icon-drone-pad
   index: -1
 block-icon-drop-point
   rotate: false
-  xy: 501, 165
+  xy: 673, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 drop-point
   rotate: false
-  xy: 501, 165
+  xy: 673, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-duo
   rotate: false
-  xy: 511, 165
+  xy: 399, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2918,63 +2939,63 @@ block-icon-fusion-reactor
   index: -1
 block-icon-grass
   rotate: false
-  xy: 521, 165
+  xy: 397, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 521, 165
+  xy: 397, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-hail
   rotate: false
-  xy: 531, 165
+  xy: 395, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-ice
   rotate: false
-  xy: 682, 184
+  xy: 481, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 682, 184
+  xy: 481, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 692, 185
+  xy: 491, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 692, 185
+  xy: 491, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 702, 185
+  xy: 501, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 702, 185
+  xy: 501, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2988,28 +3009,28 @@ block-icon-interceptor-pad
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 712, 185
+  xy: 511, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 712, 185
+  xy: 511, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 541, 175
+  xy: 521, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 541, 175
+  xy: 521, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3030,14 +3051,14 @@ javelin-ship-factory
   index: -1
 block-icon-junction
   rotate: false
-  xy: 541, 165
+  xy: 531, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 541, 165
+  xy: 531, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3058,35 +3079,35 @@ block-icon-laser-drill
   index: -1
 block-icon-lava
   rotate: false
-  xy: 551, 172
+  xy: 481, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 551, 172
+  xy: 481, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 561, 172
+  xy: 491, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 561, 172
+  xy: 491, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 551, 162
+  xy: 501, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3100,14 +3121,14 @@ block-icon-liquid-tank
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 561, 162
+  xy: 511, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 561, 162
+  xy: 511, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3126,16 +3147,23 @@ mass-driver
   orig: 24, 24
   offset: 0, 0
   index: -1
+block-icon-mechanical-drill
+  rotate: false
+  xy: 841, 354
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 409, 107
+  xy: 521, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 409, 107
+  xy: 521, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3149,28 +3177,28 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 409, 97
+  xy: 531, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 409, 97
+  xy: 531, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 407, 87
+  xy: 541, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 407, 87
+  xy: 541, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3182,86 +3210,72 @@ block-icon-monsoon-pad
   orig: 24, 24
   offset: 0, 0
   index: -1
-block-icon-nuclear-reactor
-  rotate: false
-  xy: 359, 135
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
-nuclear-reactor
-  rotate: false
-  xy: 359, 135
-  size: 24, 24
-  orig: 24, 24
-  offset: 0, 0
-  index: -1
 block-icon-oil
   rotate: false
-  xy: 408, 77
+  xy: 541, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 408, 77
+  xy: 541, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-oil-extractor
   rotate: false
-  xy: 385, 135
+  xy: 359, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 408, 67
+  xy: 554, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 408, 67
+  xy: 554, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 398, 63
+  xy: 551, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 398, 63
+  xy: 551, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 395, 53
+  xy: 551, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 395, 53
+  xy: 551, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-weaver
   rotate: false
-  xy: 841, 354
+  xy: 859, 375
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3275,371 +3289,392 @@ block-icon-plasma-drill
   index: -1
 block-icon-plastanium-compressor
   rotate: false
-  xy: 859, 375
+  xy: 859, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 plastanium-compressor
   rotate: false
-  xy: 859, 375
+  xy: 859, 357
+  size: 16, 16
+  orig: 16, 16
+  offset: 0, 0
+  index: -1
+block-icon-pneumatic-drill
+  rotate: false
+  xy: 877, 375
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 395, 43
+  xy: 564, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 395, 43
+  xy: 564, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-power-node-large
   rotate: false
-  xy: 859, 357
+  xy: 877, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 power-node-large
   rotate: false
-  xy: 859, 357
+  xy: 877, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 395, 33
+  xy: 561, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 395, 33
+  xy: 561, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 408, 57
+  xy: 561, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 408, 57
+  xy: 561, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 405, 47
+  xy: 574, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 405, 37
+  xy: 584, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pyratite-mixer
   rotate: false
-  xy: 877, 375
+  xy: 895, 375
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 pyratite-mixer
   rotate: false
-  xy: 877, 375
+  xy: 895, 375
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-reconstructor
   rotate: false
-  xy: 877, 357
+  xy: 895, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dagger-pad
   rotate: false
-  xy: 877, 357
+  xy: 895, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-pad
   rotate: false
-  xy: 877, 357
+  xy: 895, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-pad
   rotate: false
-  xy: 877, 357
+  xy: 895, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 interceptor-pad
   rotate: false
-  xy: 877, 357
+  xy: 895, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 reconstructor
   rotate: false
-  xy: 877, 357
+  xy: 895, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 395, 23
+  xy: 594, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 395, 23
+  xy: 594, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-ripple
   rotate: false
-  xy: 572, 256
+  xy: 385, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-rock
   rotate: false
-  xy: 405, 27
+  xy: 604, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 405, 27
+  xy: 604, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-rotary-pump
   rotate: false
-  xy: 895, 375
+  xy: 913, 375
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rotary-pump
   rotate: false
-  xy: 895, 375
+  xy: 913, 375
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+block-icon-router
+  rotate: false
+  xy: 614, 184
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+router
+  rotate: false
+  xy: 614, 184
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 393, 13
+  xy: 624, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 393, 13
+  xy: 624, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-salvo
   rotate: false
-  xy: 895, 357
+  xy: 913, 357
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-sand
   rotate: false
-  xy: 405, 17
+  xy: 634, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 405, 17
+  xy: 634, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 417, 87
+  xy: 644, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 418, 77
+  xy: 654, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 418, 77
+  xy: 654, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 418, 67
+  xy: 664, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 418, 67
+  xy: 664, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-silicon-smelter
   rotate: false
-  xy: 913, 375
+  xy: 931, 363
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 silicon-smelter
   rotate: false
-  xy: 913, 375
+  xy: 931, 363
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 418, 57
+  xy: 674, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 418, 57
+  xy: 674, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 415, 47
+  xy: 571, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 415, 47
+  xy: 571, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 415, 37
+  xy: 581, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 415, 37
+  xy: 581, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel-large
   rotate: false
-  xy: 598, 256
+  xy: 572, 256
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 solar-panel-large
   rotate: false
-  xy: 598, 256
+  xy: 572, 256
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-solidifer
   rotate: false
-  xy: 415, 27
+  xy: 591, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 415, 27
+  xy: 591, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 415, 17
+  xy: 601, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 415, 17
+  xy: 601, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 425, 47
+  xy: 571, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 425, 47
+  xy: 571, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3651,93 +3686,93 @@ block-icon-spectre
   orig: 32, 32
   offset: 0, 0
   index: -1
-block-icon-splitter
-  rotate: false
-  xy: 425, 37
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-splitter
-  rotate: false
-  xy: 425, 37
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
 block-icon-stone
   rotate: false
-  xy: 425, 27
+  xy: 581, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 425, 27
+  xy: 581, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-swarmer
   rotate: false
-  xy: 913, 357
+  xy: 949, 371
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thermal-generator
   rotate: false
-  xy: 931, 363
+  xy: 967, 371
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermal-generator
   rotate: false
-  xy: 931, 363
+  xy: 967, 371
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thermal-pump
   rotate: false
-  xy: 949, 371
+  xy: 985, 371
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermal-pump
   rotate: false
-  xy: 949, 371
+  xy: 985, 371
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
+block-icon-thorium-reactor
+  rotate: false
+  xy: 598, 256
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+thorium-reactor
+  rotate: false
+  xy: 598, 256
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 425, 17
+  xy: 591, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 425, 17
+  xy: 591, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-thorium-wall-large
   rotate: false
-  xy: 967, 371
+  xy: 845, 324
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thorium-wall-large
   rotate: false
-  xy: 967, 371
+  xy: 845, 324
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3751,60 +3786,18 @@ block-icon-titan-pad
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 813, 288
+  xy: 601, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 813, 288
+  xy: 601, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-titanium-conveyor
-  rotate: false
-  xy: 813, 288
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-block-icon-tungsten-drill
-  rotate: false
-  xy: 985, 371
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-block-icon-tungsten-wall
-  rotate: false
-  xy: 823, 288
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-tungsten-wall
-  rotate: false
-  xy: 823, 288
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-block-icon-tungsten-wall-large
-  rotate: false
-  xy: 845, 324
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
-tungsten-wall-large
-  rotate: false
-  xy: 845, 324
-  size: 16, 16
-  orig: 16, 16
-  offset: 0, 0
-  index: -1
 block-icon-turbine-generator
   rotate: false
   xy: 865, 339
@@ -3821,14 +3814,14 @@ turbine-generator
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 811, 278
+  xy: 684, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 811, 278
+  xy: 684, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3863,14 +3856,14 @@ warp-gate
   index: -1
 block-icon-water
   rotate: false
-  xy: 833, 288
+  xy: 694, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 833, 288
+  xy: 694, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3891,1057 +3884,1057 @@ block-icon-wave
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 863, 231
+  xy: 821, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 853, 216
+  xy: 813, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 863, 221
+  xy: 831, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 853, 206
+  xy: 813, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 863, 201
+  xy: 823, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 853, 186
+  xy: 813, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 863, 191
+  xy: 823, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 863, 181
+  xy: 813, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge
   rotate: false
-  xy: 429, 114
+  xy: 843, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-1
   rotate: false
-  xy: 439, 114
+  xy: 843, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-2
   rotate: false
-  xy: 429, 104
+  xy: 841, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-side
   rotate: false
-  xy: 449, 114
+  xy: 841, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 469, 104
+  xy: 893, 283
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 427, 94
+  xy: 903, 283
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 437, 94
+  xy: 913, 283
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 447, 94
+  xy: 923, 283
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 297, 19
+  xy: 961, 303
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 311, 19
+  xy: 975, 303
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 325, 19
+  xy: 989, 303
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-halberd-ship
   rotate: false
-  xy: 339, 19
+  xy: 947, 289
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-trident-ship
   rotate: false
-  xy: 339, 19
+  xy: 947, 289
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-omega-mech
   rotate: false
-  xy: 353, 19
+  xy: 961, 289
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-tau-mech
   rotate: false
-  xy: 353, 19
+  xy: 961, 289
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 448, 74
+  xy: 873, 263
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 458, 84
+  xy: 883, 273
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 448, 64
+  xy: 853, 236
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 458, 74
+  xy: 863, 243
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge
   rotate: false
-  xy: 458, 64
+  xy: 873, 253
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-1
   rotate: false
-  xy: 468, 84
+  xy: 883, 263
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-2
   rotate: false
-  xy: 468, 74
+  xy: 893, 273
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-side
   rotate: false
-  xy: 468, 64
+  xy: 853, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 435, 44
+  xy: 873, 243
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 445, 54
+  xy: 883, 253
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 435, 34
+  xy: 893, 263
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 445, 44
+  xy: 903, 273
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 455, 54
+  xy: 853, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 435, 24
+  xy: 863, 223
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 445, 34
+  xy: 873, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 455, 44
+  xy: 883, 243
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 465, 54
+  xy: 893, 253
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 445, 24
+  xy: 903, 263
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 455, 34
+  xy: 913, 273
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 465, 44
+  xy: 853, 206
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 455, 24
+  xy: 863, 213
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 465, 34
+  xy: 873, 223
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 465, 24
+  xy: 883, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 435, 14
+  xy: 893, 243
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 445, 14
+  xy: 903, 253
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 455, 14
+  xy: 913, 263
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-blackstone1
+  rotate: false
+  xy: 923, 273
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-blackstone2
+  rotate: false
+  xy: 853, 196
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-blackstone3
+  rotate: false
+  xy: 863, 203
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-grass1
+  rotate: false
+  xy: 873, 213
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-grass2
+  rotate: false
+  xy: 883, 223
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-grass3
+  rotate: false
+  xy: 893, 233
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-ice1
+  rotate: false
+  xy: 903, 243
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-ice2
+  rotate: false
+  xy: 913, 253
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-ice3
+  rotate: false
+  xy: 923, 263
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-sand1
+  rotate: false
+  xy: 933, 273
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-sand2
+  rotate: false
+  xy: 873, 203
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-sand3
+  rotate: false
+  xy: 883, 213
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-snow1
+  rotate: false
+  xy: 893, 223
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-snow2
+  rotate: false
+  xy: 903, 233
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-snow3
+  rotate: false
+  xy: 913, 243
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-stone1
+  rotate: false
+  xy: 923, 253
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-stone2
+  rotate: false
+  xy: 933, 263
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+ore-copper-stone3
+  rotate: false
+  xy: 883, 203
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 465, 14
+  xy: 893, 213
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 433, 4
+  xy: 903, 223
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 443, 4
+  xy: 913, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 453, 4
+  xy: 923, 243
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 463, 4
+  xy: 933, 253
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 477, 94
+  xy: 893, 203
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 478, 84
+  xy: 903, 213
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 478, 74
+  xy: 913, 223
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 478, 64
+  xy: 923, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 475, 54
+  xy: 933, 243
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 475, 44
+  xy: 903, 203
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 475, 34
+  xy: 913, 213
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 475, 24
+  xy: 923, 223
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 475, 14
+  xy: 933, 233
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 473, 4
+  xy: 913, 203
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 485, 54
+  xy: 923, 213
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 485, 44
+  xy: 933, 223
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 485, 34
+  xy: 923, 203
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 485, 24
+  xy: 933, 213
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 485, 14
+  xy: 933, 203
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 483, 4
+  xy: 853, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 722, 178
+  xy: 863, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 732, 178
+  xy: 873, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 742, 178
+  xy: 883, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 752, 178
+  xy: 893, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 762, 178
+  xy: 903, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 772, 178
+  xy: 913, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 782, 178
+  xy: 923, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 792, 178
+  xy: 933, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 802, 178
+  xy: 851, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 812, 178
+  xy: 851, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 822, 178
+  xy: 851, 156
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 832, 178
+  xy: 863, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 842, 178
+  xy: 873, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 852, 176
+  xy: 883, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 862, 171
+  xy: 893, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 872, 171
+  xy: 903, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 879, 297
+  xy: 913, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 889, 297
+  xy: 923, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 899, 297
+  xy: 933, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 909, 297
+  xy: 861, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 919, 297
+  xy: 861, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 929, 297
+  xy: 871, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 939, 297
+  xy: 871, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 949, 293
+  xy: 881, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 959, 293
+  xy: 881, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 969, 293
+  xy: 891, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 979, 293
+  xy: 891, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 989, 293
+  xy: 901, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 883, 287
+  xy: 901, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 883, 277
+  xy: 911, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 893, 287
+  xy: 911, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 883, 267
+  xy: 921, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 893, 277
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-blackstone1
-  rotate: false
-  xy: 903, 287
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-blackstone2
-  rotate: false
-  xy: 883, 257
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-blackstone3
-  rotate: false
-  xy: 893, 267
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-grass1
-  rotate: false
-  xy: 903, 277
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-grass2
-  rotate: false
-  xy: 913, 287
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-grass3
-  rotate: false
-  xy: 883, 247
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-ice1
-  rotate: false
-  xy: 893, 257
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-ice2
-  rotate: false
-  xy: 903, 267
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-ice3
-  rotate: false
-  xy: 913, 277
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-sand1
-  rotate: false
-  xy: 923, 287
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-sand2
-  rotate: false
-  xy: 883, 237
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-sand3
-  rotate: false
-  xy: 893, 247
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-snow1
-  rotate: false
-  xy: 903, 257
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-snow2
-  rotate: false
-  xy: 913, 267
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-snow3
-  rotate: false
-  xy: 923, 277
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-stone1
-  rotate: false
-  xy: 933, 287
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-stone2
-  rotate: false
-  xy: 883, 227
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-ore-tungsten-stone3
-  rotate: false
-  xy: 893, 237
+  xy: 921, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 893, 197
+  xy: 953, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 903, 207
+  xy: 963, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 913, 217
+  xy: 973, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 923, 227
+  xy: 943, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 913, 197
+  xy: 983, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 923, 207
+  xy: 993, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 933, 217
+  xy: 1003, 271
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 913, 187
+  xy: 943, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 933, 207
+  xy: 963, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 923, 187
+  xy: 973, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 933, 197
+  xy: 983, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 933, 187
+  xy: 993, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unit-icon-dagger
   rotate: false
-  xy: 1005, 311
+  xy: 283, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-titan
   rotate: false
-  xy: 319, 81
+  xy: 355, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 257, 9
+  xy: 833, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 267, 9
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-item-carbide
-  rotate: false
-  xy: 277, 9
+  xy: 833, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 287, 9
+  xy: 833, 198
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-copper
+  rotate: false
+  xy: 833, 188
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-dense-alloy
+  rotate: false
+  xy: 831, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 297, 9
+  xy: 831, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 307, 9
+  xy: 831, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 317, 9
+  xy: 841, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 327, 9
+  xy: 843, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 337, 9
+  xy: 843, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 347, 9
+  xy: 843, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 357, 9
+  xy: 843, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 367, 9
+  xy: 843, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 377, 7
+  xy: 843, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 419, 114
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-item-tungsten
-  rotate: false
-  xy: 419, 104
+  xy: 843, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 469, 114
+  xy: 883, 283
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5018,63 +5011,63 @@ dagger-leg
   index: -1
 delta-mech
   rotate: false
-  xy: 893, 307
+  xy: 863, 307
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 907, 307
+  xy: 877, 307
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 omega-mech
   rotate: false
-  xy: 1005, 339
+  xy: 199, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech
   rotate: false
-  xy: 1005, 339
+  xy: 199, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 879, 307
+  xy: 849, 296
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 halberd-ship
   rotate: false
-  xy: 227, 19
+  xy: 891, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 227, 19
+  xy: 891, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 javelin-ship
   rotate: false
-  xy: 269, 19
+  xy: 933, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-javelin-ship
   rotate: false
-  xy: 269, 19
+  xy: 933, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -5251,28 +5244,28 @@ discord-banner-over
   index: -1
 controller-cursor
   rotate: false
-  xy: 917, 321
+  xy: 881, 321
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-about
   rotate: false
-  xy: 391, 83
+  xy: 180, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-add
   rotate: false
-  xy: 180, 65
+  xy: 196, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-admin
   rotate: false
-  xy: 196, 65
+  xy: 212, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5293,224 +5286,224 @@ icon-areaDelete
   index: -1
 icon-arrow
   rotate: false
-  xy: 759, 236
+  xy: 741, 236
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 759, 236
+  xy: 741, 236
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-down
   rotate: false
-  xy: 1003, 381
+  xy: 311, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 723, 188
+  xy: 323, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 735, 188
+  xy: 335, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 747, 188
+  xy: 347, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-back
   rotate: false
-  xy: 759, 218
+  xy: 759, 254
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-ban
   rotate: false
-  xy: 212, 65
+  xy: 228, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-break
   rotate: false
-  xy: 777, 254
+  xy: 741, 218
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 777, 236
+  xy: 759, 236
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 759, 188
+  xy: 359, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-check
   rotate: false
-  xy: 777, 218
+  xy: 759, 218
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 771, 188
+  xy: 371, 21
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 783, 188
+  xy: 383, 23
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 383, 53
+  xy: 1003, 381
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 228, 65
+  xy: 244, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 244, 65
+  xy: 260, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 383, 41
+  xy: 1003, 369
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 260, 65
+  xy: 276, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 276, 65
+  xy: 292, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 292, 65
+  xy: 308, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 308, 65
+  xy: 324, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-elevation
   rotate: false
-  xy: 795, 260
+  xy: 777, 254
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-eraser
   rotate: false
-  xy: 795, 242
+  xy: 777, 236
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-exit
   rotate: false
-  xy: 324, 65
+  xy: 340, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 795, 224
+  xy: 777, 218
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 687, 195
+  xy: 795, 260
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 340, 65
+  xy: 356, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 705, 195
+  xy: 795, 242
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-floppy
   rotate: false
-  xy: 356, 65
+  xy: 372, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 723, 200
+  xy: 795, 224
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 372, 65
+  xy: 388, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5545,21 +5538,21 @@ icon-google-play
   index: -1
 icon-grid
   rotate: false
-  xy: 741, 200
+  xy: 687, 195
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-hold
   rotate: false
-  xy: 383, 29
+  xy: 1003, 357
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 381, 17
+  xy: 1003, 305
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5580,7 +5573,7 @@ icon-host
   index: -1
 icon-info
   rotate: false
-  xy: 486, 197
+  xy: 1003, 293
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5594,21 +5587,21 @@ icon-itch.io
   index: -1
 icon-item
   rotate: false
-  xy: 498, 197
+  xy: 1003, 281
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 237, 9
+  xy: 833, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 759, 200
+  xy: 705, 195
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5622,7 +5615,7 @@ icon-link
   index: -1
 icon-liquid
   rotate: false
-  xy: 510, 197
+  xy: 723, 188
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5636,35 +5629,35 @@ icon-load
   index: -1
 icon-load-image
   rotate: false
-  xy: 777, 200
+  xy: 723, 200
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 795, 206
+  xy: 741, 200
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 456, 142
+  xy: 759, 200
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 456, 124
+  xy: 777, 200
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 522, 197
+  xy: 735, 188
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5678,49 +5671,49 @@ icon-map
   index: -1
 icon-menu
   rotate: false
-  xy: 534, 197
+  xy: 747, 188
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 951, 335
+  xy: 795, 206
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-missing
   rotate: false
-  xy: 484, 185
+  xy: 759, 188
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 496, 185
+  xy: 771, 188
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 247, 9
+  xy: 833, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 508, 185
+  xy: 783, 188
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 969, 335
+  xy: 456, 142
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5734,14 +5727,14 @@ icon-pencil-small
   index: -1
 icon-pick
   rotate: false
-  xy: 987, 335
+  xy: 456, 124
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 520, 185
+  xy: 404, 69
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5755,21 +5748,21 @@ icon-play-2
   index: -1
 icon-players
   rotate: false
-  xy: 532, 185
+  xy: 399, 53
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 557, 194
+  xy: 486, 197
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 569, 194
+  xy: 498, 197
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5783,7 +5776,7 @@ icon-quit
   index: -1
 icon-redo
   rotate: false
-  xy: 951, 317
+  xy: 951, 335
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5804,7 +5797,7 @@ icon-rename
   index: -1
 icon-resize
   rotate: false
-  xy: 969, 317
+  xy: 969, 335
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5846,28 +5839,28 @@ icon-save
   index: -1
 icon-save-image
   rotate: false
-  xy: 987, 317
+  xy: 987, 335
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 177, 117
+  xy: 951, 317
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 581, 192
+  xy: 510, 197
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 195, 117
+  xy: 969, 317
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5881,14 +5874,14 @@ icon-tools
   index: -1
 icon-touch
   rotate: false
-  xy: 593, 192
+  xy: 522, 197
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 605, 192
+  xy: 534, 197
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5902,7 +5895,7 @@ icon-trash
   index: -1
 icon-trash-16
   rotate: false
-  xy: 213, 117
+  xy: 987, 317
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5923,14 +5916,14 @@ icon-tutorial
   index: -1
 icon-undo
   rotate: false
-  xy: 231, 117
+  xy: 177, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 617, 192
+  xy: 484, 185
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5944,7 +5937,7 @@ icon-unlocks
   index: -1
 icon-weapon
   rotate: false
-  xy: 629, 192
+  xy: 496, 185
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5958,14 +5951,14 @@ icon-wiki
   index: -1
 icon-zoom
   rotate: false
-  xy: 249, 117
+  xy: 195, 117
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 367, 33
+  xy: 383, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6153,21 +6146,21 @@ window-empty
   index: -1
 dagger
   rotate: false
-  xy: 849, 296
+  xy: 849, 310
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 drone
   rotate: false
-  xy: 935, 307
+  xy: 905, 307
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-drone
   rotate: false
-  xy: 935, 307
+  xy: 905, 307
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -6188,14 +6181,14 @@ unit-icon-fabricator
   index: -1
 interceptor
   rotate: false
-  xy: 255, 19
+  xy: 919, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-interceptor
   rotate: false
-  xy: 255, 19
+  xy: 919, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -6216,28 +6209,28 @@ unit-icon-monsoon
   index: -1
 power-cell
   rotate: false
-  xy: 863, 305
+  xy: 367, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 titan
   rotate: false
-  xy: 265, 81
+  xy: 319, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 titan-base
   rotate: false
-  xy: 301, 99
+  xy: 301, 81
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 titan-leg
   rotate: false
-  xy: 283, 81
+  xy: 337, 99
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6251,35 +6244,35 @@ blaster-equip
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 849, 310
+  xy: 383, 35
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 185, 19
+  xy: 933, 307
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 199, 19
+  xy: 863, 293
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 1003, 367
+  xy: 989, 289
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 949, 303
+  xy: 227, 19
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index de70589648..8a0b3142de 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/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java
index a00170a550..d86efbfe9f 100644
--- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java
+++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java
@@ -43,7 +43,7 @@ public class BlockIndexer{
     /**
      * Set of all ores that are being scanned.
      */
-    private final ObjectSet<Item> scanOres = ObjectSet.with(Items.tungsten, Items.coal, Items.lead, Items.thorium, Items.titanium);
+    private final ObjectSet<Item> scanOres = ObjectSet.with(Items.copper, Items.coal, Items.lead, Items.thorium, Items.titanium);
     private final ObjectSet<Item> itemSet = new ObjectSet<>();
     /**
      * Stores all ore quadtrants on the map.
diff --git a/core/src/io/anuke/mindustry/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java
index 1c784a4736..bf90b204b3 100644
--- a/core/src/io/anuke/mindustry/content/AmmoTypes.java
+++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java
@@ -10,10 +10,10 @@ import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.type.ContentList;
 
 public class AmmoTypes implements ContentList{
-    public static AmmoType bulletTungsten, bulletLead, bulletCarbide, bulletThorium, bulletSilicon, bulletPyratite,
+    public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite,
             shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile,
             flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge,
-            artilleryCarbide, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive,
+    artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive,
             basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid;
 
     @Override
@@ -21,37 +21,37 @@ public class AmmoTypes implements ContentList{
 
         //weapon specific
 
-        shotgunTungsten = new AmmoType(Items.tungsten, WeaponBullets.tungstenShotgun, 2){{
+        shotgunTungsten = new AmmoType(WeaponBullets.tungstenShotgun){{
             shootEffect = ShootFx.shootBig;
             smokeEffect = ShootFx.shootBigSmoke;
             recoil = 1f;
         }};
 
-        shellCarbide = new AmmoType(Items.carbide, WeaponBullets.shellCarbide, 2){{
+        shellCarbide = new AmmoType(WeaponBullets.shellCarbide){{
             shootEffect = ShootFx.shootBig;
             smokeEffect = ShootFx.shootBigSmoke;
         }};
 
-        bombExplosive = new AmmoType(Items.blastCompound, WeaponBullets.bombExplosive, 3){{
+        bombExplosive = new AmmoType(WeaponBullets.bombExplosive){{
             shootEffect = Fx.none;
             smokeEffect = Fx.none;
         }};
 
-        bombIncendiary = new AmmoType(Items.pyratite, WeaponBullets.bombIncendiary, 3){{
+        bombIncendiary = new AmmoType(WeaponBullets.bombIncendiary){{
             shootEffect = Fx.none;
             smokeEffect = Fx.none;
         }};
 
-        bombOil = new AmmoType(Items.coal, WeaponBullets.bombOil, 3){{
+        bombOil = new AmmoType(WeaponBullets.bombOil){{
             shootEffect = Fx.none;
             smokeEffect = Fx.none;
         }};
 
-        flamerThermite = new AmmoType(Items.pyratite, TurretBullets.basicFlame, 3){{
+        flamerThermite = new AmmoType(TurretBullets.basicFlame){{
             shootEffect = ShootFx.shootSmallFlame;
         }};
 
-        weaponMissile = new AmmoType(Items.carbide, MissileBullets.javelin, 2){{
+        weaponMissile = new AmmoType(MissileBullets.javelin){{
             shootEffect = BulletFx.hitBulletSmall;
             smokeEffect = Fx.none;
             reloadMultiplier = 1.2f;
@@ -59,20 +59,14 @@ public class AmmoTypes implements ContentList{
 
         //bullets
 
-        bulletLead = new AmmoType(Items.lead, StandardBullets.lead, 5){{
+        bulletCopper = new AmmoType(Items.copper, StandardBullets.copper, 5){{
             shootEffect = ShootFx.shootSmall;
             smokeEffect = ShootFx.shootSmallSmoke;
-            reloadMultiplier = 1.6f;
+            reloadMultiplier = 1f;
             inaccuracy = 5f;
         }};
 
-        bulletTungsten = new AmmoType(Items.tungsten, StandardBullets.tungsten, 2){{
-            shootEffect = ShootFx.shootSmall;
-            smokeEffect = ShootFx.shootSmallSmoke;
-            reloadMultiplier = 0.8f;
-        }};
-
-        bulletCarbide = new AmmoType(Items.carbide, StandardBullets.carbide, 2){{
+        bulletDense = new AmmoType(Items.densealloy, StandardBullets.dense, 2){{
             shootEffect = ShootFx.shootSmall;
             smokeEffect = ShootFx.shootSmallSmoke;
             reloadMultiplier = 0.6f;
@@ -138,7 +132,7 @@ public class AmmoTypes implements ContentList{
 
         //artillery
 
-        artilleryCarbide = new AmmoType(Items.carbide, ArtilleryBullets.carbide, 2){{
+        artilleryDense = new AmmoType(Items.densealloy, ArtilleryBullets.dense, 2){{
             shootEffect = ShootFx.shootBig2;
             smokeEffect = ShootFx.shootBigSmoke2;
         }};
@@ -183,7 +177,7 @@ public class AmmoTypes implements ContentList{
 
         meltdownLaser = new AmmoType(TurretBullets.lancerLaser);
 
-        fuseShotgun = new AmmoType(Items.tungsten, TurretBullets.fuseShot, 0.1f);
+        fuseShotgun = new AmmoType(Items.copper, TurretBullets.fuseShot, 0.1f);
 
         //liquid
 
diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java
index b626033490..e6736280f1 100644
--- a/core/src/io/anuke/mindustry/content/Items.java
+++ b/core/src/io/anuke/mindustry/content/Items.java
@@ -8,34 +8,34 @@ import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemType;
 
 public class Items implements ContentList{
-    public static Item stone, tungsten, lead, coal, carbide, titanium, thorium, silicon, plastanium, phasematter, surgealloy,
+    public static Item stone, copper, lead, densealloy, coal, titanium, thorium, silicon, plastanium, phasematter, surgealloy,
             biomatter, sand, blastCompound, pyratite;
 
     @Override
     public void load(){
-
-        tungsten = new Item("tungsten", Color.valueOf("a0b0c8")){{
-            type = ItemType.material;
-            hardness = 1;
-            cost = 0.75f;
-        }};
-
-        lead = new Item("lead", Color.valueOf("8e85a2")){{
+        copper = new Item("copper", Color.valueOf("d99d73")){{
             type = ItemType.material;
             hardness = 1;
             cost = 0.6f;
         }};
 
+        lead = new Item("lead", Color.valueOf("8c7fa9")){{
+            type = ItemType.material;
+            hardness = 1;
+            cost = 0.6f;
+        }};
+
+        densealloy = new Item("dense-alloy", Color.valueOf("b2c6d2")){{
+            type = ItemType.material;
+            cost = 1.2f;
+        }};
+
         coal = new Item("coal", Color.valueOf("272727")){{
             explosiveness = 0.2f;
             flammability = 0.5f;
             hardness = 2;
         }};
 
-        carbide = new Item("carbide", Color.valueOf("e2e2e2")){{
-            type = ItemType.material;
-        }};
-
         titanium = new Item("titanium", Color.valueOf("8da1e3")){{
             type = ItemType.material;
             hardness = 3;
@@ -59,7 +59,7 @@ public class Items implements ContentList{
             cost = 0.9f;
         }};
 
-        plastanium = new Item("plastanium", Color.valueOf("e9ead3")){{
+        plastanium = new Item("plastanium", Color.valueOf("cbd97f")){{
             type = ItemType.material;
             flammability = 0.1f;
             explosiveness = 0.1f;
@@ -71,16 +71,9 @@ public class Items implements ContentList{
             cost = 1.5f;
         }};
 
-        surgealloy = new Item("surge-alloy", Color.valueOf("b4d5c7")){
-            {
-                type = ItemType.material;
-            }
-
-            @Override
-            public boolean isHidden(){
-                return true;
-            }
-        };
+        surgealloy = new Item("surge-alloy", Color.valueOf("f3e979")){{
+            type = ItemType.material;
+        }};
 
         biomatter = new Item("biomatter", Color.valueOf("648b55")){{
             flammability = 0.4f;
diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java
index 94c07d684c..37ec9de4a1 100644
--- a/core/src/io/anuke/mindustry/content/Recipes.java
+++ b/core/src/io/anuke/mindustry/content/Recipes.java
@@ -4,9 +4,8 @@ import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.content.blocks.*;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.game.GameMode;
-import io.anuke.mindustry.type.ContentList;
-import io.anuke.mindustry.type.ItemStack;
-import io.anuke.mindustry.type.Recipe;
+import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.world.Block;
 
 import static io.anuke.mindustry.type.Category.*;
 
@@ -15,122 +14,126 @@ public class Recipes implements ContentList{
     @Override
     public void load(){
         //WALLS
-        new Recipe(defense, DefenseBlocks.tungstenWall, new ItemStack(Items.tungsten, 12));
-        new Recipe(defense, DefenseBlocks.tungstenWallLarge, new ItemStack(Items.tungsten, 12 * 4));
+        new Recipe(defense, DefenseBlocks.copperWall, new ItemStack(Items.copper, 12));
+        new Recipe(defense, DefenseBlocks.copperWallLarge, new ItemStack(Items.copper, 12 * 4));
 
-        new Recipe(defense, DefenseBlocks.carbideWall, new ItemStack(Items.carbide, 12));
-        new Recipe(defense, DefenseBlocks.carbideWallLarge, new ItemStack(Items.carbide, 12 * 4));
+        new Recipe(defense, DefenseBlocks.compositeWall, new ItemStack(Items.densealloy, 12));
+        new Recipe(defense, DefenseBlocks.compositeWallLarge, new ItemStack(Items.densealloy, 12 * 4));
 
         new Recipe(defense, DefenseBlocks.thoriumWall, new ItemStack(Items.thorium, 12));
         new Recipe(defense, DefenseBlocks.thoriumWallLarge, new ItemStack(Items.thorium, 12 * 4));
 
-        new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.carbide, 12), new ItemStack(Items.silicon, 8));
-        new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.carbide, 12 * 4), new ItemStack(Items.silicon, 8 * 4));
+        //TODO will be added once sprites are ready
+        //new Recipe(defense, DefenseBlocks.phaseWall, new ItemStack(Items.phasematter, 12));
+        //new Recipe(defense, DefenseBlocks.phaseWallLarge, new ItemStack(Items.phasematter, 12 * 4));
+
+        new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.densealloy, 12), new ItemStack(Items.silicon, 8));
+        new Recipe(defense, DefenseBlocks.doorLarge, new ItemStack(Items.densealloy, 12 * 4), new ItemStack(Items.silicon, 8 * 4));
 
         //TURRETS
-        new Recipe(weapon, TurretBlocks.duo, new ItemStack(Items.tungsten, 40));
-        new Recipe(weapon, TurretBlocks.scorch, new ItemStack(Items.tungsten, 50), new ItemStack(Items.carbide, 20));
-        new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.tungsten, 60), new ItemStack(Items.carbide, 35));
+        new Recipe(weapon, TurretBlocks.duo, new ItemStack(Items.copper, 40));
+        new Recipe(weapon, TurretBlocks.scorch, new ItemStack(Items.copper, 50), new ItemStack(Items.densealloy, 20));
+        new Recipe(weapon, TurretBlocks.hail, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 35));
 
-        new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.tungsten, 50), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 90));
-        new Recipe(weapon, TurretBlocks.wave, new ItemStack(Items.carbide, 60), new ItemStack(Items.titanium, 70), new ItemStack(Items.lead, 150));
-        new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.carbide, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60));
-        new Recipe(weapon, TurretBlocks.salvo, new ItemStack(Items.tungsten, 210), new ItemStack(Items.carbide, 190), new ItemStack(Items.thorium, 130));
-        new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.tungsten, 300), new ItemStack(Items.carbide, 220), new ItemStack(Items.thorium, 120));
+        new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 90));
+        new Recipe(weapon, TurretBlocks.wave, new ItemStack(Items.densealloy, 60), new ItemStack(Items.titanium, 70), new ItemStack(Items.lead, 150));
+        new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.densealloy, 70), new ItemStack(Items.titanium, 70), new ItemStack(Items.plastanium, 90), new ItemStack(Items.silicon, 60));
+        new Recipe(weapon, TurretBlocks.salvo, new ItemStack(Items.copper, 210), new ItemStack(Items.densealloy, 190), new ItemStack(Items.thorium, 130));
+        new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 220), new ItemStack(Items.thorium, 120));
 
         //DISTRIBUTION
-        new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.lead, 1));
-        new Recipe(distribution, DistributionBlocks.titaniumconveyor, new ItemStack(Items.lead, 2), new ItemStack(Items.titanium, 1));
-        new Recipe(distribution, DistributionBlocks.phaseConveyor, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.carbide, 20));
+        new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.copper, 1));
+        new Recipe(distribution, DistributionBlocks.titaniumconveyor, new ItemStack(Items.copper, 2), new ItemStack(Items.titanium, 1));
+        new Recipe(distribution, DistributionBlocks.phaseConveyor, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.densealloy, 20));
 
         //starter lead transporation
-        new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.lead, 2));
-        new Recipe(distribution, DistributionBlocks.splitter, new ItemStack(Items.lead, 6));
+        new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.copper, 2));
+        new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.copper, 6));
 
-        //advanced carbide transporation
-        new Recipe(distribution, DistributionBlocks.distributor, new ItemStack(Items.carbide, 8), new ItemStack(Items.tungsten, 8));
-        new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.carbide, 4), new ItemStack(Items.tungsten, 4));
-        new Recipe(distribution, DistributionBlocks.overflowGate, new ItemStack(Items.carbide, 4), new ItemStack(Items.tungsten, 8));
-        new Recipe(distribution, DistributionBlocks.bridgeConveyor, new ItemStack(Items.carbide, 8), new ItemStack(Items.tungsten, 8));
-        new Recipe(distribution, DistributionBlocks.massDriver, new ItemStack(Items.carbide, 400), new ItemStack(Items.silicon, 300), new ItemStack(Items.lead, 400), new ItemStack(Items.thorium, 250));
+        //advanced densealloy transporation
+        new Recipe(distribution, DistributionBlocks.distributor, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8));
+        new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 4));
+        new Recipe(distribution, DistributionBlocks.overflowGate, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 8));
+        new Recipe(distribution, DistributionBlocks.bridgeConveyor, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8));
+        new Recipe(distribution, DistributionBlocks.massDriver, new ItemStack(Items.densealloy, 400), new ItemStack(Items.silicon, 300), new ItemStack(Items.lead, 400), new ItemStack(Items.thorium, 250));
 
         //CRAFTING
 
         //smelting
-        new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.tungsten, 70));
-        new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.tungsten, 90), new ItemStack(Items.carbide, 60), new ItemStack(Items.lead, 50));
-        new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.tungsten, 60), new ItemStack(Items.lead, 50));
+        new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.copper, 70));
+        new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.copper, 90), new ItemStack(Items.densealloy, 60), new ItemStack(Items.lead, 50));
+        new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50));
 
         //advanced fabrication
-        new Recipe(crafting, CraftingBlocks.plastaniumCompressor, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 230), new ItemStack(Items.carbide, 120), new ItemStack(Items.titanium, 160));
+        new Recipe(crafting, CraftingBlocks.plastaniumCompressor, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 230), new ItemStack(Items.densealloy, 120), new ItemStack(Items.titanium, 160));
         new Recipe(crafting, CraftingBlocks.phaseWeaver, new ItemStack(Items.silicon, 260), new ItemStack(Items.lead, 240), new ItemStack(Items.thorium, 150));
 
         //TODO implement alloy smelter
         //new Recipe(crafting, CraftingBlocks.alloySmelter, new ItemStack(Items.silicon, 160), new ItemStack(Items.lead, 160), new ItemStack(Items.thorium, 140));
 
         //misc
-        new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.tungsten, 60), new ItemStack(Items.lead, 50));
-        new Recipe(crafting, CraftingBlocks.pyratiteMixer, new ItemStack(Items.tungsten, 100), new ItemStack(Items.lead, 50));
-        new Recipe(crafting, CraftingBlocks.blastMixer, new ItemStack(Items.lead, 60), new ItemStack(Items.carbide, 40));
+        new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 50));
+        new Recipe(crafting, CraftingBlocks.pyratiteMixer, new ItemStack(Items.copper, 100), new ItemStack(Items.lead, 50));
+        new Recipe(crafting, CraftingBlocks.blastMixer, new ItemStack(Items.lead, 60), new ItemStack(Items.densealloy, 40));
         new Recipe(crafting, CraftingBlocks.cryofluidmixer, new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 80), new ItemStack(Items.thorium, 90));
 
-        new Recipe(crafting, CraftingBlocks.solidifier, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 20));
-        new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.tungsten, 60), new ItemStack(Items.lead, 70), new ItemStack(Items.carbide, 90));
-        new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.carbide, 10), new ItemStack(Items.lead, 30));
+        new Recipe(crafting, CraftingBlocks.solidifier, new ItemStack(Items.densealloy, 30), new ItemStack(Items.copper, 20));
+        new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.copper, 60), new ItemStack(Items.lead, 70), new ItemStack(Items.densealloy, 90));
+        new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.densealloy, 10), new ItemStack(Items.lead, 30));
 
         //processing
         new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.lead, 70), new ItemStack(Items.silicon, 60));
-        new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.tungsten, 60), new ItemStack(Items.carbide, 50));
-        new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.tungsten, 130), new ItemStack(Items.carbide, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50));
+        new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50));
+        new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50));
 
         //POWER
-        new Recipe(power, PowerBlocks.powerNode, new ItemStack(Items.tungsten, 2), new ItemStack(Items.lead, 6))
+        new Recipe(power, PowerBlocks.powerNode, new ItemStack(Items.copper, 2), new ItemStack(Items.lead, 6))
                 .setDependencies(PowerBlocks.combustionGenerator);
-        new Recipe(power, PowerBlocks.powerNodeLarge, new ItemStack(Items.carbide, 10), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6))
+        new Recipe(power, PowerBlocks.powerNodeLarge, new ItemStack(Items.densealloy, 10), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6))
                 .setDependencies(PowerBlocks.powerNode);
-        new Recipe(power, PowerBlocks.battery, new ItemStack(Items.tungsten, 8), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 4))
+        new Recipe(power, PowerBlocks.battery, new ItemStack(Items.copper, 8), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 4))
                 .setDependencies(PowerBlocks.powerNode);
-        new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.carbide, 40), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 30))
+        new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.densealloy, 40), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 30))
                 .setDependencies(PowerBlocks.powerNode);
 
         //generators - combustion
-        new Recipe(power, PowerBlocks.combustionGenerator, new ItemStack(Items.tungsten, 50), new ItemStack(Items.lead, 30));
-        new Recipe(power, PowerBlocks.turbineGenerator, new ItemStack(Items.tungsten, 70), new ItemStack(Items.carbide, 50), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 60));
-        new Recipe(power, PowerBlocks.thermalGenerator, new ItemStack(Items.tungsten, 80), new ItemStack(Items.carbide, 70), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 70), new ItemStack(Items.thorium, 70));
+        new Recipe(power, PowerBlocks.combustionGenerator, new ItemStack(Items.copper, 50), new ItemStack(Items.lead, 30));
+        new Recipe(power, PowerBlocks.turbineGenerator, new ItemStack(Items.copper, 70), new ItemStack(Items.densealloy, 50), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 60));
+        new Recipe(power, PowerBlocks.thermalGenerator, new ItemStack(Items.copper, 80), new ItemStack(Items.densealloy, 70), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 70), new ItemStack(Items.thorium, 70));
 
         //generators - solar
         new Recipe(power, PowerBlocks.solarPanel, new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 30));
         new Recipe(power, PowerBlocks.largeSolarPanel, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 290), new ItemStack(Items.phasematter, 30));
 
         //generators - other
-        new Recipe(power, PowerBlocks.nuclearReactor, new ItemStack(Items.lead, 600), new ItemStack(Items.silicon, 400), new ItemStack(Items.carbide, 300), new ItemStack(Items.thorium, 300));
+        new Recipe(power, PowerBlocks.thoriumReactor, new ItemStack(Items.lead, 600), new ItemStack(Items.silicon, 400), new ItemStack(Items.densealloy, 300), new ItemStack(Items.thorium, 300));
 
-        //new Recipe(distribution, StorageBlocks.core, new ItemStack(Items.carbide, 50));
-        new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.carbide, 40), new ItemStack(Items.silicon, 50));
-        new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.carbide, 500), new ItemStack(Items.thorium, 350));
+        //new Recipe(distribution, StorageBlocks.core, new ItemStack(Items.densealloy, 50));
+        new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.densealloy, 40), new ItemStack(Items.silicon, 50));
+        new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.densealloy, 500), new ItemStack(Items.thorium, 350));
 
         //DRILLS, PRODUCERS
-        new Recipe(production, ProductionBlocks.tungstenDrill, new ItemStack(Items.tungsten, 50));
-        new Recipe(production, ProductionBlocks.carbideDrill, new ItemStack(Items.tungsten, 60), new ItemStack(Items.carbide, 50));
-        new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.tungsten, 70), new ItemStack(Items.carbide, 90), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50));
-        new Recipe(production, ProductionBlocks.blastdrill, new ItemStack(Items.tungsten, 130), new ItemStack(Items.carbide, 180), new ItemStack(Items.silicon, 120), new ItemStack(Items.titanium, 100), new ItemStack(Items.thorium, 60));
+        new Recipe(production, ProductionBlocks.mechanicalDrill, new ItemStack(Items.copper, 50));
+        new Recipe(production, ProductionBlocks.pneumaticDrill, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50));
+        new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.copper, 70), new ItemStack(Items.densealloy, 90), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50));
+        new Recipe(production, ProductionBlocks.blastdrill, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 180), new ItemStack(Items.silicon, 120), new ItemStack(Items.titanium, 100), new ItemStack(Items.thorium, 60));
 
-        new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.tungsten, 50), new ItemStack(Items.carbide, 50), new ItemStack(Items.lead, 40));
-        new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.tungsten, 20), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 20));
-        new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.tungsten, 300), new ItemStack(Items.carbide, 350), new ItemStack(Items.lead, 230), new ItemStack(Items.thorium, 230), new ItemStack(Items.silicon, 150));
+        new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.copper, 50), new ItemStack(Items.densealloy, 50), new ItemStack(Items.lead, 40));
+        new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.copper, 20), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 20));
+        new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.copper, 300), new ItemStack(Items.densealloy, 350), new ItemStack(Items.lead, 230), new ItemStack(Items.thorium, 230), new ItemStack(Items.silicon, 150));
 
         //UNITS
 
         //bodies
         new Recipe(units, UpgradeBlocks.dartFactory, new ItemStack(Items.lead, 150), new ItemStack(Items.silicon, 200), new ItemStack(Items.titanium, 240)).setDesktop(); //dart is desktop only, because it's the starter mobile ship
         new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.lead, 200), new ItemStack(Items.silicon, 250), new ItemStack(Items.titanium, 300), new ItemStack(Items.plastanium, 200));
-        new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.carbide, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop();
+        new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.densealloy, 160), new ItemStack(Items.silicon, 220), new ItemStack(Items.titanium, 250)).setDesktop();
 
-        //new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.tungsten, 30), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 30));
+        //new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 30));
 
         //actual unit related stuff
-        new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.tungsten, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130));
-        new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.carbide, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210));
+        new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.copper, 70), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 130));
+        new Recipe(units, UnitBlocks.fabricatorPad, new ItemStack(Items.densealloy, 90), new ItemStack(Items.thorium, 80), new ItemStack(Items.lead, 110), new ItemStack(Items.silicon, 210));
 
         new Recipe(units, UnitBlocks.daggerPad, new ItemStack(Items.lead, 90), new ItemStack(Items.silicon, 80)).setMode(GameMode.noWaves);
         new Recipe(units, UnitBlocks.titanPad, new ItemStack(Items.thorium, 90), new ItemStack(Items.lead, 140), new ItemStack(Items.silicon, 90)).setMode(GameMode.noWaves);
@@ -138,146 +141,66 @@ public class Recipes implements ContentList{
         new Recipe(units, UnitBlocks.interceptorPad, new ItemStack(Items.titanium, 60), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 90)).setMode(GameMode.noWaves);
         new Recipe(units, UnitBlocks.monsoonPad, new ItemStack(Items.plastanium, 80), new ItemStack(Items.titanium, 100), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 220)).setMode(GameMode.noWaves);
 
-        new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 30));
-        new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.carbide, 100), new ItemStack(Items.silicon, 200)).setMode(GameMode.noWaves);
+        new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30));
+        new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)).setMode(GameMode.noWaves);
 
         //LIQUIDS
-        new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1))
-                .setDependencies(CraftingBlocks.smelter);
+        new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)).setDependencies(CraftingBlocks.smelter);
         new Recipe(liquid, LiquidBlocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.lead, 1));
         new Recipe(liquid, LiquidBlocks.phaseConduit, new ItemStack(Items.phasematter, 10), new ItemStack(Items.silicon, 15), new ItemStack(Items.lead, 20), new ItemStack(Items.titanium, 20));
 
-        new Recipe(liquid, LiquidBlocks.liquidRouter, new ItemStack(Items.carbide, 4), new ItemStack(Items.lead, 4));
-        new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50), new ItemStack(Items.carbide, 20));
-        new Recipe(liquid, LiquidBlocks.liquidJunction, new ItemStack(Items.carbide, 4), new ItemStack(Items.lead, 4));
-        new Recipe(liquid, LiquidBlocks.bridgeConduit, new ItemStack(Items.carbide, 8), new ItemStack(Items.lead, 8));
+        new Recipe(liquid, LiquidBlocks.liquidRouter, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4));
+        new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50));
+        new Recipe(liquid, LiquidBlocks.liquidJunction, new ItemStack(Items.titanium, 4), new ItemStack(Items.lead, 4));
+        new Recipe(liquid, LiquidBlocks.bridgeConduit, new ItemStack(Items.titanium, 8), new ItemStack(Items.lead, 8));
 
-        new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.tungsten, 30), new ItemStack(Items.lead, 20))
-                .setDependencies(CraftingBlocks.smelter);
-        new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.tungsten, 140), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 70));
-        new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.tungsten, 160), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 80), new ItemStack(Items.thorium, 70));
+        new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.copper, 30), new ItemStack(Items.lead, 20)).setDependencies(CraftingBlocks.smelter);
+        new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.copper, 140), new ItemStack(Items.lead, 100), new ItemStack(Items.silicon, 40), new ItemStack(Items.titanium, 70));
+        new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.copper, 160), new ItemStack(Items.lead, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 80), new ItemStack(Items.thorium, 70));
 
         //DEBUG
-        new Recipe(units, DebugBlocks.itemSource, new ItemStack(Items.carbide, 10)).setDebug();
-        new Recipe(units, DebugBlocks.itemVoid, new ItemStack(Items.carbide, 10)).setDebug();
-        new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.carbide, 10)).setDebug();
-        new Recipe(units, DebugBlocks.powerVoid, new ItemStack(Items.carbide, 10)).setDebug();
-        new Recipe(units, DebugBlocks.powerInfinite, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)).setDebug();
-        //new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5));
+        new Recipe(units, DebugBlocks.itemSource).setDebug();
+        new Recipe(units, DebugBlocks.itemVoid).setDebug();
+        new Recipe(units, DebugBlocks.liquidSource).setDebug();
+        new Recipe(units, DebugBlocks.powerVoid).setDebug();
+        new Recipe(units, DebugBlocks.powerInfinite).setDebug();
+    }
 
-        /*
-        new Recipe(production, ProductionBlocks.nucleardrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.plasmadrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));*/
-
-
-
-        /*
-
-        new Recipe(defense, DefenseBlocks.steelwall, new ItemStack(Items.carbide, 12));
-        new Recipe(defense, DefenseBlocks.titaniumwall, new ItemStack(Items.titanium, 12));
-        new Recipe(defense, DefenseBlocks.diriumwall, new ItemStack(Items.surgealloy, 12));
-        new Recipe(defense, DefenseBlocks.steelwalllarge, new ItemStack(Items.carbide, 12 * 4));
-        new Recipe(defense, DefenseBlocks.titaniumwalllarge, new ItemStack(Items.titanium, 12 * 4));
-        new Recipe(defense, DefenseBlocks.diriumwall, new ItemStack(Items.surgealloy, 12 * 4));
-        new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3 * 4));
-        new Recipe(defense, DefenseBlocks.largedoor, new ItemStack(Items.carbide, 3 * 4), new ItemStack(Items.tungsten, 3 * 4 * 4));
-        new Recipe(defense, DefenseBlocks.deflectorwall, new ItemStack(Items.titanium, 1));
-        new Recipe(defense, DefenseBlocks.deflectorwalllarge, new ItemStack(Items.titanium, 1));
-        new Recipe(defense, DefenseBlocks.phasewall, new ItemStack(Items.titanium, 1));
-        new Recipe(defense, DefenseBlocks.phasewalllarge, new ItemStack(Items.titanium, 1));
-
-        new Recipe(weapon, TurretBlocks.wave, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.lancer, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.arc, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.swarmer, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.fuse, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.ripple, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.cyclone, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.spectre, new ItemStack(Items.tungsten, 1));
-        new Recipe(weapon, TurretBlocks.meltdown, new ItemStack(Items.tungsten, 1));
-
-        new Recipe(crafting, CraftingBlocks.alloysmelter, new ItemStack(Items.titanium, 50), new ItemStack(Items.carbide, 50));
-        new Recipe(crafting, CraftingBlocks.alloyfuser, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
-
-        new Recipe(crafting, CraftingBlocks.phaseWeaver, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
-        new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
-        new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
-        new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
-        new Recipe(crafting, CraftingBlocks.oilRefinery, new ItemStack(Items.carbide, 15), new ItemStack(Items.tungsten, 15));
-        new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.carbide, 15), new ItemStack(Items.tungsten, 15));
-        new Recipe(crafting, CraftingBlocks.plastaniumCompressor, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15));
-        new Recipe(crafting, CraftingBlocks.cryofluidmixer, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15));
-        new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.carbide, 10), new ItemStack(Items.tungsten, 10));
-        new Recipe(crafting, CraftingBlocks.stoneFormer, new ItemStack(Items.carbide, 10), new ItemStack(Items.tungsten, 10));
-        new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15));
-        new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.carbide, 60), new ItemStack(Items.tungsten, 60));
-
-        new Recipe(production, ProductionBlocks.tungstenDrill, new ItemStack(Items.tungsten, 25));
-        new Recipe(production, ProductionBlocks.reinforcedDrill, new ItemStack(Items.tungsten, 25));
-        new Recipe(production, ProductionBlocks.carbideDrill, new ItemStack(Items.tungsten, 25));
-        new Recipe(production, ProductionBlocks.titaniumDrill, new ItemStack(Items.tungsten, 25));
-        new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.nucleardrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.plasmadrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.cultivator, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-        new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
-
-        new Recipe(power, PowerBlocks.powerNode, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3));
-        new Recipe(power, PowerBlocks.powerNodeLarge, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3));
-        new Recipe(power, PowerBlocks.battery, new ItemStack(Items.carbide, 5), new ItemStack(Items.tungsten, 5));
-        new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.carbide, 5), new ItemStack(Items.tungsten, 5));
-        new Recipe(power, PowerBlocks.combustionGenerator, new ItemStack(Items.tungsten, 1));
-
-        new Recipe(power, PowerBlocks.turbineGenerator, new ItemStack(Items.tungsten, 1));
-        new Recipe(power, PowerBlocks.thermalGenerator, new ItemStack(Items.carbide, 1));
-        new Recipe(power, PowerBlocks.rtgGenerator, new ItemStack(Items.titanium, 1), new ItemStack(Items.carbide, 1));
-        new Recipe(power, PowerBlocks.solarPanel, new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 20));
-        new Recipe(power, PowerBlocks.largeSolarPanel, new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 20));
-        new Recipe(power, PowerBlocks.nuclearReactor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40), new ItemStack(Items.carbide, 50));
-        new Recipe(power, PowerBlocks.fusionReactor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40), new ItemStack(Items.carbide, 50));
-
-        new Recipe(distribution, PowerBlocks.warpGate, new ItemStack(Items.carbide, 1));
-
-        new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.carbide, 1));
-        new Recipe(liquid, LiquidBlocks.pulseConduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.carbide, 1));
-        new Recipe(liquid, LiquidBlocks.liquidRouter, new ItemStack(Items.carbide, 2));
-        new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.carbide, 2));
-        new Recipe(liquid, LiquidBlocks.liquidJunction, new ItemStack(Items.carbide, 2));
-        new Recipe(liquid, LiquidBlocks.bridgeConduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.carbide, 2));
-        new Recipe(liquid, LiquidBlocks.phaseConduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.carbide, 2));
-
-        new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.carbide, 10));
-        new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5));
-        new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5));
-
-        new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.carbide, 10));
-        new Recipe(units, UnitBlocks.dropPoint, new ItemStack(Items.carbide, 10));
-        new Recipe(units, UnitBlocks.resupplyPoint, new ItemStack(Items.carbide, 10));
-
-        new Recipe(units, UnitBlocks.dronePad, new ItemStack(Items.tungsten, 50));
-        new Recipe(units, UnitBlocks.reconstructor, new ItemStack(Items.tungsten, 1));
-
-        new Recipe(units, UnitBlocks.overdriveProjector, new ItemStack(Items.tungsten, 1));
-        new Recipe(units, UnitBlocks.shieldProjector, new ItemStack(Items.tungsten, 1));
-
-        new Recipe(units, UpgradeBlocks.omegaFactory, new ItemStack(Items.tungsten, 1));
-        new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.tungsten, 1));
-        new Recipe(units, UpgradeBlocks.tauFactory, new ItemStack(Items.tungsten, 1));
-
-        new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.tungsten, 1));
-        new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.tungsten, 1));
-        new Recipe(units, UpgradeBlocks.halberdFactory, new ItemStack(Items.tungsten, 1));
-
-        new Recipe(units, DebugBlocks.itemSource, new ItemStack(Items.carbide, 10)).setDebug();
-        new Recipe(units, DebugBlocks.itemVoid, new ItemStack(Items.carbide, 10)).setDebug();
-        new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.carbide, 10)).setDebug();
-        new Recipe(units, DebugBlocks.powerVoid, new ItemStack(Items.carbide, 10)).setDebug();
-        new Recipe(units, DebugBlocks.powerInfinite, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)).setDebug();*/
+    static void init(Object... objects){
+        Category cat = null;
+        Block block = null;
+        ItemStack stack = null;
+        Array<ItemStack> arr = new Array<>();
+        for(Object object : objects){
+            if(object instanceof Category){
+                if(stack != null) throw new RuntimeException("Finish defining stack before beginning category");
+                if(block != null){
+                    new Recipe(cat, block, arr.toArray(ItemStack.class));
+                    block = null;
+                    stack = null;
+                    arr.clear();
+                }
+                cat = (Category) object;
+            }else if(object instanceof Block){
+                if(cat == null) throw new RuntimeException("Finish defining category before beginning blocks");
+                if(block != null){
+                    new Recipe(cat, block, arr.toArray(ItemStack.class));
+                    stack = null;
+                    arr.clear();
+                }
+                block = (Block) object;
+                arr.clear();
+            }else if(object instanceof Item){
+                if(block == null) throw new RuntimeException("Finish defining block before defining item");
+                if(stack != null) throw new RuntimeException("Finish defining stack before defining another stack");
+                stack = new ItemStack((Item) object, 1);
+            }else if(object instanceof Integer){
+                if(stack == null) throw new RuntimeException("Finish defining item before defining item amount");
+                stack.amount = (Integer) object;
+                arr.add(stack);
+                stack = null;
+            }
+        }
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java
index a61780afef..247582a11f 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/io/anuke/mindustry/content/UnitTypes.java
@@ -71,7 +71,7 @@ public class UnitTypes implements ContentList{
             buildPower = 0.9f;
             minePower = 1.1f;
             healSpeed = 0.09f;
-            toMine = ObjectSet.with(Items.lead, Items.tungsten, Items.titanium);
+            toMine = ObjectSet.with(Items.lead, Items.copper, Items.titanium);
         }};
     }
 
diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java
index 7909578967..f9b5d29477 100644
--- a/core/src/io/anuke/mindustry/content/Weapons.java
+++ b/core/src/io/anuke/mindustry/content/Weapons.java
@@ -19,7 +19,7 @@ public class Weapons implements ContentList{
             reload = 15f;
             roundrobin = true;
             ejectEffect = ShootFx.shellEjectSmall;
-            ammo = AmmoTypes.bulletLead;
+            ammo = AmmoTypes.bulletCopper;
         }};
 
         missiles = new Weapon("missiles"){{
@@ -38,7 +38,7 @@ public class Weapons implements ContentList{
             reload = 28f;
             roundrobin = true;
             ejectEffect = ShootFx.shellEjectSmall;
-            ammo = AmmoTypes.bulletLead;
+            ammo = AmmoTypes.bulletCopper;
         }};
 
         shockgun = new Weapon("shockgun"){{
@@ -79,7 +79,7 @@ public class Weapons implements ContentList{
             reload = 12f;
             roundrobin = true;
             ejectEffect = ShootFx.shellEjectSmall;
-            ammo = AmmoTypes.bulletCarbide;
+            ammo = AmmoTypes.bulletDense;
         }};
 
         swarmer = new Weapon("swarmer"){{
diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
index 30ede8ab19..f7e04cfa32 100644
--- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
@@ -5,7 +5,6 @@ import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.content.fx.BlockFx;
 import io.anuke.mindustry.type.ContentList;
-import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.blocks.production.*;
@@ -19,26 +18,26 @@ public class CraftingBlocks extends BlockList implements ContentList{
     public void load(){
         smelter = new Smelter("smelter"){{
             health = 70;
-            result = Items.carbide;
+            result = Items.densealloy;
             craftTime = 45f;
             burnDuration = 46f;
             useFlux = true;
 
-            consumes.items(new ItemStack[]{new ItemStack(Items.tungsten, 3)});
+            consumes.items(new ItemStack[]{new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)});
             consumes.item(Items.coal).optional(true);
         }};
 
         arcsmelter = new PowerSmelter("arc-smelter"){{
             health = 90;
             craftEffect = BlockFx.smeltsmoke;
-            result = Items.carbide;
+            result = Items.densealloy;
             craftTime = 30f;
             size = 2;
 
             useFlux = true;
             fluxNeeded = 2;
 
-            consumes.items(new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.tungsten, 2)});
+            consumes.items(new ItemStack[]{new ItemStack(Items.copper, 1), new ItemStack(Items.lead, 2)});
             consumes.power(0.1f);
         }};
 
@@ -163,14 +162,14 @@ public class CraftingBlocks extends BlockList implements ContentList{
         }};
 
         separator = new Separator("separator"){{
-            results = new Item[]{
-                null, null, null, null, null, null, null, null, null, null,
-                Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand,
-                Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone,
-                Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten,
-                Items.lead, Items.lead,
-                Items.coal, Items.coal,
-                Items.titanium
+            results = new ItemStack[]{
+                new ItemStack(null, 10),
+                new ItemStack(Items.sand, 10),
+                new ItemStack(Items.stone, 9),
+                new ItemStack(Items.copper, 4),
+                new ItemStack(Items.lead, 2),
+                new ItemStack(Items.coal, 2),
+                new ItemStack(Items.titanium, 1),
             };
             filterTime = 40f;
             itemCapacity = 40;
@@ -181,15 +180,15 @@ public class CraftingBlocks extends BlockList implements ContentList{
         }};
 
         centrifuge = new Separator("centrifuge"){{
-            results = new Item[]{
-                null, null, null, null, null, null, null, null, null, null, null, null, null,
-                Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand,
-                Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone,
-                Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten,
-                Items.lead, Items.lead, Items.lead,
-                Items.coal, Items.coal, Items.coal,
-                Items.titanium, Items.titanium,
-                Items.thorium,
+            results = new ItemStack[]{
+                new ItemStack(null, 13),
+                new ItemStack(Items.sand, 12),
+                new ItemStack(Items.stone, 11),
+                new ItemStack(Items.copper, 5),
+                new ItemStack(Items.lead, 3),
+                new ItemStack(Items.coal, 3),
+                new ItemStack(Items.titanium, 2),
+                new ItemStack(Items.thorium, 1)
             };
 
             hasPower = true;
diff --git a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
index ca40928d80..96b2542fde 100644
--- a/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java
@@ -9,27 +9,27 @@ import io.anuke.mindustry.world.blocks.defense.Door;
 import io.anuke.mindustry.world.blocks.defense.PhaseWall;
 
 public class DefenseBlocks extends BlockList implements ContentList{
-    public static Block tungstenWall, tungstenWallLarge, carbideWall, carbideWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, deflectorwall, deflectorwalllarge,
-            phasewall, phasewalllarge;
+    public static Block copperWall, copperWallLarge, compositeWall, compositeWallLarge, thoriumWall, thoriumWallLarge, door, doorLarge, deflectorwall, deflectorwalllarge,
+            phaseWall, phaseWallLarge;
 
     @Override
     public void load(){
         int wallHealthMultiplier = 4;
 
-        tungstenWall = new Wall("tungsten-wall"){{
+        copperWall = new Wall("copper-wall"){{
             health = 80 * wallHealthMultiplier;
         }};
 
-        tungstenWallLarge = new Wall("tungsten-wall-large"){{
+        copperWallLarge = new Wall("copper-wall-large"){{
             health = 80 * 4 * wallHealthMultiplier;
             size = 2;
         }};
 
-        carbideWall = new Wall("carbide-wall"){{
+        compositeWall = new Wall("composite-wall"){{
             health = 110 * wallHealthMultiplier;
         }};
 
-        carbideWallLarge = new Wall("carbide-wall-large"){{
+        compositeWallLarge = new Wall("composite-wall-large"){{
             health = 110 * wallHealthMultiplier * 4;
             size = 2;
         }};
@@ -52,11 +52,11 @@ public class DefenseBlocks extends BlockList implements ContentList{
             size = 2;
         }};
 
-        phasewall = new PhaseWall("phase-wall"){{
+        phaseWall = new PhaseWall("phase-wall"){{
             health = 150 * wallHealthMultiplier;
         }};
 
-        phasewalllarge = new PhaseWall("phase-wall-large"){{
+        phaseWallLarge = new PhaseWall("phase-wall-large"){{
             health = 150 * 4 * wallHealthMultiplier;
             size = 2;
             regenSpeed = 0.5f;
diff --git a/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java
index f55abaccc3..c5696fb30e 100644
--- a/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/DistributionBlocks.java
@@ -6,7 +6,7 @@ import io.anuke.mindustry.world.blocks.distribution.*;
 
 public class DistributionBlocks extends BlockList implements ContentList{
     public static Block conveyor, titaniumconveyor, distributor, junction,
-            bridgeConveyor, phaseConveyor, sorter, splitter, overflowGate, massDriver;
+            bridgeConveyor, phaseConveyor, sorter, router, overflowGate, massDriver;
 
     @Override
     public void load(){
@@ -39,9 +39,9 @@ public class DistributionBlocks extends BlockList implements ContentList{
 
         sorter = new Sorter("sorter");
 
-        splitter = new Splitter("splitter");
+        router = new Router("router");
 
-        distributor = new Splitter("distributor"){{
+        distributor = new Router("distributor"){{
             size = 2;
         }};
 
diff --git a/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java b/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java
index 4cb86032f8..bc2cbcfb2c 100644
--- a/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/OreBlocks.java
@@ -19,7 +19,7 @@ public class OreBlocks extends BlockList{
 
     @Override
     public void load(){
-        Item[] ores = {Items.tungsten, Items.lead, Items.coal, Items.titanium, Items.thorium};
+        Item[] ores = {Items.copper, Items.lead, Items.coal, Items.titanium, Items.thorium};
 
         for(Item item : ores){
             ObjectMap<Block, Block> map = new ObjectMap<>();
diff --git a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
index 79fee9598c..8a276b7141 100644
--- a/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/PowerBlocks.java
@@ -9,7 +9,7 @@ import io.anuke.mindustry.world.blocks.power.*;
 
 public class PowerBlocks extends BlockList implements ContentList{
     public static Block combustionGenerator, thermalGenerator, turbineGenerator, rtgGenerator, solarPanel, largeSolarPanel,
-            nuclearReactor, fusionReactor, battery, batteryLarge, powerNode, powerNodeLarge, warpGate;
+            thoriumReactor, fusionReactor, battery, batteryLarge, powerNode, powerNodeLarge, warpGate;
 
     @Override
     public void load(){
@@ -51,7 +51,7 @@ public class PowerBlocks extends BlockList implements ContentList{
             generation = 0.055f;
         }};
 
-        nuclearReactor = new NuclearReactor("nuclear-reactor"){{
+        thoriumReactor = new NuclearReactor("thorium-reactor"){{
             size = 3;
             health = 700;
             powerMultiplier = 0.8f;
diff --git a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java
index 1b8f17ebb1..57b21777ba 100644
--- a/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java
@@ -12,18 +12,18 @@ import io.anuke.mindustry.world.blocks.production.Fracker;
 import io.anuke.mindustry.world.blocks.production.SolidPump;
 
 public class ProductionBlocks extends BlockList implements ContentList{
-    public static Block tungstenDrill, carbideDrill, laserdrill, blastdrill, plasmadrill, waterextractor, oilextractor, cultivator;
+    public static Block mechanicalDrill, pneumaticDrill, laserdrill, blastdrill, plasmadrill, waterextractor, oilextractor, cultivator;
 
     @Override
     public void load(){
-        tungstenDrill = new Drill("tungsten-drill"){{
+        mechanicalDrill = new Drill("mechanical-drill"){{
             tier = 2;
             drillTime = 300;
             size = 2;
             drawMineItem = true;
         }};
 
-        carbideDrill = new Drill("carbide-drill"){{
+        pneumaticDrill = new Drill("pneumatic-drill"){{
             tier = 3;
             drillTime = 240;
             size = 2;
diff --git a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
index e408d82719..6bf9652d62 100644
--- a/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
@@ -19,7 +19,7 @@ public class TurretBlocks extends BlockList implements ContentList{
     @Override
     public void load(){
         duo = new DoubleTurret("duo"){{
-            ammoTypes = new AmmoType[]{AmmoTypes.bulletTungsten, AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletPyratite, AmmoTypes.bulletSilicon};
+            ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletSilicon};
             reload = 25f;
             restitution = 0.03f;
             range = 90f;
@@ -43,7 +43,7 @@ public class TurretBlocks extends BlockList implements ContentList{
 		}};*/
 
         hail = new ArtilleryTurret("hail"){{
-            ammoTypes = new AmmoType[]{AmmoTypes.artilleryCarbide, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary};
+            ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary};
             reload = 100f;
             recoil = 2f;
             range = 200f;
@@ -134,7 +134,7 @@ public class TurretBlocks extends BlockList implements ContentList{
         salvo = new BurstTurret("salvo"){{
             size = 2;
             range = 120f;
-            ammoTypes = new AmmoType[]{AmmoTypes.bulletTungsten, AmmoTypes.bulletCarbide, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon};
+            ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon};
             reload = 40f;
             restitution = 0.03f;
             ammoEjectBack = 3f;
@@ -162,7 +162,7 @@ public class TurretBlocks extends BlockList implements ContentList{
         }};
 
         ripple = new ArtilleryTurret("ripple"){{
-            ammoTypes = new AmmoType[]{AmmoTypes.artilleryCarbide, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary, AmmoTypes.artilleryExplosive, AmmoTypes.artilleryPlastic};
+            ammoTypes = new AmmoType[]{AmmoTypes.artilleryDense, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary, AmmoTypes.artilleryExplosive, AmmoTypes.artilleryPlastic};
             size = 3;
             shots = 4;
             inaccuracy = 12f;
@@ -191,7 +191,7 @@ public class TurretBlocks extends BlockList implements ContentList{
         }};
 
         spectre = new ItemTurret("spectre"){{
-            ammoTypes = new AmmoType[]{AmmoTypes.bulletTungsten, AmmoTypes.bulletLead, AmmoTypes.bulletCarbide, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon};
+            ammoTypes = new AmmoType[]{AmmoTypes.bulletCopper, AmmoTypes.bulletDense, AmmoTypes.bulletPyratite, AmmoTypes.bulletThorium, AmmoTypes.bulletSilicon};
             reload = 25f;
             restitution = 0.03f;
             ammoUseEffect = ShootFx.shellEjectSmall;
diff --git a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java
index 179b2b4642..06386a6f06 100644
--- a/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java
+++ b/core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java
@@ -52,7 +52,7 @@ public class UnitBlocks extends BlockList implements ContentList{
             produceTime = 1800;
             size = 2;
             consumes.power(0.05f);
-            consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.tungsten, 15)});
+            consumes.items(new ItemStack[]{new ItemStack(Items.silicon, 10), new ItemStack(Items.copper, 15)});
         }};
 
         titanPad = new UnitPad("titan-pad"){{
diff --git a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java
index 5898a70070..352a432442 100644
--- a/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/ArtilleryBullets.java
@@ -8,12 +8,12 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.ContentList;
 
 public class ArtilleryBullets extends BulletList implements ContentList{
-    public static BulletType carbide, plastic, plasticFrag, homing, incindiary, explosive, surge;
+    public static BulletType dense, plastic, plasticFrag, homing, incindiary, explosive, surge;
 
     @Override
     public void load(){
 
-        carbide = new ArtilleryBulletType(3f, 0, "shell"){
+        dense = new ArtilleryBulletType(3f, 0, "shell"){
             {
                 hiteffect = BulletFx.flakExplosion;
                 knockback = 0.8f;
diff --git a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java
index 0c0939ac67..84dfddb816 100644
--- a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java
@@ -6,26 +6,19 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.ContentList;
 
 public class StandardBullets extends BulletList implements ContentList{
-    public static BulletType tungsten, lead, carbide, thorium, homing, tracer;
+    public static BulletType copper, dense, thorium, homing, tracer;
 
     @Override
     public void load(){
 
-        tungsten = new BasicBulletType(3.2f, 10, "bullet"){
-            {
-                bulletWidth = 9f;
-                bulletHeight = 11f;
-            }
-        };
-
-        lead = new BasicBulletType(2.5f, 5, "bullet"){
+        copper = new BasicBulletType(2.5f, 7, "bullet"){
             {
                 bulletWidth = 7f;
                 bulletHeight = 9f;
             }
         };
 
-        carbide = new BasicBulletType(3.5f, 18, "bullet"){
+        dense = new BasicBulletType(3.5f, 18, "bullet"){
             {
                 bulletWidth = 9f;
                 bulletHeight = 12f;
diff --git a/core/src/io/anuke/mindustry/core/Logic.java b/core/src/io/anuke/mindustry/core/Logic.java
index bfc0d49b68..0fe9e701d8 100644
--- a/core/src/io/anuke/mindustry/core/Logic.java
+++ b/core/src/io/anuke/mindustry/core/Logic.java
@@ -2,7 +2,6 @@ package io.anuke.mindustry.core;
 
 import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.Vars;
-import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.game.EventType.GameOverEvent;
@@ -70,13 +69,6 @@ public class Logic extends Module{
             }
         }
 
-        for(TeamData team : state.teams.getTeams(false)){
-            for(Tile tile : team.cores){
-                tile.entity.items.add(Items.tungsten, 2000);
-                tile.entity.items.add(Items.blastCompound, 2000);
-            }
-        }
-
 
         Events.fire(PlayEvent.class);
     }
diff --git a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java
index 4ea154cae6..f5ee1996de 100644
--- a/core/src/io/anuke/mindustry/entities/units/UnitDrops.java
+++ b/core/src/io/anuke/mindustry/entities/units/UnitDrops.java
@@ -17,7 +17,7 @@ public class UnitDrops{
         }
 
         if(dropTable == null){
-            dropTable = new Item[]{Items.tungsten, Items.lead, Items.carbide};
+            dropTable = new Item[]{Items.densealloy, Items.lead, Items.copper};
         }
 
         for(int i = 0; i < 3; i++){
diff --git a/core/src/io/anuke/mindustry/entities/units/UnitType.java b/core/src/io/anuke/mindustry/entities/units/UnitType.java
index 2f8c6562cc..735c53cbfb 100644
--- a/core/src/io/anuke/mindustry/entities/units/UnitType.java
+++ b/core/src/io/anuke/mindustry/entities/units/UnitType.java
@@ -45,7 +45,7 @@ public class UnitType implements UnlockableContent{
     public float carryWeight = 1f;
     public int ammoCapacity = 200;
     public int itemCapacity = 30;
-    public ObjectSet<Item> toMine = ObjectSet.with(Items.lead, Items.tungsten);
+    public ObjectSet<Item> toMine = ObjectSet.with(Items.lead, Items.copper);
     public float buildPower = 0.3f, minePower = 0.7f, healSpeed = 0.1f;
     public Weapon weapon = Weapons.blaster;
     public float weaponOffsetX, weaponOffsetY;
diff --git a/core/src/io/anuke/mindustry/game/ContentDatabase.java b/core/src/io/anuke/mindustry/game/ContentDatabase.java
index 64afe3e782..a325786546 100644
--- a/core/src/io/anuke/mindustry/game/ContentDatabase.java
+++ b/core/src/io/anuke/mindustry/game/ContentDatabase.java
@@ -8,6 +8,8 @@ import io.anuke.mindustry.game.EventType.UnlockEvent;
 import io.anuke.ucore.core.Events;
 import io.anuke.ucore.core.Settings;
 
+import static io.anuke.mindustry.Vars.debug;
+
 public class ContentDatabase{
     /** Maps unlockable type names to a set of unlocked content.*/
     private ObjectMap<String, ObjectSet<String>> unlocked = new ObjectMap<>();
@@ -16,6 +18,8 @@ public class ContentDatabase{
 
     /** Returns whether or not this piece of content is unlocked yet.*/
     public boolean isUnlocked(UnlockableContent content){
+        if(debug) return true;
+
         if(!unlocked.containsKey(content.getContentTypeName())){
             unlocked.put(content.getContentTypeName(), new ObjectSet<>());
         }
diff --git a/core/src/io/anuke/mindustry/maps/Sectors.java b/core/src/io/anuke/mindustry/maps/Sectors.java
index 0bcdbffee9..43beedba5e 100644
--- a/core/src/io/anuke/mindustry/maps/Sectors.java
+++ b/core/src/io/anuke/mindustry/maps/Sectors.java
@@ -147,21 +147,21 @@ public class Sectors{
         sector.spawns = sector.missions.first().getWaves(sector);
 
         //add all ores for now since material differences aren't well handled yet
-        sector.ores.addAll(Items.tungsten, Items.coal, Items.lead, Items.thorium, Items.titanium);
+        sector.ores.addAll(Items.copper, Items.coal, Items.lead, Items.thorium, Items.titanium);
 
         //set starter items
         if(sector.difficulty > 12){ //now with titanium
-            sector.startingItems = Array.with(new ItemStack(Items.tungsten, 1900), new ItemStack(Items.lead, 600), new ItemStack(Items.carbide, 470), new ItemStack(Items.silicon, 460), new ItemStack(Items.titanium, 230));
+            sector.startingItems = Array.with(new ItemStack(Items.copper, 1900), new ItemStack(Items.lead, 500), new ItemStack(Items.densealloy, 470), new ItemStack(Items.silicon, 460), new ItemStack(Items.titanium, 230));
         }else if(sector.difficulty > 8){ //just more resources
-            sector.startingItems = Array.with(new ItemStack(Items.tungsten, 1500), new ItemStack(Items.lead, 450), new ItemStack(Items.carbide, 340), new ItemStack(Items.silicon, 250));
+            sector.startingItems = Array.with(new ItemStack(Items.copper, 1500), new ItemStack(Items.lead, 400), new ItemStack(Items.densealloy, 340), new ItemStack(Items.silicon, 250));
         }else if(sector.difficulty > 5){ //now with silicon
-            sector.startingItems = Array.with(new ItemStack(Items.tungsten, 950), new ItemStack(Items.lead, 350), new ItemStack(Items.carbide, 190), new ItemStack(Items.silicon, 140));
+            sector.startingItems = Array.with(new ItemStack(Items.copper, 950), new ItemStack(Items.lead, 300), new ItemStack(Items.densealloy, 190), new ItemStack(Items.silicon, 140));
         }else if(sector.difficulty > 3){ //now with carbide
-            sector.startingItems = Array.with(new ItemStack(Items.tungsten, 700), new ItemStack(Items.lead, 250), new ItemStack(Items.carbide, 130));
+            sector.startingItems = Array.with(new ItemStack(Items.copper, 700), new ItemStack(Items.lead, 200), new ItemStack(Items.densealloy, 130));
         }else if(sector.difficulty > 1){ //more starter items for faster start
-            sector.startingItems = Array.with(new ItemStack(Items.tungsten, 500), new ItemStack(Items.lead, 180));
+            sector.startingItems = Array.with(new ItemStack(Items.copper, 500), new ItemStack(Items.lead, 100));
         }else{ //base starting items to prevent grinding much
-            sector.startingItems = Array.with(new ItemStack(Items.tungsten, 170), new ItemStack(Items.lead, 70));
+            sector.startingItems = Array.with(new ItemStack(Items.copper, 170));
         }
     }
 
diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
index 725072d6f3..005d0b2cf9 100644
--- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
@@ -3,7 +3,6 @@ package io.anuke.mindustry.maps.generation;
 import com.badlogic.gdx.math.Rectangle;
 import com.badlogic.gdx.math.Vector2;
 import com.badlogic.gdx.utils.Array;
-import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.content.blocks.DefenseBlocks;
 import io.anuke.mindustry.content.blocks.UnitBlocks;
@@ -33,6 +32,7 @@ public class FortressGenerator{
         if(structures != null) return;
 
         structures = new Structure[]{
+        /*
             //tiny duo outpost
             new Structure(0.03f, Items.tungsten, "BAMADnR1bmdzdGVuLWRyaWxsAgADZHVvAQANdHVuZ3N0ZW4td2FsbAAAA2FpcgMFAQABAwEDAQMBAAEAAgMDAwIDAQABAAEBAQEBAQEA"),
 
@@ -71,9 +71,11 @@ public class FortressGenerator{
 
             //fabricator outpost
             new Structure(0.02f, Items.tungsten, "BgUADWNhcmJpZGUtZHJpbGwBABJ0aG9yaXVtLXdhbGwtbGFyZ2UCAAx0aG9yaXVtLXdhbGwEAANkdW8AAANhaXIDAA5mYWJyaWNhdG9yLXBhZAkJAAAAAAEDAAACAwEDAAAAAAAAAAACAwADAAMCAwADAAMCAgAAAQMAAAMCAAACAAMCAAABAwAAAAAAAAAAAAAEAgAAAAAAAgAAAgMCAAIBBAIFAAQCAgMCAgIDAQMAAAMCAAAEAgMCAAABAwAAAAAAAAAAAAACAQAAAAAAAgAAAAACAAEDAAECAQEDAAECAQAAAAAAAAAAAAACAwACAAAAAAAA"),
+            */
         };
 
         bases = new Structure[]{
+        /*
             //primitive 4-spawner base
             new Structure("CAQADXR1bmdzdGVuLXdhbGwFAANkdW8HAARjb3JlAQAKZGFnZ2VyLXBhZAYACHVubG9hZGVyAgAMcmVwYWlyLXBvaW50AAADYWlyAwALc29sYXItcGFuZWwJBwAAAQMAAAIDAQMAAAAAAAAAAAAAAwIAAAAAAAAEAAQBBAEEAQQBBAEEAgQABQIAAAAAAAAFAgQCBAAGAwAABwAAAAYDBAAEAAUCAAAAAAAABQIEAAQABAMEAwQDBAMEAAQAAAABAwAAAwIBAwAAAAAAAAAAAAACAwAAAAAAAA=="),
 
@@ -100,6 +102,7 @@ public class FortressGenerator{
 
             //welcome to unit hell
             new Structure("DQoACHNwbGl0dGVyBAAMdGhvcml1bS13YWxsDAAEY29yZQEACmRhZ2dlci1wYWQHAAttb25zb29uLXBhZAsACHVubG9hZGVyCAAPaW50ZXJjZXB0b3ItcGFkBQARdGl0YW5pdW0tY29udmV5b3IJAAxyZXBhaXItcG9pbnQDAAVzYWx2bwAAA2FpcgIACXRpdGFuLXBhZAYAC3NvbGFyLXBhbmVsFRUAAAAAAAAAAAAAAAABAQAAAQEAAAAAAQEAAAEBAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAIBAAAAAAAAAAAAAAAAAAADAQAABAAEAAAABAAEAAMBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQMGAAAABgAFAQAAAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAcDAAAIAwAABQIJAAAACQAFAggDAAAAAAcDAAAAAAIBAAAAAAAAAAAAAAAAAAAAAAAABQIKAAACCgAFAgAAAAAAAAAAAAAAAAAAAAABAQAAAwEAAAgDAAAAAAAAAAAFAgACBQIAAAAAAAAIAwAAAwEAAAEBAAAAAAAAAAAAAAAAAAAAAAcDAAAFAgACBQIAAAcDAAAAAAAAAAAAAAAAAAABAQAABAMFAgUDBQMAAAAAAAALAQACCwEAAAAAAAAFAQUBBQIEAQEBAAAAAAAABAMGAAkACgAFAwUDCwIAAAAAAAALAQUBBQEKAAkABgAEAQAAAAAAAAAAAAAAAAAAAAMAAwADAAIAAAwAAAAAAgABAAEAAQAAAAAAAAAAAAABAQAABAMGAAkACgAFAwUDCwAAAAAAAAALAgUBBQEKAAkABgAEAQEBAAAAAAAABAMFAAUDBQMAAAAAAAALAQABCwAAAAAAAAAFAQUBBQAEAQAAAAABAQAAAwEAAAgDAAAAAAcDAAAFAAAABQAAAAcDAAAIAwAAAwEAAAEBAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAABQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAwAABQAKAAAACgAFAAgDAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAcDAAAAAAAABQAJAAAACQAFAAAAAAAAAAcDAAAAAAIBAAAAAAAAAAAAAAAAAAADAQAABQMGAAAABgAFAQMBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEAAAABAAEAAAAAAAAAAAAAAAAAAAAAAAAAAIBAAAAAAIBAAEBAQAAAQEAAAAAAQEAAAEBAAAAAAIBAAAAAAIBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAA=")
+            */
         };
     }
 
@@ -185,8 +188,8 @@ public class FortressGenerator{
     }
 
     Block fixBlock(Block result){
-        if(result == UnitBlocks.dronePad) result = DefenseBlocks.tungstenWallLarge;
-        if(result == UnitBlocks.fabricatorPad) result = DefenseBlocks.tungstenWallLarge;
+        if(result == UnitBlocks.dronePad) result = DefenseBlocks.copperWallLarge;
+        if(result == UnitBlocks.fabricatorPad) result = DefenseBlocks.copperWallLarge;
         return result;
     }
 
diff --git a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
index 5a5b379141..973cea917f 100644
--- a/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
@@ -147,7 +147,7 @@ public class WorldGenerator{
 
         if(genOres){
             Array<OreEntry> baseOres = Array.with(
-            new OreEntry(Items.tungsten, 0.3f, seed),
+            new OreEntry(Items.copper, 0.3f, seed),
             new OreEntry(Items.coal, 0.284f, seed),
             new OreEntry(Items.lead, 0.28f, seed),
             new OreEntry(Items.titanium, 0.27f, seed),
diff --git a/core/src/io/anuke/mindustry/type/AmmoType.java b/core/src/io/anuke/mindustry/type/AmmoType.java
index 90a5eb0601..fe6aeb3bf5 100644
--- a/core/src/io/anuke/mindustry/type/AmmoType.java
+++ b/core/src/io/anuke/mindustry/type/AmmoType.java
@@ -11,42 +11,26 @@ public class AmmoType implements Content{
     private static Array<AmmoType> allTypes = new Array<>(32);
 
     public final byte id;
-    /**
-     * The item used. Always null if liquid isn't.
-     */
+    /**The item used. Always null if liquid isn't.*/
     public final Item item;
-    /**
-     * The liquid used. Always null if item isn't.
-     */
+    /**The liquid used. Always null if item isn't.*/
     public final Liquid liquid;
-    /**
-     * The resulting bullet. Never null.
-     */
+    /**The resulting bullet. Never null.*/
     public final BulletType bullet;
     /**
      * For item ammo, this is amount given per ammo item.
      * For liquid ammo, this is amount used per shot.
      */
     public final float quantityMultiplier;
-    /**
-     * Reload speed multiplier.
-     */
+    /**Reload speed multiplier.*/
     public float reloadMultiplier = 1f;
-    /**
-     * Bullet recoil strength.
-     */
+    /**Bullet recoil strength.*/
     public float recoil = 0f;
-    /**
-     * Additional inaccuracy in degrees.
-     */
+    /**Additional inaccuracy in degrees.*/
     public float inaccuracy;
-    /**
-     * Effect created when shooting.
-     */
+    /**Effect created when shooting.*/
     public Effect shootEffect = Fx.none;
-    /**
-     * Extra smoke effect created when shooting.
-     */
+    /**Extra smoke effect created when shooting.*/
     public Effect smokeEffect = Fx.none;
 
     {
diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
index 1836b9dba8..50aaec8919 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
@@ -238,7 +238,7 @@ public class BuildBlock extends Block{
 
             progress = Mathf.clamp(progress - amount);
 
-            if(progress <= 0 || state.mode.infiniteResources){
+            if(progress <= 0 || debug || state.mode.infiniteResources){
                 Call.onDeconstructFinish(tile, this.recipe == null ? previous : this.recipe.result);
             }
         }
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
index 90a0f3f9b7..1c0c175038 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
@@ -242,6 +242,8 @@ public class ItemBridge extends Block{
 
     @Override
     public boolean acceptItem(Item item, Tile tile, Tile source){
+        if(tile.getTeamID() != source.getTeamID()) return false;
+
         ItemBridgeEntity entity = tile.entity();
         Tile other = world.tile(entity.link);
         boolean linked = false;
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
index 5703b4bf35..e6dc2950e4 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/OverflowGate.java
@@ -6,7 +6,7 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.util.Mathf;
 
-public class OverflowGate extends Splitter{
+public class OverflowGate extends Router{
 
     public OverflowGate(String name){
         super(name);
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
similarity index 94%
rename from core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java
rename to core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
index 964bf3ca53..2613959488 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Splitter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Router.java
@@ -10,10 +10,10 @@ import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.meta.BlockGroup;
 import io.anuke.ucore.core.Timers;
 
-public class Splitter extends Block{
+public class Router extends Block{
     protected float speed = 8f;
 
-    public Splitter(String name){
+    public Router(String name){
         super(name);
         solid = true;
         update = true;
@@ -36,7 +36,7 @@ public class Splitter extends Block{
             entity.time += 1f/speed * Timers.delta();
             Tile target = getTileTarget(tile, entity.lastItem, entity.lastInput, false);
 
-            if(target != null && (entity.time >= 1f || !(target.block() instanceof Splitter))){
+            if(target != null && (entity.time >= 1f || !(target.block() instanceof Router))){
                 getTileTarget(tile, entity.lastItem, entity.lastInput, true);
                 target.block().handleItem(entity.lastItem, target, Edges.getFacingEdge(tile, target));
                 entity.items.remove(entity.lastItem, 1);
@@ -49,7 +49,7 @@ public class Splitter extends Block{
     public boolean acceptItem(Item item, Tile tile, Tile source){
         SplitterEntity entity = tile.entity();
 
-        return entity.lastItem == null;
+        return tile.getTeamID() == source.getTeamID() && entity.lastItem == null;
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
index eb556afef1..1cb4a9501e 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Sorter.java
@@ -2,7 +2,6 @@ package io.anuke.mindustry.world.blocks.distribution;
 
 import io.anuke.annotations.Annotations.Loc;
 import io.anuke.annotations.Annotations.Remote;
-import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.entities.Player;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.gen.Call;
@@ -119,7 +118,7 @@ public class Sorter extends Block implements SelectionTrait{
     }
 
     public static class SorterEntity extends TileEntity{
-        public Item sortItem = Items.tungsten;
+        public Item sortItem = Item.getByID(0);
 
         @Override
         public void write(DataOutputStream stream) throws IOException{
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
index 583885d450..8e6d88b942 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Separator.java
@@ -6,6 +6,7 @@ import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.content.Liquids;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Item;
+import io.anuke.mindustry.type.ItemStack;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.production.GenericCrafter.GenericCrafterEntity;
@@ -22,7 +23,7 @@ import io.anuke.ucore.util.Mathf;
 public class Separator extends Block{
     protected final int timerDump = timers++;
 
-    protected Item[] results;
+    protected ItemStack[] results;
     protected float filterTime;
     protected float spinnerRadius = 2.5f;
     protected float spinnerLength = 1f;
@@ -57,8 +58,8 @@ public class Separator extends Block{
         super.setStats();
 
         stats.add(BlockStat.outputItem, new ItemFilterValue(item -> {
-            for(Item i : results){
-                if(item == i) return true;
+            for(ItemStack i : results){
+                if(item == i.item) return true;
             }
             return false;
         }));
@@ -95,7 +96,22 @@ public class Separator extends Block{
 
         if(entity.progress >= 1f){
             entity.progress = 0f;
-            Item item = Mathf.select(results);
+            int sum = 0;
+            for(ItemStack stack : results) sum += stack.amount;
+
+            int i = Mathf.random(sum);
+            int count = 0;
+            Item item = null;
+
+            //TODO possible desync since items are random
+            for(ItemStack stack : results){
+                if(i >= count && i < count + stack.amount){
+                    item = stack.item;
+                    break;
+                }
+                count += stack.amount;
+            }
+
             entity.items.remove(consumes.item(), consumes.itemAmount());
             if(item != null){
                 offloading = true;
diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java b/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java
index 09eedd0061..5ea67aeac0 100644
--- a/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java
+++ b/core/src/io/anuke/mindustry/world/blocks/storage/Vault.java
@@ -1,7 +1,6 @@
 package io.anuke.mindustry.world.blocks.storage;
 
 import com.badlogic.gdx.utils.Array;
-import io.anuke.mindustry.content.Items;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.world.Edges;
@@ -68,7 +67,7 @@ public class Vault extends StorageBlock{
                     }
                 }
             }else{
-                todump = Items.tungsten;
+                todump = Item.getByID(0);
 
                 if(other.block().acceptItem(todump, other, in) && canDump(tile, other, todump)){
                     other.block().handleItem(removeItem(tile, null), other, in);
diff --git a/packer/build.gradle b/packer/build.gradle
index 1a03ede9d5..915654e7b2 100644
--- a/packer/build.gradle
+++ b/packer/build.gradle
@@ -3,10 +3,47 @@ apply plugin: "java"
 sourceCompatibility = 1.8
 sourceSets.main.java.srcDirs = [ "src/" ]
 
+
+import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.tools.texturepacker.TexturePacker
 
+import javax.imageio.ImageIO
+
 def textureFolder = "../core/assets-raw/sprites/generated/"
 
+task swapColors(){
+    doLast{
+        if (project.hasProperty("colors")) {
+            def carr = new File(getProperty("colors")).text.split("\n");
+            def map = [:]
+            def swaps = 0
+            carr.each {str -> map[Color.argb8888(Color.valueOf(str.split("=")[0]))] = Color.argb8888(Color.valueOf(str.split("=")[1]))}
+            def tmpc = new Color()
+
+            fileTree(dir: '../core/assets-raw/sprites', include: "**/*.png").visit { file ->
+                if(file.isDirectory()) return;
+                swaps ++
+
+                def img = ImageIO.read(file.file)
+                for (x in (0..img.getWidth()-1)) {
+                    for (y in (0..img.getHeight()-1)) {
+                        def c = img.getRGB(x, y)
+                        Color.argb8888ToColor(tmpc, c)
+                        if(tmpc.a < 0.1f) continue
+                        if(map.containsKey(c)){
+                            img.setRGB(x, y, (int)map.get(c))
+                        }
+                    }
+                }
+                ImageIO.write(img, "png", file.file)
+            }
+            println "Swapped $swaps images."
+        }else{
+            throw new InvalidUserDataException("No replacement colors specified. Use -Pcolors=\"<path to color file>\"");
+        }
+    }
+}
+
 task pack(){
     dependsOn 'prePack'