diff --git a/android/src/mindustry/android/AndroidLauncher.java b/android/src/mindustry/android/AndroidLauncher.java
index b3ee4723cc..42dc7ef931 100644
--- a/android/src/mindustry/android/AndroidLauncher.java
+++ b/android/src/mindustry/android/AndroidLauncher.java
@@ -27,7 +27,6 @@ import java.util.*;
 
 import static mindustry.Vars.*;
 
-
 public class AndroidLauncher extends AndroidApplication{
     public static final int PERMISSION_REQUEST_CODE = 1;
     boolean doubleScaleTablets = true;
diff --git a/build.gradle b/build.gradle
index 357c3f3513..8984e5b60f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,7 +36,7 @@ allprojects{
         if(!project.hasProperty("versionType")) versionType = 'official'
         appName = 'Mindustry'
         steamworksVersion = '891ed912791e01fe9ee6237a6497e5212b85c256'
-        rhinoVersion = '8437435dab9993769d72739608580d40c5343285'
+        rhinoVersion = '2c3ad8c29560f695ad147a8e8cf5ed9f0ae834b3'
 
         loadVersionProps = {
             return new Properties().with{p -> p.load(file('../core/assets/version.properties').newReader()); return p }
diff --git a/core/assets-raw/sprites/shapes/circle-small.png b/core/assets-raw/sprites/shapes/circle-small.png
new file mode 100644
index 0000000000..f69791c29d
Binary files /dev/null and b/core/assets-raw/sprites/shapes/circle-small.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 7c99e603dc..b1fd17e21d 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -591,6 +591,7 @@ unit.nobuild = [scarlet]Unit can't build
 lastaccessed = [lightgray]Last Accessed: {0}
 block.unknown = [lightgray]???
 
+stat.description = Purpose
 stat.input = Input
 stat.output = Output
 stat.booster = Booster
@@ -716,6 +717,7 @@ unit.items = items
 unit.thousands = k
 unit.millions = mil
 unit.billions = b
+category.purpose = Purpose
 category.general = General
 category.power = Power
 category.liquids = Liquids
@@ -1067,7 +1069,6 @@ block.conveyor.name = Conveyor
 block.titanium-conveyor.name = Titanium Conveyor
 block.plastanium-conveyor.name = Plastanium Conveyor
 block.armored-conveyor.name = Armored Conveyor
-block.armored-conveyor.description = Moves items at the same speed as titanium conveyors, but possesses more armor. Does not accept inputs from the sides from anything but other conveyor belts.
 block.junction.name = Junction
 block.router.name = Router
 block.distributor.name = Distributor
@@ -1075,7 +1076,6 @@ block.sorter.name = Sorter
 block.inverted-sorter.name = Inverted Sorter
 block.message.name = Message
 block.illuminator.name = Illuminator
-block.illuminator.description = A small, compact, configurable light source. Requires power to function.
 block.overflow-gate.name = Overflow Gate
 block.underflow-gate.name = Underflow Gate
 block.silicon-smelter.name = Silicon Smelter
@@ -1211,136 +1211,205 @@ tutorial.waves = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 wav
 tutorial.waves.mobile = The[lightgray] enemy[] approaches.\n\nDefend the core for 2 waves. Your ship will automatically fire at enemies.\nBuild more turrets and drills. Mine more copper.
 tutorial.launch = Once you reach a specific wave, you are able to[accent] launch the core[], leaving your defenses behind and[accent] obtaining all the resources in your core.[]\nThese obtained resources can then be used to research new technology.\n\n[accent]Press the launch button.
 
-item.copper.description = The most basic structural material. Used extensively in all types of blocks.
-item.lead.description = A basic starter material. Used extensively in electronics and liquid transportation blocks.
-item.metaglass.description = A super-tough glass compound. Extensively used for liquid distribution and storage.
-item.graphite.description = Mineralized carbon, used for ammunition and electrical components.
-item.sand.description = A common material that is used extensively in smelting, both in alloying and as a flux.
-item.coal.description = Fossilized plant matter, formed long before the seeding event. Used extensively for fuel and resource production.
-item.titanium.description = A rare super-light metal used extensively in liquid transportation, drills and aircraft.
-item.thorium.description = A dense, radioactive metal used as structural support and nuclear fuel.
-item.scrap.description = Leftover remnants of old structures and units. Contains trace amounts of many different metals.
-item.silicon.description = An extremely useful semiconductor. Applications in solar panels, complex electronics and homing turret ammunition.
-item.plastanium.description = A light, ductile material used in advanced aircraft and fragmentation ammunition.
-item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
-item.surge-alloy.description = An advanced alloy with unique electrical properties.
-item.spore-pod.description = A pod of synthetic spores, synthesized from atmospheric concentrations for industrial purposes. Used for conversion into oil, explosives and fuel.
-item.blast-compound.description = An unstable compound used in bombs and explosives. Synthesized from spore pods and other volatile substances. Use as fuel is not advised.
-item.pyratite.description = An extremely flammable substance used in incendiary weapons.
-liquid.water.description = The most useful liquid. Commonly used for cooling machines and waste processing.
-liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
-liquid.oil.description = A liquid used in advanced material production. Can be converted into coal as fuel, or sprayed and set on fire as a weapon.
-liquid.cryofluid.description = An inert, non-corrosive liquid created from water and titanium. Has extremely high heat capacity. Extensively used as coolant.
+item.copper.description = Used in all types of construction and ammunition.
+item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
+item.lead.description = Used in liquid transportation and electrical structures.
+item.lead.details = Dense. Inert. Extensively used in batteries.\nNote: Likely toxic to biological life forms. Not that there are many left here.
+item.metaglass.description = Used in liquid distribution/storage structures.
+item.graphite.description = Used in electrical components and turret ammunition.
+item.sand.description = Used for production of other refined materials.
+item.coal.description = Used for fuel and refined material production.
+item.coal.details = Appears to be fossilized plant matter, formed long before the seeding event.
+item.titanium.description = Used in liquid transportation structures, drills and aircraft.
+item.thorium.description = Used in durable structures and as nuclear fuel.
+item.scrap.description = Melted down and refined into other materials.
+item.scrap.details = Leftover remnants of old structures and units.
+item.silicon.description = Used in solar panels, complex electronics and homing turret ammunition.
+item.plastanium.description = Used in advanced units, insulation and fragmentation ammunition.
+item.phase-fabric.description = Used in advanced electronics and self-repairing structures.
+item.surge-alloy.description = Used in advanced weaponry and reactive defense structures.
+item.spore-pod.description = Used for conversion into oil, explosives and fuel.
+item.spore-pod.details = Spores. Likely a synthetic life form. Emit gases toxic to other biological life. Extremely invasive. Highly flammable in certain conditions.
+item.blast-compound.description = Used in bombs and explosive ammunition.
+item.pyratite.description = Used in incendiary weapons and combustion-fueled generators.
+liquid.water.description = Used for cooling machines and waste processing.
+liquid.slag.description = Refined in separators into constituent metals, or sprayed at enemies as a weapon.
+liquid.oil.description = Used in advanced material production and as incendiary ammunition.
+liquid.cryofluid.description = Used as coolant in reactors, turrets and factories.
 
-block.message.description = Stores a message. Used for communication between allies.
-block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
-block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.
-block.silicon-smelter.description = Reduces sand with pure coal. Produces silicon.
-block.kiln.description = Smelts sand and lead into the compound known as metaglass. Requires small amounts of power to run.
+block.armored-conveyor.description = Moves items forward. Does not accept inputs from the sides.
+block.illuminator.description = Emits light.
+block.message.description = Stores a message for communication between allies.
+block.graphite-press.description = Compresses coal into graphite.
+block.multi-press.description = Compresses coal into graphite. Requires water as coolant.
+block.silicon-smelter.description = Refines silicon from sand and coal.
+block.kiln.description = Smelts sand and lead into metaglass.
 block.plastanium-compressor.description = Produces plastanium from oil and titanium.
-block.phase-weaver.description = Synthesizes phase fabric from radioactive thorium and sand. Requires massive amounts of power to function.
-block.alloy-smelter.description = Combines titanium, lead, silicon and copper to produce surge alloy.
-block.cryofluid-mixer.description = Mixes water and fine titanium powder into cryofluid. Essential for thorium reactor usage.
-block.blast-mixer.description = Crushes and mixes clusters of spores with pyratite to produce blast compound.
-block.pyratite-mixer.description = Mixes coal, lead and sand into highly flammable pyratite.
-block.melter.description = Melts down scrap into slag for further processing or usage in wave turrets.
-block.separator.description = Separates slag into its mineral components. Outputs the cooled result.
-block.spore-press.description = Compresses spore pods under extreme pressure to synthesize oil.
+block.phase-weaver.description = Synthesizes phase fabric from thorium and sand.
+block.alloy-smelter.description = Fuses titanium, lead, silicon and copper into surge alloy.
+block.cryofluid-mixer.description = Mixes water and fine titanium powder to produce cryofluid.
+block.blast-mixer.description = Produces blast compound from pyratite and spore pods.
+block.pyratite-mixer.description = Mixes coal, lead and sand into pyratite.
+block.melter.description = Melts down scrap into slag.
+block.separator.description = Separates slag into its mineral components.
+block.spore-press.description = Compresses spore pods into oil.
 block.pulverizer.description = Crushes scrap into fine sand.
-block.coal-centrifuge.description = Solidifes oil into chunks of coal.
-block.incinerator.description = Vaporizes any excess item or liquid it receives.
-block.power-void.description = Voids all power inputted into it. Sandbox only.
+block.coal-centrifuge.description = Transforms oil into coal.
+block.incinerator.description = Vaporizes any item or liquid it receives.
+block.power-void.description = Voids all power inputted.
 block.power-source.description = Infinitely outputs power. Sandbox only.
 block.item-source.description = Infinitely outputs items. Sandbox only.
 block.item-void.description = Destroys any items. Sandbox only.
 block.liquid-source.description = Infinitely outputs liquids. Sandbox only.
 block.liquid-void.description = Removes any liquids. Sandbox only.
-block.copper-wall.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.
-block.copper-wall-large.description = A cheap defensive block.\nUseful for protecting the core and turrets in the first few waves.\nSpans multiple tiles.
-block.titanium-wall.description = A moderately strong defensive block.\nProvides moderate protection from enemies.
-block.titanium-wall-large.description = A moderately strong defensive block.\nProvides moderate protection from enemies.\nSpans multiple tiles.
-block.plastanium-wall.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections.
-block.plastanium-wall-large.description = A special type of wall that absorbs electric arcs and blocks automatic power node connections.\nSpans multiple tiles.
-block.thorium-wall.description = A strong defensive block.\nDecent protection from enemies.
-block.thorium-wall-large.description = A strong defensive block.\nDecent protection from enemies.\nSpans multiple tiles.
-block.phase-wall.description = A wall coated with special phase-based reflective compound. Deflects most bullets upon impact.
-block.phase-wall-large.description = A wall coated with special phase-based reflective compound. Deflects most bullets upon impact.\nSpans multiple tiles.
-block.surge-wall.description = An extremely durable defensive block.\nBuilds up charge on bullet contact, releasing it randomly.
-block.surge-wall-large.description = An extremely durable defensive block.\nBuilds up charge on bullet contact, releasing it randomly.\nSpans multiple tiles.
-block.door.description = A small door. Can be opened or closed by tapping.
-block.door-large.description = A large door. Can be opened and closed by tapping.\nSpans multiple tiles.
-block.mender.description = Periodically repairs blocks in its vicinity. Keeps defenses repaired in-between waves.\nOptionally uses silicon to boost range and efficiency.
-block.mend-projector.description = An upgraded version of the Mender. Repairs blocks in its vicinity.\nOptionally uses phase fabric to boost range and efficiency.
+block.copper-wall.description = Protects structures from enemy projectiles.
+block.copper-wall-large.description = Protects structures from enemy projectiles.
+block.titanium-wall.description = Protects structures from enemy projectiles.
+block.titanium-wall-large.description = Protects structures from enemy projectiles.
+block.plastanium-wall.description = Protects structures from enemy projectiles. Absorbs lasers and electric arcs. Blocks automatic power connections.
+block.plastanium-wall-large.description = Protects structures from enemy projectiles. Absorbs lasers and electric arcs. Blocks automatic power connections.
+block.thorium-wall.description = Protects structures from enemy projectiles.
+block.thorium-wall-large.description = Protects structures from enemy projectiles.
+block.phase-wall.description = Protects structures from enemy projectiles, reflecting most bullets upon impact.
+block.phase-wall-large.description = Protects structures from enemy projectiles, reflecting most bullets upon impact.
+block.surge-wall.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
+block.surge-wall-large.description = Protects structures from enemy projectiles, periodically releasing electric arcs upon contact.
+block.door.description = A wall that can be opened and closed.
+block.door-large.description = A wall that can be opened and closed.
+block.mender.description = Periodically repairs blocks in its vicinity.\nOptionally uses silicon to boost range and efficiency.
+block.mend-projector.description = Repairs blocks in its vicinity.\nOptionally uses phase fabric to boost range and efficiency.
 block.overdrive-projector.description = Increases the speed of nearby buildings.\nOptionally uses phase fabric to boost range and efficiency.
-block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage.\nOverheats if too much damage is sustained. Optionally uses coolant to prevent overheating. Phase fabric can be used to increase shield size.
-block.shock-mine.description = Damages enemies stepping on the mine. Nearly invisible to the enemy.
-block.conveyor.description = Basic item transport block. Moves items forward and automatically deposits them into blocks. Rotatable.
-block.titanium-conveyor.description = Advanced item transport block. Moves items faster than standard conveyors.
-block.plastanium-conveyor.description = Moves items in batches.\nAccepts items at the back, and unloads them in three directions at the front.\nRequires multiple loading and unloading points for peak throughput.
-block.junction.description = Acts as a bridge for two crossing conveyor belts. Useful in situations with two different conveyors carrying different materials to different locations.
-block.bridge-conveyor.description = Advanced item transport block. Allows transporting items over up to 3 tiles of any terrain or building.
-block.phase-conveyor.description = Advanced item transport block. Uses power to teleport items to a connected phase conveyor over several tiles.
-block.sorter.description = Sorts items. If an item matches the selection, it is allowed to pass. Otherwise, the item is outputted to the left and right.
-block.inverted-sorter.description = Processes items like a standard sorter, but outputs selected items to the sides instead.
-block.router.description = Accepts items, then outputs them to up to 3 other directions equally. Useful for splitting the materials from one source to multiple targets.\n\n[scarlet]Never use next to production inputs, as they will get clogged by output.[]
-block.distributor.description = An advanced router. Splits items to up to 7 other directions equally.
-block.overflow-gate.description = Only outputs to the left and right if the front path is blocked.
-block.underflow-gate.description = The opposite of an overflow gate. Outputs to the front if the left and right paths are blocked.
-block.mass-driver.description = The ultimate item transport block. Collects several items and then shoots them to another mass driver over a long range. Requires power to operate.
-block.mechanical-pump.description = A cheap pump with slow output, but no power consumption.
-block.rotary-pump.description = An advanced pump. Pumps more liquid, but requires power.
-block.thermal-pump.description = The ultimate pump.
-block.conduit.description = Basic liquid transport block. Moves liquids forward. Used in conjunction with pumps and other conduits.
-block.pulse-conduit.description = An advanced liquid transport block. Transports liquids faster and stores more than standard conduits.
-block.plated-conduit.description = Moves liquids at the same rate as pulse conduits, but possesses more armor. Does not accept fluids from the sides by anything other than conduits.\nDoes not leak.
-block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid. Useful for splitting the liquids from one source to multiple targets.
-block.liquid-tank.description = Stores a large amount of liquids. Use for creating buffers in situations with non-constant demand of materials or as a safeguard for cooling vital blocks.
-block.liquid-junction.description = Acts as a bridge for two crossing conduits. Useful in situations with two different conduits carrying different liquids to different locations.
-block.bridge-conduit.description = Advanced liquid transport block. Allows transporting liquids over up to 3 tiles of any terrain or building.
-block.phase-conduit.description = Advanced liquid transport block. Uses power to teleport liquids to a connected phase conduit over several tiles.
+block.force-projector.description = Creates a hexagonal force field around itself, protecting buildings and units inside from damage.\nOverheats if too much damage is sustained. Optionally uses coolant to prevent overheating. Phase fabric increases shield size.
+block.shock-mine.description = Releases electric arcs upon enemy unit contact.
+block.conveyor.description = Transports items forward.
+block.titanium-conveyor.description = Transports items forward. Faster than a standard conveyor.
+block.plastanium-conveyor.description =  Transports items forward in batches. Accepts items at the back, and unloads them in three directions at the front. Requires multiple loading and unloading points for peak throughput.
+block.junction.description = Acts as a bridge for two crossing conveyor belts.
+block.bridge-conveyor.description = Transports items over terrain or buildings.
+block.phase-conveyor.description = Instantly transports items over terrain or buildings. Longer range than the item bridge, but requires power.
+block.sorter.description = If an input item matches the selection, it passes forward. Otherwise, the item is outputted to the left and right.
+block.inverted-sorter.description = Similar to a standard sorter, but outputs selected items to the sides instead.
+block.router.description = Distributes input items to 3 output directions equally.
+block.router.details = A necessary evil. Using next to production inputs is not advised, as they will get clogged by output.
+block.distributor.description = Distributes input items to 7 output directions equally.
+block.overflow-gate.description = Only outputs items to the left and right if the front path is blocked.
+block.underflow-gate.description = Opposite of an overflow gate. Outputs to the front if the left and right paths are blocked.
+block.mass-driver.description = Long-range item transport structure. Collects batches of items and shoots them to other mass drivers.
+block.mechanical-pump.description = Pumps and outputs liquids. Does not require power.
+block.rotary-pump.description = Pumps and outputs liquids. Requires power.
+block.thermal-pump.description = Pumps and outputs liquids.
+block.conduit.description = Moves liquids forward. Used in conjunction with pumps and other conduits.
+block.pulse-conduit.description = Moves liquids forward. Transports faster and stores more than standard conduits.
+block.plated-conduit.description = Moves liquids forward. Does not accept input from the sides. Does not leak.
+block.liquid-router.description = Accepts liquids from one direction and outputs them to up to 3 other directions equally. Can also store a certain amount of liquid.
+block.liquid-tank.description = Stores a large amount of liquid. Outputs to all sides, similarly to a liquid router.
+block.liquid-junction.description = Acts as a bridge for two crossing conduits.
+block.bridge-conduit.description = Transports liquids over terrain or buildings.
+block.phase-conduit.description = Transports liquids over terrain or buildings. Longer range than the bridge conduit, but requires power.
 block.power-node.description = Transmits power to connected nodes. The node will receive power from or supply power to any adjacent blocks.
 block.power-node-large.description = An advanced power node with greater range.
-block.surge-tower.description = An extremely long-range power node with fewer available connections.
-block.diode.description = Battery power can flow through this block in only one direction, but only if the other side has less power stored.
-block.battery.description = Stores power as a buffer in times of surplus energy. Outputs power in times of deficit.
-block.battery-large.description = Stores much more power than a regular battery.
+block.surge-tower.description = A long-range power node with fewer available connections.
+block.diode.description = Moves battery power in one direction, but only if the other side has less power stored.
+block.battery.description = Stores power in times of surplus energy. Outputs power in times of deficit.
+block.battery-large.description =  Stores power in times of surplus energy. Outputs power in times of deficit. Higher capacity than a regular battery.
 block.combustion-generator.description = Generates power by burning flammable materials, such as coal.
 block.thermal-generator.description = Generates power when placed in hot locations.
-block.steam-generator.description = An advanced combustion generator. More efficient, but requires additional water for generating steam.
+block.steam-generator.description = Generates power by burning flammable materials and converting water to steam.
 block.differential-generator.description = Generates large amounts of energy. Utilizes the temperature difference between cryofluid and burning pyratite.
-block.rtg-generator.description = A simple, reliable generator. Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
+block.rtg-generator.description = Uses the heat of decaying radioactive compounds to produce energy at a slow rate.
 block.solar-panel.description = Provides a small amount of power from the sun.
-block.solar-panel-large.description = A significantly more efficient version of the standard solar panel.
-block.thorium-reactor.description = Generates significant amounts of power from thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied. Power output depends on fullness, with base power generated at full capacity.
-block.impact-reactor.description = An advanced generator, capable of creating massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
-block.mechanical-drill.description = A cheap drill. When placed on appropriate tiles, outputs items at a slow pace indefinitely. Only capable of mining basic resources.
+block.solar-panel-large.description = Provides a small amount of power from the sun. More efficient than the standard solar panel.
+block.thorium-reactor.description = Generates significant amounts of power from thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied.
+block.impact-reactor.description = Creates massive amounts of power at peak efficiency. Requires a significant power input to kickstart the process.
+block.mechanical-drill.description = When placed on ore, outputs items at a slow pace indefinitely. Only capable of mining basic resources.
 block.pneumatic-drill.description = An improved drill, capable of mining titanium. Mines at a faster pace than a mechanical drill.
 block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Capable of mining thorium.
 block.blast-drill.description = The ultimate drill. Requires large amounts of power.
 block.water-extractor.description = Extracts groundwater. Used in locations with no surface water available.
-block.cultivator.description = Cultivates tiny concentrations of spores in the atmosphere into industry-ready pods.
+block.cultivator.description = Cultivates tiny concentrations of atmospheric spores into spore pods.
+block.cultivator.details = Recovered technology. Used to produce massive amounts of biomass as efficiently as possible. Likely the initial incubator of the spores now covering Serpulo.
 block.oil-extractor.description = Uses large amounts of power, sand and water to drill for oil.
-block.core-shard.description = The first iteration of the core capsule. Once destroyed, all contact to the region is lost. Do not let this happen.
-block.core-foundation.description = The second version of the core. Better armored. Stores more resources.
-block.core-nucleus.description = The third and final iteration of the core capsule. Extremely well armored. Stores massive amounts of resources.
-block.vault.description = Stores a large amount of items of each type. An unloader block can be used to retrieve items from the vault.
-block.container.description = Stores a small amount of items of each type. An unloader block can be used to retrieve items from the container.
-block.unloader.description = Unloads items from any nearby non-transportation block. The type of item to be unloaded can be changed by tapping.
-block.launch-pad.description = Launches batches of items without any need for a core launch.
-block.launch-pad-large.description = An improved version of the launch pad. Stores more items. Launches more frequently.
-block.duo.description = A small, cheap turret. Useful against ground units.
-block.scatter.description = An essential anti-air turret. Sprays clumps of lead, scrap or metaglass flak at enemy units.
+block.core-shard.description = Core of the base. Once destroyed, the sector is lost.
+block.core-shard.details = The first iteration. Compact. Self-replicating. Equipped with single-use launch thrusters. Not designed for interplanetary travel.
+block.core-foundation.description = Core of the base. Well armored. Stores more resources than a Shard.
+block.core-foundation.details = The second iteration.
+block.core-nucleus.description = Core of the base. Extremely well armored. Stores massive amounts of resources.
+block.core-nucleus.details = The third and final iteration.
+block.vault.description = Stores a large amount of items of each type. Contents can be retrieved with an unloader.
+block.container.description = Stores a small amount of items of each type. Contents can be retrieved with an unloader.
+block.unloader.description = Unloads the selected item from nearby blocks.
+block.launch-pad.description = Launches batches of items to selected sectors.
+block.duo.description = Fires alternating bullets at enemies.
+block.scatter.description = Fires clumps of lead, scrap or metaglass flak at enemy aircraft.
 block.scorch.description = Burns any ground enemies close to it. Highly effective at close range.
-block.hail.description = A small, long-range artillery turret.
-block.wave.description = A medium-sized turret. Shoots streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
-block.lancer.description = A medium-sized anti-ground laser turret. Charges and fires powerful beams of energy.
-block.arc.description = A small close-range electric turret. Fires arcs of electricity at enemies.
-block.swarmer.description = A medium-sized missile turret. Attacks both air and ground enemies. Fires homing missiles.
-block.salvo.description = A larger, more advanced version of the Duo turret. Fires quick salvos of bullets at the enemy.
-block.fuse.description = A large, close-range shrapnel turret. Fires three piercing blasts at nearby enemies.
-block.ripple.description = An extremely powerful artillery turret. Shoots clusters of shells at enemies over long distances.
-block.cyclone.description = A large anti-air and anti-ground turret. Fires explosive clumps of flak at nearby units.
-block.spectre.description = A massive dual-barreled cannon. Shoots large armor-piercing bullets at air and ground targets.
-block.meltdown.description = A massive laser cannon. Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
-block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.hail.description = Fires small shells at ground enemies over long distances.
+block.wave.description = Fires streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.lancer.description = Charges and fires powerful beams of energy at ground targets.
+block.arc.description = Fires arcs of electricity at ground targets.
+block.swarmer.description = Fires homing missiles at enemies.
+block.salvo.description = Fires quick salvos of bullets at enemies.
+block.fuse.description = Fires three close-range piercing blasts at nearby enemies.
+block.ripple.description = Shoots clusters of shells at ground enemies over long distances.
+block.cyclone.description = Fires explosive clumps of flak at nearby enemies.
+block.spectre.description = Fires large armor-piercing bullets at air and ground targets.
+block.meltdown.description = Charges and fires a persistent laser beam at nearby enemies. Requires coolant to operate.
+block.foreshadow.description = Fires a large single-target bolt over long distances.
+block.repair-point.description = Continuously repairs the closest damaged unit in its vicinity.
 block.segment.description = Damages and destroys incoming projectiles. Laser projectiles are not targeted.
+block.parallax.description = Fires a tractor beam that pulls in air targets, damaging them in the process.
+block.tsunami.description = Fires powerful streams of liquid at enemies. Automatically extinguishes fires when supplied with water.
+block.silicon-crucible.description = Refines silicon from sand and coal, using pyratite as an additional heat source. More efficient in hot locations.
+block.disassembler.description = Separates slag into trace amounts of exotic mineral components at low efficiency. Can produce thorium.
+block.overdrive-dome.description =  Increases the speed of nearby buildings. Requires phase fabric and silicon to operate.
+block.payload-conveyor.description = Moves large payloads, such as units from factories.
+block.payload-router.description = Splits input payloads into 3 output directions.
+block.command-center.description = Controls unit behavior with several different commands.
+block.ground-factory.description = Produces ground units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.air-factory.description = Produces air units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.naval-factory.description = Produces naval units. Output units can be used directly, or moved into reconstructors for upgrading.
+block.additive-reconstructor.description = Upgrades inputted units to the second tier.
+block.multiplicative-reconstructor.description = Upgrades inputted units to the third tier.
+block.exponential-reconstructor.description = Upgrades inputted units to the fourth tier.
+block.tetrative-reconstructor.description = Upgrades inputted units to the fifth and final tier.
+block.switch.description = A toggleable switch. State can be read and controlled with logic processors.
+block.micro-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings.
+block.logic-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the micro processor.
+block.hyper-processor.description = Runs a sequence of logic instructions in a loop. Can be used to control units and buildings. Faster than the logic processor.
+block.memory-cell.description = Stores information for a logic processor.
+block.memory-bank.description = Stores information for a logic processor. High capacity.
+block.logic-display.description = Displays arbitrary graphics from a logic processor.
+block.large-logic-display.description = Displays arbitrary graphics from a logic processor.
+
+unit.dagger.description = Fires standard bullets at all nearby enemies.
+unit.mace.description = Fires streams of flame at all nearby enemies.
+unit.fortress.description = Fires long-range artillery at ground targets.
+unit.scepter.description = Fires a barrage of charged bullets at all nearby enemies.
+unit.reign.description = Fires a barrage of massive piercing bullets at all nearby enemies.
+unit.nova.description = Fires laser bolts that damage enemies and repair allied structures. Capable of flight.
+unit.pulsar.description = Fires arcs of electricity that damage enemies and repair allied structures. Capable of flight.
+unit.quasar.description = Fires piercing laser beams that damage enemies and repair allied structures. Capable of flight. Shielded.
+unit.vela.description = Fires a massive continuous laser beam that damages enemies, causes fires and repair allied structures. Capable of flight.
+unit.corvus.description = Fires a massive laser blast that damages enemies and repairs allied structures. Can step over most terrain.
+unit.crawler.description = Runs toward enemies and self-destructs, causing a large explosion.
+unit.atrax.description = Fires debilitating orbs of slag at ground targets. Can step over most terrain.
+unit.spiroct.description = Fires sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.arkyid.description = Fires large sapping laser beams at enemies, repairing itself in the process. Can step over most terrain.
+unit.toxopid.description = Fires large electric cluster-shells and piercing lasers at enemies. Can step over most terrain.
+unit.flare.description = Fires standard bullets at nearby ground targets.
+unit.horizon.description = Drops clusters of bombs on ground targets.
+unit.zenith.description = Fires salvos of missiles at all nearby enemies.
+unit.antumbra.description = Fires a barrage of bullets at all nearby enemies.
+unit.eclipse.description = Fires two piercing lasers and a barrage of flak at all nearby enemies.
+unit.mono.description = Automatically mines copper and lead, depositing it into the core.
+unit.poly.description = Automatically rebuilds damaged structures and assists other units in construction.
+unit.mega.description = Automatically repairs damaged structures. Capable of carrying blocks and small ground units.
+unit.quad.description = Drops large bombs on ground targets, repairing allied structures and damaging enemies. Capable of carrying medium-sized ground units.
+unit.oct.description = Protects nearby allies with its regenerating shield. Capable of carrying most ground units.
+unit.risso.description = Fires a barrage of missiles and bullets at all nearby enemies.
+unit.minke.description = Fires incendiary shells and standard bullets at nearby ground targets.
+unit.bryde.description = Fires long-range artillery shells and missiles at enemies.
+unit.sei.description = Fires a barrage of missiles and armor-piercing bullets at enemies.
+unit.omura.description = Fires a long-range piercing railgun bolt at enemies. Constructs flare units.
+unit.alpha.description = Defends the Shard core from enemies. Builds structures.
+unit.beta.description = Defends the Foundation core from enemies. Builds structures.
+unit.gamma.description = Defends the Nucleus core from enemies. Builds structures.
\ No newline at end of file
diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 417ed98b34..16329093b0 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -314,3 +314,5 @@
 63422=foreshadow|block-foreshadow-medium
 63421=tsunami|block-tsunami-medium
 63420=space|block-space-medium
+63419=legacy-unit-factory-air|block-legacy-unit-factory-air-medium
+63418=legacy-unit-factory-ground|block-legacy-unit-factory-ground-medium
diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png
index c297dccdf7..42df534d14 100644
Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ
diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas
index c5fe9391f5..e5bd04ab8f 100644
--- a/core/assets/sprites/fallback/sprites.atlas
+++ b/core/assets/sprites/fallback/sprites.atlas
@@ -3265,21 +3265,21 @@ mend-projector-top
   index: -1
 mender
   rotate: false
-  xy: 915, 499
+  xy: 1171, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-icon-logic
   rotate: false
-  xy: 915, 499
+  xy: 1171, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 813, 483
+  xy: 1205, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3307,525 +3307,525 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 921, 23
+  xy: 1375, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-arrow
   rotate: false
-  xy: 445, 97
+  xy: 729, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 459, 267
+  xy: 763, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-icon-logic
   rotate: false
-  xy: 459, 267
+  xy: 763, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 459, 233
+  xy: 797, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 459, 199
+  xy: 695, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 479, 165
+  xy: 763, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-0
   rotate: false
-  xy: 167, 369
+  xy: 274, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-icon-logic
   rotate: false
-  xy: 167, 369
+  xy: 274, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-armored-conveyor-full
   rotate: false
-  xy: 167, 369
+  xy: 274, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-1
   rotate: false
-  xy: 190, 335
+  xy: 308, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-2
   rotate: false
-  xy: 190, 301
+  xy: 369, 369
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-3
   rotate: false
-  xy: 187, 267
+  xy: 308, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 187, 233
+  xy: 342, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 187, 199
+  xy: 342, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-2
   rotate: false
-  xy: 201, 369
+  xy: 376, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-3
   rotate: false
-  xy: 224, 335
+  xy: 376, 301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-0
   rotate: false
-  xy: 224, 301
+  xy: 274, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 221, 267
+  xy: 308, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-2
   rotate: false
-  xy: 221, 233
+  xy: 342, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 221, 199
+  xy: 376, 267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 235, 369
+  xy: 271, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 258, 335
+  xy: 305, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 258, 301
+  xy: 339, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 255, 267
+  xy: 373, 233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 255, 233
+  xy: 1707, 549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 255, 199
+  xy: 1741, 549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 241, 165
+  xy: 1775, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 241, 131
+  xy: 1809, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 513, 63
+  xy: 695, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 513, 29
+  xy: 729, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 530, 335
+  xy: 763, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 530, 301
+  xy: 797, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 527, 267
+  xy: 831, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 527, 233
+  xy: 831, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 527, 199
+  xy: 831, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 541, 369
+  xy: 831, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 547, 165
+  xy: 831, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 547, 131
+  xy: 831, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 547, 97
+  xy: 831, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 547, 63
+  xy: 831, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 547, 29
+  xy: 831, 347
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 564, 335
+  xy: 865, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 564, 301
+  xy: 865, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 561, 267
+  xy: 865, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 561, 233
+  xy: 865, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 561, 199
+  xy: 865, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 575, 369
+  xy: 865, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 813, 347
+  xy: 1273, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-icon-logic
   rotate: false
-  xy: 813, 347
+  xy: 1273, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 847, 335
+  xy: 1239, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 881, 329
+  xy: 1273, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 915, 329
+  xy: 1307, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 802, 313
+  xy: 1239, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 802, 279
+  xy: 1273, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 239, 635
+  xy: 1477, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 273, 669
+  xy: 1511, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 239, 601
+  xy: 1579, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 273, 635
+  xy: 1477, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 307, 669
+  xy: 1511, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 273, 601
+  xy: 1545, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 307, 635
+  xy: 1613, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 341, 669
+  xy: 1477, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 307, 601
+  xy: 1511, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 341, 635
+  xy: 1545, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 375, 669
+  xy: 1579, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 341, 601
+  xy: 1647, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 375, 635
+  xy: 1477, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 409, 669
+  xy: 1511, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 375, 601
+  xy: 1545, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 409, 635
+  xy: 1579, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 443, 669
+  xy: 1613, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 409, 601
+  xy: 1511, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 443, 635
+  xy: 1545, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 615, 165
+  xy: 933, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3846,119 +3846,119 @@ distributor-icon-logic
   index: -1
 inverted-sorter
   rotate: false
-  xy: 666, 301
+  xy: 967, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter-icon-logic
   rotate: false
-  xy: 666, 301
+  xy: 967, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 751, 29
+  xy: 1035, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction-icon-logic
   rotate: false
-  xy: 751, 29
+  xy: 1035, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 881, 431
+  xy: 1171, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate-icon-logic
   rotate: false
-  xy: 881, 431
+  xy: 1171, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 881, 397
+  xy: 305, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-icon-logic
   rotate: false
-  xy: 881, 397
+  xy: 305, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 915, 397
+  xy: 339, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 847, 369
+  xy: 373, 199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 881, 363
+  xy: 1239, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 887, 159
+  xy: 1409, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router-icon-logic
   rotate: false
-  xy: 887, 159
+  xy: 1409, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 935, 227
+  xy: 1409, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter-icon-logic
   rotate: false
-  xy: 935, 227
+  xy: 1409, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 477, 635
+  xy: 1647, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate-icon-logic
   rotate: false
-  xy: 477, 635
+  xy: 1647, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4049,343 +4049,343 @@ water-extractor-top
   index: -1
 block-border
   rotate: false
-  xy: 275, 97
+  xy: 2013, 549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 343, 97
+  xy: 559, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 411, 165
+  xy: 661, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 493, 233
+  xy: 627, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 445, 63
+  xy: 763, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-icon-logic
   rotate: false
-  xy: 445, 63
+  xy: 763, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 445, 29
+  xy: 797, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 445, 29
+  xy: 797, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 462, 335
+  xy: 695, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 462, 301
+  xy: 729, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 479, 29
+  xy: 797, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 496, 335
+  xy: 763, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 496, 301
+  xy: 797, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 493, 267
+  xy: 797, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 493, 267
+  xy: 797, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 493, 267
+  xy: 797, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 493, 199
+  xy: 661, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 507, 369
+  xy: 695, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 513, 165
+  xy: 729, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 513, 131
+  xy: 763, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 513, 131
+  xy: 763, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 513, 97
+  xy: 797, 381
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 768, 301
+  xy: 1103, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction-icon-logic
   rotate: false
-  xy: 768, 301
+  xy: 1103, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 765, 199
+  xy: 1205, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 779, 369
+  xy: 1001, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 813, 619
+  xy: 1035, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 785, 165
+  xy: 1069, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 785, 131
+  xy: 1103, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 813, 517
+  xy: 1171, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-icon-logic
   rotate: false
-  xy: 813, 517
+  xy: 1171, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-liquid
   rotate: false
-  xy: 847, 505
+  xy: 1205, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-liquid
   rotate: false
-  xy: 847, 505
+  xy: 1205, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-liquid
   rotate: false
-  xy: 847, 505
+  xy: 1205, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 915, 431
+  xy: 1205, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-icon-logic
   rotate: false
-  xy: 915, 431
+  xy: 1205, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 813, 415
+  xy: 1171, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 847, 403
+  xy: 1205, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 813, 381
+  xy: 1205, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 799, 211
+  xy: 1239, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 836, 301
+  xy: 1273, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 836, 267
+  xy: 1307, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 833, 233
+  xy: 1239, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 870, 295
+  xy: 1273, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 904, 295
+  xy: 1307, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 867, 193
+  xy: 1307, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 901, 193
+  xy: 1273, 378
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 819, 170
+  xy: 1307, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 819, 136
+  xy: 1307, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4434,161 +4434,161 @@ memory-bank-icon-logic
   index: -1
 memory-cell
   rotate: false
-  xy: 881, 499
+  xy: 1137, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 memory-cell-icon-logic
   rotate: false
-  xy: 881, 499
+  xy: 1137, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 847, 471
+  xy: 1103, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message-icon-logic
   rotate: false
-  xy: 847, 471
+  xy: 1103, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 micro-processor
   rotate: false
-  xy: 881, 465
+  xy: 1137, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 micro-processor-icon-logic
   rotate: false
-  xy: 881, 465
+  xy: 1137, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 switch
   rotate: false
-  xy: 205, 625
+  xy: 1511, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 switch-icon-logic
   rotate: false
-  xy: 205, 625
+  xy: 1511, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 switch-on
   rotate: false
-  xy: 205, 591
+  xy: 1477, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 241, 97
+  xy: 1843, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-icon-logic
   rotate: false
-  xy: 241, 97
+  xy: 1843, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-top
   rotate: false
-  xy: 241, 63
+  xy: 1877, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 479, 97
+  xy: 729, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-icon-logic
   rotate: false
-  xy: 479, 97
+  xy: 729, 415
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 479, 63
+  xy: 763, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode
   rotate: false
-  xy: 615, 63
+  xy: 899, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-icon-logic
   rotate: false
-  xy: 615, 63
+  xy: 899, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 615, 29
+  xy: 933, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 649, 63
+  xy: 967, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-icon-logic
   rotate: false
-  xy: 649, 63
+  xy: 967, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 649, 29
+  xy: 967, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 904, 261
+  xy: 1273, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-icon-logic
   rotate: false
-  xy: 904, 261
+  xy: 1273, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4609,28 +4609,28 @@ power-node-large-icon-logic
   index: -1
 power-source
   rotate: false
-  xy: 867, 227
+  xy: 1307, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-source-icon-logic
   rotate: false
-  xy: 867, 227
+  xy: 1307, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 901, 227
+  xy: 1239, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void-icon-logic
   rotate: false
-  xy: 901, 227
+  xy: 1239, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4651,21 +4651,21 @@ rtg-generator-icon-logic
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 853, 91
+  xy: 1409, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 938, 261
+  xy: 1443, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-icon-logic
   rotate: false
-  xy: 938, 261
+  xy: 1443, 473
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4819,42 +4819,42 @@ graphite-press-icon-logic
   index: -1
 incinerator
   rotate: false
-  xy: 666, 335
+  xy: 967, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator-icon-logic
   rotate: false
-  xy: 666, 335
+  xy: 967, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 734, 335
+  xy: 1103, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source-icon-logic
   rotate: false
-  xy: 734, 335
+  xy: 1103, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 751, 63
+  xy: 1001, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void-icon-logic
   rotate: false
-  xy: 751, 63
+  xy: 1001, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4889,42 +4889,42 @@ silicon-smelter-top
   index: -1
 liquid-source
   rotate: false
-  xy: 785, 29
+  xy: 1205, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source-icon-logic
   rotate: false
-  xy: 785, 29
+  xy: 1205, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 813, 585
+  xy: 1035, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void-icon-logic
   rotate: false
-  xy: 813, 585
+  xy: 1035, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 915, 533
+  xy: 1103, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter-icon-logic
   rotate: false
-  xy: 915, 533
+  xy: 1103, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4973,14 +4973,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 819, 102
+  xy: 1341, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 819, 68
+  xy: 1341, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5085,91 +5085,91 @@ spore-press-top
   index: -1
 boulder1
   rotate: false
-  xy: 1527, 711
+  xy: 1579, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 boulder2
   rotate: false
-  xy: 1577, 711
+  xy: 1629, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dacite-boulder1
   rotate: false
-  xy: 697, 653
+  xy: 747, 653
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dacite-boulder2
   rotate: false
-  xy: 747, 653
+  xy: 797, 653
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-boulder1
   rotate: false
-  xy: 887, 125
+  xy: 1341, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 853, 57
+  xy: 1375, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 921, 91
+  xy: 1409, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 921, 57
+  xy: 1443, 507
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-boulder1
   rotate: false
-  xy: 1547, 511
+  xy: 333, 503
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snow-boulder2
   rotate: false
-  xy: 1597, 511
+  xy: 283, 453
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 1317, 511
+  xy: 1581, 569
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 1359, 511
+  xy: 1623, 569
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 1401, 511
+  xy: 1665, 569
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -5190,35 +5190,35 @@ container-team
   index: -1
 unloader
   rotate: false
-  xy: 477, 601
+  xy: 1545, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-icon-logic
   rotate: false
-  xy: 477, 601
+  xy: 1545, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 205, 557
+  xy: 1579, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 arc-heat
   rotate: false
-  xy: 133, 497
+  xy: 301, 369
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 275, 165
+  xy: 1945, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5232,7 +5232,7 @@ block-2
   index: -1
 hail-heat
   rotate: false
-  xy: 1945, 409
+  xy: 483, 529
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -5253,7 +5253,7 @@ salvo-heat
   index: -1
 scorch-heat
   rotate: false
-  xy: 887, 57
+  xy: 1375, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5295,7 +5295,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 853, 125
+  xy: 1341, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5316,14 +5316,14 @@ resupply-point-icon-logic
   index: -1
 copper-wall
   rotate: false
-  xy: 581, 131
+  xy: 865, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-icon-logic
   rotate: false
-  xy: 581, 131
+  xy: 865, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5344,14 +5344,14 @@ copper-wall-large-icon-logic
   index: -1
 door
   rotate: false
-  xy: 632, 335
+  xy: 899, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-icon-logic
   rotate: false
-  xy: 632, 335
+  xy: 899, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5379,21 +5379,21 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 632, 301
+  xy: 933, 421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 915, 363
+  xy: 1239, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-icon-logic
   rotate: false
-  xy: 915, 363
+  xy: 1239, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5414,14 +5414,14 @@ phase-wall-large-icon-logic
   index: -1
 plastanium-wall
   rotate: false
-  xy: 799, 245
+  xy: 1307, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall-icon-logic
   rotate: false
-  xy: 799, 245
+  xy: 1307, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5470,42 +5470,42 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 853, 23
+  xy: 1409, 501
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 887, 23
+  xy: 1443, 541
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 921, 159
+  xy: 1341, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 921, 159
+  xy: 1341, 399
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 205, 659
+  xy: 1477, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-icon-logic
   rotate: false
-  xy: 205, 659
+  xy: 1477, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5526,14 +5526,14 @@ surge-wall-large-icon-logic
   index: -1
 thorium-wall
   rotate: false
-  xy: 239, 669
+  xy: 1545, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-icon-logic
   rotate: false
-  xy: 239, 669
+  xy: 1545, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5554,14 +5554,14 @@ thorium-wall-large-icon-logic
   index: -1
 titanium-wall
   rotate: false
-  xy: 477, 669
+  xy: 1579, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-icon-logic
   rotate: false
-  xy: 477, 669
+  xy: 1579, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5596,175 +5596,175 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 1987, 475
+  xy: 1979, 743
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
   index: -1
 circle-mid
   rotate: false
-  xy: 975, 196
+  xy: 466, 168
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
   index: -1
 error
   rotate: false
-  xy: 1147, 661
+  xy: 1197, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 laser
   rotate: false
-  xy: 1977, 711
+  xy: 233, 711
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 minelaser
   rotate: false
-  xy: 1983, 711
+  xy: 454, 319
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 missile
   rotate: false
-  xy: 133, 679
+  xy: 1783, 573
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 133, 641
+  xy: 1821, 573
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 parallax-laser
   rotate: false
-  xy: 167, 515
+  xy: 460, 319
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 particle
   rotate: false
-  xy: 1275, 511
+  xy: 1539, 569
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 scale_marker
   rotate: false
-  xy: 1191, 605
+  xy: 233, 411
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
   index: -1
 shell
   rotate: false
-  xy: 133, 603
+  xy: 1859, 573
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 133, 565
+  xy: 1897, 573
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 167, 465
+  xy: 433, 215
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 443, 601
+  xy: 1613, 467
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white
   rotate: false
-  xy: 1197, 706
+  xy: 271, 201
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
   index: -1
 alpha-icon-logic
   rotate: false
-  xy: 133, 369
+  xy: 1935, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alpha-outline
   rotate: false
-  xy: 1027, 711
+  xy: 1079, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-wreck0
   rotate: false
-  xy: 1077, 711
+  xy: 1129, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-wreck1
   rotate: false
-  xy: 1127, 711
+  xy: 1179, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-wreck2
   rotate: false
-  xy: 1177, 711
+  xy: 1229, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 antumbra-icon-logic
   rotate: false
-  xy: 981, 493
+  xy: 403, 369
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 arc
   rotate: false
-  xy: 133, 531
+  xy: 267, 369
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 arc-icon-logic
   rotate: false
-  xy: 133, 463
+  xy: 274, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-arc-full
   rotate: false
-  xy: 133, 463
+  xy: 274, 335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 arkyid-icon-logic
   rotate: false
-  xy: 133, 429
+  xy: 335, 369
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5778,14 +5778,14 @@ arkyid-leg
   index: -1
 artillery-outline
   rotate: false
-  xy: 1277, 703
+  xy: 1329, 703
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 atrax-foot
   rotate: false
-  xy: 1945, 451
+  xy: 483, 613
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -5799,28 +5799,28 @@ atrax-icon-logic
   index: -1
 atrax-joint
   rotate: false
-  xy: 175, 745
+  xy: 1969, 583
   size: 26, 26
   orig: 26, 26
   offset: 0, 0
   index: -1
 atrax-leg
   rotate: false
-  xy: 137, 745
+  xy: 1707, 583
   size: 36, 26
   orig: 36, 26
   offset: 0, 0
   index: -1
 atrax-leg-base
   rotate: false
-  xy: 133, 717
+  xy: 1745, 583
   size: 36, 26
   orig: 36, 26
   offset: 0, 0
   index: -1
 beta-icon-logic
   rotate: false
-  xy: 241, 31
+  xy: 241, 1
   size: 32, 30
   orig: 32, 30
   offset: 0, 0
@@ -5855,35 +5855,35 @@ beta-wreck2
   index: -1
 blast-compound-icon-logic
   rotate: false
-  xy: 269, 369
+  xy: 1911, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 269, 369
+  xy: 1911, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-basalt-full
   rotate: false
-  xy: 275, 131
+  xy: 1979, 549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-boulder-full
   rotate: false
-  xy: 1377, 711
+  xy: 1429, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-char-full
   rotate: false
-  xy: 275, 63
+  xy: 525, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5904,14 +5904,14 @@ command-center-icon-logic
   index: -1
 block-conduit-full
   rotate: false
-  xy: 275, 29
+  xy: 525, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-icon-logic
   rotate: false
-  xy: 275, 29
+  xy: 525, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5932,28 +5932,28 @@ container-icon-logic
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 292, 335
+  xy: 525, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 292, 335
+  xy: 525, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-icon-logic
   rotate: false
-  xy: 292, 335
+  xy: 525, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-craters-full
   rotate: false
-  xy: 292, 301
+  xy: 525, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5988,119 +5988,119 @@ cultivator-icon-logic
   index: -1
 block-dacite-boulder-full
   rotate: false
-  xy: 1427, 711
+  xy: 1479, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dacite-full
   rotate: false
-  xy: 289, 267
+  xy: 525, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dacite-wall-full
   rotate: false
-  xy: 289, 233
+  xy: 525, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 289, 199
+  xy: 525, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 303, 369
+  xy: 525, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dirt-full
   rotate: false
-  xy: 309, 165
+  xy: 559, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dirt-wall-full
   rotate: false
-  xy: 309, 131
+  xy: 593, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dune-wall-full
   rotate: false
-  xy: 309, 97
+  xy: 559, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 309, 63
+  xy: 559, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-logic
   rotate: false
-  xy: 309, 63
+  xy: 559, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-grass-full
   rotate: false
-  xy: 309, 29
+  xy: 593, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hail-full
   rotate: false
-  xy: 326, 335
+  xy: 559, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail-icon-logic
   rotate: false
-  xy: 326, 335
+  xy: 559, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 326, 301
+  xy: 593, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 323, 267
+  xy: 559, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 323, 233
+  xy: 593, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-wall-full
   rotate: false
-  xy: 323, 199
+  xy: 559, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6121,21 +6121,21 @@ lancer-icon-logic
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 337, 369
+  xy: 593, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-logic
   rotate: false
-  xy: 337, 369
+  xy: 593, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 343, 165
+  xy: 559, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6156,63 +6156,63 @@ mechanical-drill-icon-logic
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 343, 131
+  xy: 593, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 343, 63
+  xy: 593, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-mud-full
   rotate: false
-  xy: 343, 29
+  xy: 593, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 360, 335
+  xy: 525, 349
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 360, 301
+  xy: 559, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 357, 267
+  xy: 593, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 357, 233
+  xy: 627, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 357, 199
+  xy: 661, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 371, 369
+  xy: 627, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6233,7 +6233,7 @@ parallax-icon-logic
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 377, 165
+  xy: 627, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6254,14 +6254,14 @@ phase-weaver-icon-logic
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 377, 131
+  xy: 661, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-icon-logic
   rotate: false
-  xy: 377, 131
+  xy: 661, 587
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6282,49 +6282,49 @@ pneumatic-drill-icon-logic
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 377, 97
+  xy: 627, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-logic
   rotate: false
-  xy: 377, 97
+  xy: 627, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 377, 63
+  xy: 661, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-logic
   rotate: false
-  xy: 377, 63
+  xy: 661, 553
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 377, 29
+  xy: 627, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-icon-logic
   rotate: false
-  xy: 377, 29
+  xy: 627, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-salt-wall-full
   rotate: false
-  xy: 394, 335
+  xy: 661, 519
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6345,21 +6345,21 @@ salvo-icon-logic
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 394, 301
+  xy: 627, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 391, 267
+  xy: 661, 485
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-wall-full
   rotate: false
-  xy: 391, 233
+  xy: 627, 417
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6380,35 +6380,35 @@ scatter-icon-logic
   index: -1
 block-scorch-full
   rotate: false
-  xy: 391, 199
+  xy: 661, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch-icon-logic
   rotate: false
-  xy: 391, 199
+  xy: 661, 451
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 405, 369
+  xy: 627, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 405, 369
+  xy: 627, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-icon-logic
   rotate: false
-  xy: 405, 369
+  xy: 627, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6443,63 +6443,63 @@ segment-icon-logic
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 411, 131
+  xy: 661, 383
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 411, 97
+  xy: 695, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-wall-full
   rotate: false
-  xy: 411, 63
+  xy: 729, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 411, 29
+  xy: 695, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-boulder-full
   rotate: false
-  xy: 1477, 711
+  xy: 1529, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 428, 335
+  xy: 763, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-wall-full
   rotate: false
-  xy: 428, 301
+  xy: 695, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-spore-cluster-full
   rotate: false
-  xy: 1987, 433
+  xy: 483, 571
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 425, 267
+  xy: 729, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6520,7 +6520,7 @@ spore-press-icon-logic
   index: -1
 block-spore-wall-full
   rotate: false
-  xy: 425, 233
+  xy: 797, 619
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6541,14 +6541,14 @@ steam-generator-icon-logic
   index: -1
 block-stone-full
   rotate: false
-  xy: 425, 199
+  xy: 695, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-wall-full
   rotate: false
-  xy: 439, 369
+  xy: 729, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6569,28 +6569,28 @@ swarmer-icon-logic
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 445, 165
+  xy: 763, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 445, 131
+  xy: 695, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 445, 131
+  xy: 695, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-logic
   rotate: false
-  xy: 445, 131
+  xy: 695, 483
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6625,21 +6625,21 @@ wave-icon-logic
   index: -1
 bryde-icon-logic
   rotate: false
-  xy: 473, 369
+  xy: 729, 449
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal-icon-logic
   rotate: false
-  xy: 479, 131
+  xy: 797, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 479, 131
+  xy: 797, 517
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6674,21 +6674,21 @@ container-team-sharded
   index: -1
 copper-icon-logic
   rotate: false
-  xy: 581, 165
+  xy: 865, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 581, 165
+  xy: 865, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 corvus-icon-logic
   rotate: false
-  xy: 133, 407
+  xy: 1647, 479
   size: 31, 20
   orig: 31, 20
   offset: 0, 0
@@ -6702,70 +6702,70 @@ corvus-joint
   index: -1
 corvus-leg
   rotate: false
-  xy: 949, 497
+  xy: 283, 129
   size: 30, 68
   orig: 30, 68
   offset: 0, 0
   index: -1
 corvus-leg-base
   rotate: false
-  xy: 949, 431
+  xy: 283, 63
   size: 30, 64
   orig: 30, 64
   offset: 0, 0
   index: -1
 cracks-1-0
   rotate: false
-  xy: 581, 97
+  xy: 865, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 581, 63
+  xy: 899, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 581, 29
+  xy: 933, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 598, 335
+  xy: 899, 591
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 598, 301
+  xy: 899, 557
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 595, 267
+  xy: 933, 591
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 595, 233
+  xy: 899, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 595, 199
+  xy: 933, 557
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6828,175 +6828,175 @@ cracks-2-7
   index: -1
 crawler-icon-logic
   rotate: false
-  xy: 609, 369
+  xy: 899, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 1777, 711
+  xy: 1829, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-outline
   rotate: false
-  xy: 1827, 711
+  xy: 1879, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-wreck0
   rotate: false
-  xy: 1877, 711
+  xy: 1929, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-wreck1
   rotate: false
-  xy: 1927, 711
+  xy: 647, 655
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-wreck2
   rotate: false
-  xy: 647, 655
+  xy: 697, 653
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 cryofluid-icon-logic
   rotate: false
-  xy: 615, 131
+  xy: 899, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 615, 131
+  xy: 899, 455
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dagger-icon-logic
   rotate: false
-  xy: 615, 97
+  xy: 933, 489
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 897, 659
+  xy: 947, 659
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-outline
   rotate: false
-  xy: 947, 661
+  xy: 997, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-wreck0
   rotate: false
-  xy: 997, 661
+  xy: 1047, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-wreck1
   rotate: false
-  xy: 1047, 661
+  xy: 1097, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-wreck2
   rotate: false
-  xy: 1097, 661
+  xy: 1147, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 duo
   rotate: false
-  xy: 629, 267
+  xy: 899, 353
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 eclipse-icon-logic
   rotate: false
-  xy: 629, 233
+  xy: 933, 387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 eruption-outline
   rotate: false
-  xy: 1247, 645
+  xy: 1297, 645
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flamethrower-outline
   rotate: false
-  xy: 1397, 653
+  xy: 1447, 653
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flare-icon-logic
   rotate: false
-  xy: 629, 199
+  xy: 933, 353
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 flare-outline
   rotate: false
-  xy: 1497, 661
+  xy: 1547, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flare-wreck0
   rotate: false
-  xy: 1547, 661
+  xy: 1597, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flare-wreck1
   rotate: false
-  xy: 1597, 661
+  xy: 1647, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flare-wreck2
   rotate: false
-  xy: 1647, 661
+  xy: 1697, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 fortress-icon-logic
   rotate: false
-  xy: 241, 4
+  xy: 271, 206
   size: 32, 25
   orig: 32, 25
   offset: 0, 0
   index: -1
 gamma-icon-logic
   rotate: false
-  xy: 643, 369
+  xy: 967, 625
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7017,665 +7017,665 @@ gamma-wreck2
   index: -1
 graphite-icon-logic
   rotate: false
-  xy: 649, 165
+  xy: 967, 591
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 649, 165
+  xy: 967, 591
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail
   rotate: false
-  xy: 649, 131
+  xy: 967, 557
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 heal-shotgun-weapon-outline
   rotate: false
-  xy: 875, 709
+  xy: 927, 709
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 heal-weapon-mount-outline
   rotate: false
-  xy: 1797, 661
+  xy: 1847, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 heal-weapon-outline
   rotate: false
-  xy: 1847, 661
+  xy: 1897, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 horizon-icon-logic
   rotate: false
-  xy: 649, 97
+  xy: 967, 523
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 1987, 391
+  xy: 483, 487
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-blast-compound-small
   rotate: false
-  xy: 343, 3
+  xy: 1681, 543
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-tiny
   rotate: false
-  xy: 2029, 457
+  xy: 433, 369
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 1897, 661
+  xy: 1947, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 1797, 419
+  xy: 483, 445
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-small
   rotate: false
-  xy: 306, 575
+  xy: 283, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-tiny
   rotate: false
-  xy: 1923, 427
+  xy: 2027, 901
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 1947, 661
+  xy: 1997, 675
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 1839, 419
+  xy: 483, 403
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 949, 371
+  xy: 344, 173
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-tiny
   rotate: false
-  xy: 1275, 577
+  xy: 1477, 585
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 1997, 675
+  xy: 1997, 625
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-graphite-large
   rotate: false
-  xy: 1881, 403
+  xy: 183, 369
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 1040, 501
+  xy: 315, 105
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-tiny
   rotate: false
-  xy: 2027, 901
+  xy: 1783, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 1997, 625
+  xy: 1347, 603
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 897, 567
+  xy: 190, 327
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 683, 131
+  xy: 1001, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead-icon-logic
   rotate: false
-  xy: 683, 131
+  xy: 1001, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 981, 433
+  xy: 1681, 517
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-tiny
   rotate: false
-  xy: 511, 685
+  xy: 451, 369
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1297, 603
+  xy: 1397, 603
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 939, 567
+  xy: 483, 361
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 683, 63
+  xy: 1103, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metaglass-icon-logic
   rotate: false
-  xy: 683, 63
+  xy: 1103, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 1009, 467
+  xy: 1707, 523
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-tiny
   rotate: false
-  xy: 885, 5
+  xy: 436, 351
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1347, 603
+  xy: 1447, 603
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 981, 569
+  xy: 190, 285
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 700, 335
+  xy: 1035, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-fabric-icon-logic
   rotate: false
-  xy: 700, 335
+  xy: 1035, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 369, 3
+  xy: 370, 173
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-tiny
   rotate: false
-  xy: 1170, 509
+  xy: 1801, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1397, 603
+  xy: 1497, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 1023, 569
+  xy: 187, 243
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 697, 267
+  xy: 1137, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-icon-logic
   rotate: false
-  xy: 697, 267
+  xy: 1137, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 332, 575
+  xy: 315, 79
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-tiny
   rotate: false
-  xy: 499, 11
+  xy: 436, 333
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1447, 611
+  xy: 1547, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 1065, 569
+  xy: 187, 201
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 697, 199
+  xy: 1035, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-icon-logic
   rotate: false
-  xy: 697, 199
+  xy: 1035, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 949, 345
+  xy: 1733, 523
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-tiny
   rotate: false
-  xy: 460, 583
+  xy: 1819, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1497, 611
+  xy: 1597, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 1107, 569
+  xy: 225, 369
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 717, 165
+  xy: 1103, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-icon-logic
   rotate: false
-  xy: 717, 165
+  xy: 1103, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1066, 501
+  xy: 410, 343
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-tiny
   rotate: false
-  xy: 2029, 439
+  xy: 436, 315
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1547, 611
+  xy: 1647, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 1149, 569
+  xy: 232, 327
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 717, 97
+  xy: 1001, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-icon-logic
   rotate: false
-  xy: 717, 97
+  xy: 1001, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 395, 3
+  xy: 410, 317
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 1923, 409
+  xy: 1837, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1597, 611
+  xy: 1697, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1191, 553
+  xy: 232, 285
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 717, 29
+  xy: 1069, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 silicon-icon-logic
   rotate: false
-  xy: 717, 29
+  xy: 1069, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 358, 575
+  xy: 410, 291
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 1275, 559
+  xy: 436, 297
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1647, 611
+  xy: 1747, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 1233, 553
+  xy: 229, 243
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 731, 267
+  xy: 1205, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pod-icon-logic
   rotate: false
-  xy: 731, 267
+  xy: 1205, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1092, 501
+  xy: 410, 265
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 511, 667
+  xy: 1855, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 1697, 611
+  xy: 1797, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 981, 527
+  xy: 229, 201
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 731, 199
+  xy: 1035, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-alloy-icon-logic
   rotate: false
-  xy: 731, 199
+  xy: 1035, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 421, 3
+  xy: 407, 239
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 903, 5
+  xy: 436, 279
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 1747, 611
+  xy: 1847, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 1023, 527
+  xy: 241, 159
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 751, 165
+  xy: 1103, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-icon-logic
   rotate: false
-  xy: 751, 165
+  xy: 1103, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 384, 575
+  xy: 407, 213
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 517, 11
+  xy: 1873, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 1797, 611
+  xy: 1897, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 1065, 527
+  xy: 241, 117
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 751, 97
+  xy: 1171, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-icon-logic
   rotate: false
-  xy: 751, 97
+  xy: 1171, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1118, 501
+  xy: 1544, 339
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 478, 583
+  xy: 1891, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 1847, 611
+  xy: 1947, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7689,175 +7689,175 @@ lancer
   index: -1
 large-artillery-outline
   rotate: false
-  xy: 1947, 593
+  xy: 133, 633
   size: 48, 66
   orig: 48, 66
   offset: 0, 0
   index: -1
 large-weapon-outline
   rotate: false
-  xy: 1447, 561
+  xy: 133, 533
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 1107, 527
+  xy: 241, 75
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 447, 3
+  xy: 1681, 491
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 2029, 421
+  xy: 1909, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 1497, 561
+  xy: 133, 483
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1149, 527
+  xy: 241, 33
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 765, 233
+  xy: 1171, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oil-icon-logic
   rotate: false
-  xy: 765, 233
+  xy: 1171, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 410, 575
+  xy: 1707, 497
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 511, 649
+  xy: 1927, 521
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 1547, 561
+  xy: 133, 433
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 1191, 511
+  xy: 1997, 583
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 785, 63
+  xy: 1171, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 slag-icon-logic
   rotate: false
-  xy: 785, 63
+  xy: 1171, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 1144, 501
+  xy: 1733, 497
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 921, 5
+  xy: 1945, 525
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 1597, 561
+  xy: 133, 383
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 1233, 511
+  xy: 1497, 569
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 813, 551
+  xy: 1103, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-icon-logic
   rotate: false
-  xy: 813, 551
+  xy: 1103, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 473, 3
+  xy: 315, 53
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 535, 11
+  xy: 1783, 503
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 1647, 561
+  xy: 183, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mace-icon-logic
   rotate: false
-  xy: 847, 539
+  xy: 1137, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7899,84 +7899,84 @@ mace-wreck2
   index: -1
 mega-icon-logic
   rotate: false
-  xy: 881, 533
+  xy: 1069, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 minke-icon-logic
   rotate: false
-  xy: 1011, 493
+  xy: 315, 165
   size: 27, 32
   orig: 27, 32
   offset: 0, 0
   index: -1
 missiles-mount-outline
   rotate: false
-  xy: 1797, 561
+  xy: 183, 561
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-icon-logic
   rotate: false
-  xy: 915, 465
+  xy: 1171, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mono-outline
   rotate: false
-  xy: 1947, 543
+  xy: 183, 411
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-wreck0
   rotate: false
-  xy: 1997, 525
+  xy: 233, 653
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-wreck1
   rotate: false
-  xy: 847, 607
+  xy: 233, 603
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-wreck2
   rotate: false
-  xy: 897, 609
+  xy: 233, 553
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-purple-weapon-outline
   rotate: false
-  xy: 997, 611
+  xy: 283, 603
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-weapon-outline
   rotate: false
-  xy: 1097, 611
+  xy: 233, 503
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 nova-icon-logic
   rotate: false
-  xy: 813, 449
+  xy: 1205, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 nova-leg
   rotate: false
-  xy: 1197, 595
+  xy: 333, 603
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8011,14 +8011,14 @@ nova-wreck2
   index: -1
 oct-icon-logic
   rotate: false
-  xy: 847, 437
+  xy: 1137, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 omura-icon-logic
   rotate: false
-  xy: 436, 567
+  xy: 1759, 505
   size: 22, 32
   orig: 22, 32
   offset: 0, 0
@@ -8032,7 +8032,7 @@ parallax
   index: -1
 poly-icon-logic
   rotate: false
-  xy: 870, 261
+  xy: 1239, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8067,7 +8067,7 @@ poly-wreck2
   index: -1
 pulsar-icon-logic
   rotate: false
-  xy: 833, 204
+  xy: 1273, 412
   size: 32, 27
   orig: 32, 27
   offset: 0, 0
@@ -8109,35 +8109,35 @@ pulsar-wreck2
   index: -1
 quad-icon-logic
   rotate: false
-  xy: 819, 1
+  xy: 1579, 366
   size: 31, 31
   orig: 31, 31
   offset: 0, 0
   index: -1
 quasar-icon-logic
   rotate: false
-  xy: 819, 34
+  xy: 1375, 569
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 reign-icon-logic
   rotate: false
-  xy: 852, 1
+  xy: 1511, 343
   size: 31, 20
   orig: 31, 20
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 853, 159
+  xy: 1375, 535
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 risso-icon-logic
   rotate: false
-  xy: 949, 397
+  xy: 1647, 445
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
@@ -8158,7 +8158,7 @@ scatter
   index: -1
 scepter-icon-logic
   rotate: false
-  xy: 275, 1
+  xy: 1443, 575
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
@@ -8172,7 +8172,7 @@ scepter-weapon-outline
   index: -1
 scorch
   rotate: false
-  xy: 887, 91
+  xy: 1341, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8186,49 +8186,49 @@ segment
   index: -1
 sei-icon-logic
   rotate: false
-  xy: 921, 125
+  xy: 1375, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shock-mine-icon-logic
   rotate: false
-  xy: 938, 295
+  xy: 1409, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 small-basic-weapon-outline
   rotate: false
-  xy: 1347, 553
+  xy: 233, 453
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-mount-weapon-outline
   rotate: false
-  xy: 1447, 511
+  xy: 383, 603
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spiroct-foot
   rotate: false
-  xy: 1897, 445
+  xy: 483, 655
   size: 46, 46
   orig: 46, 46
   offset: 0, 0
   index: -1
 spiroct-icon-logic
   rotate: false
-  xy: 273, 574
+  xy: 1613, 406
   size: 31, 25
   orig: 31, 25
   offset: 0, 0
   index: -1
 spiroct-joint
   rotate: false
-  xy: 935, 193
+  xy: 1443, 439
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8242,98 +8242,98 @@ spiroct-leg
   index: -1
 spiroct-leg-base
   rotate: false
-  xy: 1647, 525
+  xy: 233, 417
   size: 48, 34
   orig: 48, 34
   offset: 0, 0
   index: -1
 spiroct-weapon-outline
   rotate: false
-  xy: 1747, 503
+  xy: 433, 587
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 splash-0
   rotate: false
-  xy: 955, 159
+  xy: 1443, 405
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-1
   rotate: false
-  xy: 955, 125
+  xy: 1341, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-10
   rotate: false
-  xy: 205, 727
+  xy: 1409, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-11
   rotate: false
-  xy: 205, 693
+  xy: 1443, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-2
   rotate: false
-  xy: 955, 91
+  xy: 1375, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-3
   rotate: false
-  xy: 955, 57
+  xy: 1409, 365
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-4
   rotate: false
-  xy: 955, 23
+  xy: 1443, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-5
   rotate: false
-  xy: 171, 711
+  xy: 1239, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-6
   rotate: false
-  xy: 171, 677
+  xy: 1273, 344
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-7
   rotate: false
-  xy: 171, 643
+  xy: 1307, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-8
   rotate: false
-  xy: 171, 609
+  xy: 1341, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-9
   rotate: false
-  xy: 171, 575
+  xy: 1375, 331
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8347,14 +8347,14 @@ swarmer
   index: -1
 toxopid-icon-logic
   rotate: false
-  xy: 981, 459
+  xy: 315, 131
   size: 26, 32
   orig: 26, 32
   offset: 0, 0
   index: -1
 unit-alpha-full
   rotate: false
-  xy: 1797, 511
+  xy: 383, 503
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8368,21 +8368,21 @@ unit-beta-full
   index: -1
 unit-crawler-full
   rotate: false
-  xy: 1847, 511
+  xy: 333, 453
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 1647, 475
+  xy: 433, 537
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-flare-full
   rotate: false
-  xy: 1897, 493
+  xy: 383, 453
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8403,7 +8403,7 @@ unit-mace-full
   index: -1
 unit-mono-full
   rotate: false
-  xy: 1947, 493
+  xy: 433, 487
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8431,7 +8431,7 @@ unit-pulsar-full
   index: -1
 vela-icon-logic
   rotate: false
-  xy: 309, 1
+  xy: 1477, 337
   size: 32, 26
   orig: 32, 26
   offset: 0, 0
@@ -8445,165 +8445,172 @@ wave
   index: -1
 zenith-icon-logic
   rotate: false
-  xy: 239, 567
+  xy: 1613, 433
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 zenith-missiles-outline
   rotate: false
-  xy: 1847, 461
+  xy: 433, 387
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 663, 267
+  xy: 967, 353
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 663, 233
+  xy: 1001, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 663, 199
+  xy: 1035, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 677, 369
+  xy: 1001, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 683, 165
+  xy: 1069, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 683, 97
+  xy: 1035, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 683, 29
+  xy: 1001, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 700, 301
+  xy: 1069, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 697, 233
+  xy: 1001, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 711, 369
+  xy: 1069, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 717, 131
+  xy: 1171, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 717, 63
+  xy: 1035, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 734, 301
+  xy: 1137, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 731, 233
+  xy: 1001, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 745, 369
+  xy: 1069, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 751, 131
+  xy: 1137, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 768, 335
+  xy: 1069, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 765, 267
+  xy: 1137, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 785, 97
+  xy: 1137, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 847, 573
+  xy: 1069, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blank
   rotate: false
-  xy: 799, 298
+  xy: 271, 282
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
+circle-small
+  rotate: false
+  xy: 1993, 919
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
 shape-3
   rotate: false
   xy: 67, 304
@@ -8613,14 +8620,14 @@ shape-3
   index: -1
 alpha
   rotate: false
-  xy: 927, 711
+  xy: 979, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-cell
   rotate: false
-  xy: 977, 711
+  xy: 1029, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8641,49 +8648,49 @@ beta
   index: -1
 beta-cell
   rotate: false
-  xy: 1327, 711
+  xy: 1379, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler
   rotate: false
-  xy: 1627, 711
+  xy: 1679, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 1677, 711
+  xy: 1729, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-cell
   rotate: false
-  xy: 1727, 711
+  xy: 1779, 711
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 797, 653
+  xy: 847, 657
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 847, 657
+  xy: 897, 659
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flare
   rotate: false
-  xy: 1447, 661
+  xy: 1497, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8725,14 +8732,14 @@ mace-cell
   index: -1
 mono
   rotate: false
-  xy: 1847, 561
+  xy: 183, 511
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-cell
   rotate: false
-  xy: 1897, 543
+  xy: 183, 461
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8746,7 +8753,7 @@ nova
   index: -1
 nova-base
   rotate: false
-  xy: 1147, 611
+  xy: 333, 653
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8788,7 +8795,7 @@ pulsar
   index: -1
 pulsar-base
   rotate: false
-  xy: 1247, 595
+  xy: 333, 553
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8802,105 +8809,105 @@ pulsar-cell
   index: -1
 vanguard
   rotate: false
-  xy: 1997, 475
+  xy: 283, 403
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-cell
   rotate: false
-  xy: 1697, 453
+  xy: 333, 403
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery
   rotate: false
-  xy: 1227, 703
+  xy: 1279, 703
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 eruption
   rotate: false
-  xy: 1197, 645
+  xy: 1247, 645
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun
   rotate: false
-  xy: 1297, 653
+  xy: 1347, 653
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower
   rotate: false
-  xy: 1347, 653
+  xy: 1397, 653
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-shotgun-weapon
   rotate: false
-  xy: 1993, 919
+  xy: 875, 709
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 heal-weapon
   rotate: false
-  xy: 1697, 661
+  xy: 1747, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 heal-weapon-mount
   rotate: false
-  xy: 1747, 661
+  xy: 1797, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 large-artillery
   rotate: false
-  xy: 1897, 593
+  xy: 133, 701
   size: 48, 66
   orig: 48, 66
   offset: 0, 0
   index: -1
 large-weapon
   rotate: false
-  xy: 1997, 575
+  xy: 133, 583
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles
   rotate: false
-  xy: 1697, 561
+  xy: 183, 661
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-mount
   rotate: false
-  xy: 1747, 561
+  xy: 183, 611
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-purple-weapon
   rotate: false
-  xy: 947, 611
+  xy: 283, 653
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-weapon
   rotate: false
-  xy: 1047, 611
+  xy: 283, 553
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8914,42 +8921,42 @@ scepter-weapon
   index: -1
 small-basic-weapon
   rotate: false
-  xy: 1297, 553
+  xy: 283, 503
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-mount-weapon
   rotate: false
-  xy: 1397, 553
+  xy: 383, 653
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-weapon
   rotate: false
-  xy: 1497, 511
+  xy: 383, 553
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spiroct-weapon
   rotate: false
-  xy: 1697, 503
+  xy: 433, 645
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 weapon
   rotate: false
-  xy: 1747, 453
+  xy: 383, 403
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 zenith-missiles
   rotate: false
-  xy: 1797, 461
+  xy: 433, 437
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png
index 368d240ff6..472204b9de 100644
Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ
diff --git a/core/assets/sprites/fallback/sprites5.png b/core/assets/sprites/fallback/sprites5.png
index a54d30605b..2a1c6bd865 100644
Binary files a/core/assets/sprites/fallback/sprites5.png and b/core/assets/sprites/fallback/sprites5.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 00e5951cd0..416414c949 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -83,21 +83,21 @@ mend-projector-top
   index: -1
 mender
   rotate: false
-  xy: 2449, 472
+  xy: 2581, 1751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-icon-logic
   rotate: false
-  xy: 2449, 472
+  xy: 2581, 1751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 2449, 438
+  xy: 2581, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -146,7 +146,7 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 2409, 2109
+  xy: 2363, 816
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -181,63 +181,63 @@ block-unloader-icon-logic
   index: -1
 bridge-arrow
   rotate: false
-  xy: 2361, 1644
+  xy: 2279, 578
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 2279, 684
+  xy: 2313, 544
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-icon-logic
   rotate: false
-  xy: 2279, 684
+  xy: 2313, 544
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 2279, 650
+  xy: 2279, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 2279, 616
+  xy: 2313, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 2279, 548
+  xy: 2313, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-0-0
   rotate: false
-  xy: 2277, 1076
+  xy: 2357, 1360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-icon-logic
   rotate: false
-  xy: 2277, 1076
+  xy: 2357, 1360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-armored-conveyor-full
   rotate: false
-  xy: 2277, 1076
+  xy: 2357, 1360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -265,14 +265,14 @@ armored-conveyor-0-3
   index: -1
 armored-conveyor-1-0
   rotate: false
-  xy: 2319, 1126
+  xy: 2349, 1326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-1-1
   rotate: false
-  xy: 2277, 1042
+  xy: 2315, 1292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -300,7 +300,7 @@ armored-conveyor-2-0
   index: -1
 armored-conveyor-2-1
   rotate: false
-  xy: 2277, 1008
+  xy: 2349, 1292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -314,385 +314,385 @@ armored-conveyor-2-2
   index: -1
 armored-conveyor-2-3
   rotate: false
-  xy: 2277, 974
+  xy: 1189, 8
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-0
   rotate: false
-  xy: 1189, 8
+  xy: 2227, 1128
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-1
   rotate: false
-  xy: 2277, 940
+  xy: 2227, 1094
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-2
   rotate: false
-  xy: 2277, 906
+  xy: 2227, 1060
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-3-3
   rotate: false
-  xy: 1654, 3015
+  xy: 2227, 1026
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-0
   rotate: false
-  xy: 3559, 2622
+  xy: 2227, 992
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-1
   rotate: false
-  xy: 3593, 2622
+  xy: 2227, 958
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-2
   rotate: false
-  xy: 2291, 80
+  xy: 2227, 924
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 armored-conveyor-4-3
   rotate: false
-  xy: 2291, 46
+  xy: 2227, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 2313, 540
+  xy: 2575, 2125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 2347, 540
+  xy: 2571, 2091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 2313, 506
+  xy: 2411, 2052
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 2347, 506
+  xy: 2411, 2018
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 2313, 472
+  xy: 2411, 1984
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 2347, 472
+  xy: 2411, 1950
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 2313, 438
+  xy: 2411, 1916
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 2347, 438
+  xy: 2411, 1882
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 2317, 404
+  xy: 2411, 1848
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 2351, 404
+  xy: 2411, 1814
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 2381, 710
+  xy: 2411, 1780
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 2381, 676
+  xy: 2411, 1746
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 2381, 642
+  xy: 2411, 1712
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 2381, 608
+  xy: 2411, 1678
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 2381, 574
+  xy: 2411, 1644
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 2381, 540
+  xy: 2411, 1610
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 2381, 506
+  xy: 2411, 1576
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 2381, 472
+  xy: 2411, 1542
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 2381, 438
+  xy: 2445, 2059
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 3391, 2235
+  xy: 2615, 1785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-icon-logic
   rotate: false
-  xy: 3391, 2235
+  xy: 2615, 1785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 3425, 2269
+  xy: 2615, 1751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 3391, 2201
+  xy: 2615, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 3425, 2235
+  xy: 2615, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 3459, 2269
+  xy: 2615, 1649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 3425, 2201
+  xy: 2615, 1615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 2429, 1939
+  xy: 2577, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 2395, 1871
+  xy: 2611, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 2497, 1973
+  xy: 3143, 2317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 2463, 1939
+  xy: 3177, 2335
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 2429, 1905
+  xy: 3177, 2301
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 2395, 1837
+  xy: 3211, 2317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 2497, 1939
+  xy: 3245, 2323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 2463, 1905
+  xy: 3279, 2323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 2429, 1871
+  xy: 3313, 2323
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 2395, 1803
+  xy: 3211, 2283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 2497, 1905
+  xy: 3245, 2289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 2463, 1871
+  xy: 3279, 2289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 2429, 1837
+  xy: 3313, 2289
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 2395, 1769
+  xy: 3153, 2267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 2497, 1871
+  xy: 3153, 2233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 2463, 1837
+  xy: 3153, 2199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 2429, 1803
+  xy: 3187, 2249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 2395, 1735
+  xy: 3187, 2215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 2497, 1837
+  xy: 3221, 2249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 3279, 2391
+  xy: 2445, 1889
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -713,28 +713,28 @@ distributor-icon-logic
   index: -1
 inverted-sorter
   rotate: false
-  xy: 2413, 846
+  xy: 2513, 1787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 inverted-sorter-icon-logic
   rotate: false
-  xy: 2413, 846
+  xy: 2513, 1787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 3221, 2215
+  xy: 2547, 1921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction-icon-logic
   rotate: false
-  xy: 3221, 2215
+  xy: 2547, 1921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -748,14 +748,14 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 3415, 2337
+  xy: 2581, 1513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate-icon-logic
   rotate: false
-  xy: 3415, 2337
+  xy: 2581, 1513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -811,77 +811,77 @@ payload-router-over
   index: -1
 phase-conveyor
   rotate: false
-  xy: 3483, 2303
+  xy: 2615, 1955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-icon-logic
   rotate: false
-  xy: 3483, 2303
+  xy: 2615, 1955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 3357, 2269
+  xy: 2615, 1921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 3357, 2235
+  xy: 2615, 1887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 3391, 2269
+  xy: 2615, 1853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 3527, 2151
+  xy: 2375, 1224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router-icon-logic
   rotate: false
-  xy: 3527, 2151
+  xy: 2375, 1224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 2511, 2109
+  xy: 2381, 714
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter-icon-logic
   rotate: false
-  xy: 2511, 2109
+  xy: 2381, 714
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 2395, 1701
+  xy: 3255, 2221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate-icon-logic
   rotate: false
-  xy: 2395, 1701
+  xy: 3255, 2221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1056,28 +1056,28 @@ water-extractor-top
   index: -1
 block-border
   rotate: false
-  xy: 2387, 1152
+  xy: 2349, 1258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 2345, 880
+  xy: 2261, 794
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 2575, 2125
+  xy: 2295, 816
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 2313, 642
+  xy: 2347, 544
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1091,175 +1091,175 @@ place-arrow
   index: -1
 bridge-conduit
   rotate: false
-  xy: 2361, 1610
+  xy: 2313, 612
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-icon-logic
   rotate: false
-  xy: 2361, 1610
+  xy: 2313, 612
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 2361, 1576
+  xy: 2279, 544
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 2361, 1576
+  xy: 2279, 544
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 2361, 1542
+  xy: 2313, 578
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 2279, 718
+  xy: 2279, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 2313, 710
+  xy: 2347, 680
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 2347, 710
+  xy: 2347, 646
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 2313, 676
+  xy: 2347, 612
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 2347, 676
+  xy: 2347, 578
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 2347, 676
+  xy: 2347, 578
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 2347, 676
+  xy: 2347, 578
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 2347, 642
+  xy: 2347, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 2313, 608
+  xy: 2347, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 2347, 608
+  xy: 2347, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 2313, 574
+  xy: 2351, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 2313, 574
+  xy: 2351, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 2347, 574
+  xy: 2575, 2159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 3255, 2221
+  xy: 2547, 1853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction-icon-logic
   rotate: false
-  xy: 3255, 2221
+  xy: 2547, 1853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 3323, 2255
+  xy: 2547, 1751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 3323, 2221
+  xy: 2547, 1717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 3187, 2181
+  xy: 2547, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 3221, 2181
+  xy: 2547, 1649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 3255, 2187
+  xy: 2547, 1615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1287,140 +1287,140 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 2449, 642
+  xy: 2581, 1921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-icon-logic
   rotate: false
-  xy: 2449, 642
+  xy: 2581, 1921
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-liquid
   rotate: false
-  xy: 2449, 608
+  xy: 2581, 1887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-liquid
   rotate: false
-  xy: 2449, 608
+  xy: 2581, 1887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-liquid
   rotate: false
-  xy: 2449, 608
+  xy: 2581, 1887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 3415, 2303
+  xy: 2605, 2091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-icon-logic
   rotate: false
-  xy: 3415, 2303
+  xy: 2605, 2091
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 3449, 2337
+  xy: 2615, 2057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 3449, 2303
+  xy: 2615, 2023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 3483, 2337
+  xy: 2615, 1989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 3459, 2201
+  xy: 2615, 1547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 3493, 2269
+  xy: 2615, 1513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 3493, 2235
+  xy: 3587, 2421
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 3493, 2201
+  xy: 3587, 2387
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 3357, 2167
+  xy: 3085, 2261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 3391, 2167
+  xy: 3085, 2227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 3517, 2321
+  xy: 3211, 2385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 3551, 2355
+  xy: 3245, 2391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 3551, 2321
+  xy: 3279, 2391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 3585, 2353
+  xy: 3313, 2391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1525,77 +1525,77 @@ memory-bank-icon-logic
   index: -1
 memory-cell
   rotate: false
-  xy: 2449, 506
+  xy: 2581, 1785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 memory-cell-icon-logic
   rotate: false
-  xy: 2449, 506
+  xy: 2581, 1785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 2453, 404
+  xy: 2581, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message-icon-logic
   rotate: false
-  xy: 2453, 404
+  xy: 2581, 1683
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 micro-processor
   rotate: false
-  xy: 3347, 2337
+  xy: 2581, 1649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 micro-processor-icon-logic
   rotate: false
-  xy: 3347, 2337
+  xy: 2581, 1649
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 switch
   rotate: false
-  xy: 2395, 1905
+  xy: 2475, 1481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 switch-icon-logic
   rotate: false
-  xy: 2395, 1905
+  xy: 2475, 1481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 switch-on
   rotate: false
-  xy: 2497, 2007
+  xy: 2509, 1481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery
   rotate: false
-  xy: 2291, 12
+  xy: 2227, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-icon-logic
   rotate: false
-  xy: 2291, 12
+  xy: 2227, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1623,28 +1623,28 @@ battery-large-top
   index: -1
 battery-top
   rotate: false
-  xy: 2357, 1186
+  xy: 2227, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 2279, 480
+  xy: 2317, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-icon-logic
   rotate: false
-  xy: 2279, 480
+  xy: 2317, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 2279, 446
+  xy: 2347, 714
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1679,42 +1679,42 @@ differential-generator-top
   index: -1
 diode
   rotate: false
-  xy: 3245, 2357
+  xy: 2445, 1855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-icon-logic
   rotate: false
-  xy: 3245, 2357
+  xy: 2445, 1855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 3279, 2357
+  xy: 2479, 1889
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 2413, 948
+  xy: 2513, 1821
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-icon-logic
   rotate: false
-  xy: 2413, 948
+  xy: 2513, 1821
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 2413, 914
+  xy: 2445, 1719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1770,14 +1770,14 @@ impact-reactor-plasma-3
   index: -1
 power-node
   rotate: false
-  xy: 3459, 2167
+  xy: 3119, 2267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-icon-logic
   rotate: false
-  xy: 3459, 2167
+  xy: 3119, 2267
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1798,28 +1798,28 @@ power-node-large-icon-logic
   index: -1
 power-source
   rotate: false
-  xy: 3493, 2167
+  xy: 3119, 2233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-source-icon-logic
   rotate: false
-  xy: 3493, 2167
+  xy: 3119, 2233
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 3517, 2355
+  xy: 3119, 2199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void-icon-logic
   rotate: false
-  xy: 3517, 2355
+  xy: 3119, 2199
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1840,21 +1840,21 @@ rtg-generator-icon-logic
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 3561, 2285
+  xy: 2375, 1190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 2477, 2109
+  xy: 2363, 748
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-icon-logic
   rotate: false
-  xy: 2477, 2109
+  xy: 2363, 748
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2113,42 +2113,42 @@ graphite-press-icon-logic
   index: -1
 incinerator
   rotate: false
-  xy: 2413, 880
+  xy: 2479, 1753
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator-icon-logic
   rotate: false
-  xy: 2413, 880
+  xy: 2479, 1753
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 3211, 2283
+  xy: 2479, 1515
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source-icon-logic
   rotate: false
-  xy: 3211, 2283
+  xy: 2479, 1515
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 3221, 2249
+  xy: 2547, 1955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void-icon-logic
   rotate: false
-  xy: 3221, 2249
+  xy: 2547, 1955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2183,42 +2183,42 @@ silicon-smelter-top
   index: -1
 liquid-source
   rotate: false
-  xy: 2439, 812
+  xy: 2547, 1513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source-icon-logic
   rotate: false
-  xy: 2439, 812
+  xy: 2547, 1513
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 2439, 778
+  xy: 2581, 2057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void-icon-logic
   rotate: false
-  xy: 2439, 778
+  xy: 2581, 2057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 2449, 540
+  xy: 2581, 1819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter-icon-logic
   rotate: false
-  xy: 2449, 540
+  xy: 2581, 1819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2281,14 +2281,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 3585, 2319
+  xy: 3211, 2351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 3527, 2287
+  xy: 3245, 2357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2414,91 +2414,91 @@ spore-press-top
   index: -1
 boulder1
   rotate: false
-  xy: 1604, 2999
+  xy: 3796, 2610
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 boulder2
   rotate: false
-  xy: 3796, 2610
+  xy: 3817, 2560
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dacite-boulder1
   rotate: false
-  xy: 2221, 2086
+  xy: 2211, 2036
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dacite-boulder2
   rotate: false
-  xy: 2211, 2036
+  xy: 2211, 1986
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-boulder1
   rotate: false
-  xy: 3561, 2251
+  xy: 2367, 1156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 3561, 2217
+  xy: 2367, 1122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 3595, 2149
+  xy: 2363, 884
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 2375, 2109
+  xy: 2363, 850
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-boulder1
   rotate: false
-  xy: 2315, 1286
+  xy: 2361, 1636
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snow-boulder2
   rotate: false
-  xy: 2357, 1486
+  xy: 2361, 1586
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 1641, 6
+  xy: 2357, 1436
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 2277, 1152
+  xy: 2315, 1360
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 2277, 1110
+  xy: 2357, 1394
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -2589,21 +2589,21 @@ core-shard-team
   index: -1
 unloader
   rotate: false
-  xy: 2497, 1803
+  xy: 3289, 2255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-icon-logic
   rotate: false
-  xy: 2497, 1803
+  xy: 3289, 2255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 2463, 1769
+  xy: 3289, 2221
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2631,7 +2631,7 @@ arc-heat
   index: -1
 block-1
   rotate: false
-  xy: 2353, 1118
+  xy: 1654, 3015
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2701,7 +2701,7 @@ salvo-heat
   index: -1
 scorch-heat
   rotate: false
-  xy: 3561, 2149
+  xy: 2363, 1054
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2883,7 +2883,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 3527, 2185
+  xy: 2333, 10
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2918,14 +2918,14 @@ tetrative-reconstructor-top
   index: -1
 copper-wall
   rotate: false
-  xy: 3587, 2421
+  xy: 2479, 2059
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-icon-logic
   rotate: false
-  xy: 3587, 2421
+  xy: 2479, 2059
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2946,14 +2946,14 @@ copper-wall-large-icon-logic
   index: -1
 door
   rotate: false
-  xy: 3313, 2357
+  xy: 2513, 1923
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-icon-logic
   rotate: false
-  xy: 3313, 2357
+  xy: 2513, 1923
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2981,21 +2981,21 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 2315, 122
+  xy: 2445, 1821
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 3357, 2201
+  xy: 2615, 1819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-icon-logic
   rotate: false
-  xy: 3357, 2201
+  xy: 2615, 1819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3016,14 +3016,14 @@ phase-wall-large-icon-logic
   index: -1
 plastanium-wall
   rotate: false
-  xy: 3459, 2235
+  xy: 2615, 1581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-wall-icon-logic
   rotate: false
-  xy: 3459, 2235
+  xy: 2615, 1581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3100,42 +3100,42 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 3595, 2285
+  xy: 2363, 1020
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 3595, 2251
+  xy: 2363, 986
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 3595, 2217
+  xy: 2363, 952
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 3595, 2217
+  xy: 2363, 952
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 2429, 1973
+  xy: 2441, 1474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-icon-logic
   rotate: false
-  xy: 2429, 1973
+  xy: 2441, 1474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3156,14 +3156,14 @@ surge-wall-large-icon-logic
   index: -1
 thorium-wall
   rotate: false
-  xy: 2463, 1973
+  xy: 2543, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-icon-logic
   rotate: false
-  xy: 2463, 1973
+  xy: 2543, 1479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3191,14 +3191,14 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 2463, 1803
+  xy: 3221, 2215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-icon-logic
   rotate: false
-  xy: 2463, 1803
+  xy: 3221, 2215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3233,7 +3233,7 @@ bullet-back
   index: -1
 casing
   rotate: false
-  xy: 3517, 2303
+  xy: 1103, 1371
   size: 8, 16
   orig: 8, 16
   offset: 0, 0
@@ -3261,7 +3261,7 @@ circle-shadow
   index: -1
 error
   rotate: false
-  xy: 2211, 1636
+  xy: 2211, 1586
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -3338,7 +3338,7 @@ parallax-laser-end
   index: -1
 particle
   rotate: false
-  xy: 1109, 2601
+  xy: 2315, 1402
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -3373,7 +3373,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 2429, 1769
+  xy: 3255, 2255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3422,28 +3422,28 @@ alpha-icon-logic
   index: -1
 alpha-outline
   rotate: false
-  xy: 3225, 2719
+  xy: 3323, 2645
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-wreck0
   rotate: false
-  xy: 3323, 2645
+  xy: 2590, 2251
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-wreck1
   rotate: false
-  xy: 2590, 2251
+  xy: 3035, 2245
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-wreck2
   rotate: false
-  xy: 3035, 2245
+  xy: 3093, 2301
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -3513,7 +3513,7 @@ arkyid-foot
   index: -1
 arkyid-icon-logic
   rotate: false
-  xy: 2319, 1160
+  xy: 2315, 1326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3688,14 +3688,14 @@ beta-wreck2
   index: -1
 blast-compound-icon-logic
   rotate: false
-  xy: 2353, 1152
+  xy: 2227, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 2353, 1152
+  xy: 2227, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3716,21 +3716,21 @@ block-blast-drill-full
   index: -1
 block-basalt-full
   rotate: false
-  xy: 2391, 1186
+  xy: 2315, 1258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-boulder-full
   rotate: false
-  xy: 1001, 1131
+  xy: 3035, 2195
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-char-full
   rotate: false
-  xy: 2387, 1118
+  xy: 2273, 1236
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3751,14 +3751,14 @@ command-center-icon-logic
   index: -1
 block-conduit-full
   rotate: false
-  xy: 2319, 1092
+  xy: 2273, 1202
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-icon-logic
   rotate: false
-  xy: 2319, 1092
+  xy: 2273, 1202
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3779,21 +3779,21 @@ container-icon-logic
   index: -1
 block-conveyor-full
   rotate: false
-  xy: 2311, 1058
+  xy: 2307, 1224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 2311, 1058
+  xy: 2307, 1224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-icon-logic
   rotate: false
-  xy: 2311, 1058
+  xy: 2307, 1224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3842,7 +3842,7 @@ core-shard-icon-logic
   index: -1
 block-craters-full
   rotate: false
-  xy: 2311, 1024
+  xy: 2341, 1224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3891,70 +3891,70 @@ cyclone-icon-logic
   index: -1
 block-dacite-boulder-full
   rotate: false
-  xy: 3035, 2195
+  xy: 1554, 2999
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-dacite-full
   rotate: false
-  xy: 2311, 990
+  xy: 2265, 1168
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dacite-wall-full
   rotate: false
-  xy: 2311, 956
+  xy: 2307, 1190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dark-metal-full
   rotate: false
-  xy: 2311, 922
+  xy: 2341, 1190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-darksand-full
   rotate: false
-  xy: 2353, 1084
+  xy: 1524, 2635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dirt-full
   rotate: false
-  xy: 2387, 1084
+  xy: 1638, 2965
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dirt-wall-full
   rotate: false
-  xy: 2345, 1050
+  xy: 2299, 1156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-dune-wall-full
   rotate: false
-  xy: 2345, 1016
+  xy: 2333, 1156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-duo-full
   rotate: false
-  xy: 2379, 1050
+  xy: 2265, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-logic
   rotate: false
-  xy: 2379, 1050
+  xy: 2265, 1134
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4003,7 +4003,7 @@ fuse-icon-logic
   index: -1
 block-grass-full
   rotate: false
-  xy: 2345, 982
+  xy: 2261, 1100
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4024,42 +4024,42 @@ ground-factory-icon-logic
   index: -1
 block-hail-full
   rotate: false
-  xy: 2379, 1016
+  xy: 2261, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail-icon-logic
   rotate: false
-  xy: 2379, 1016
+  xy: 2261, 1066
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-hotrock-full
   rotate: false
-  xy: 2345, 948
+  xy: 2261, 1032
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-full
   rotate: false
-  xy: 2379, 982
+  xy: 2261, 998
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-snow-full
   rotate: false
-  xy: 2379, 948
+  xy: 2261, 964
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ice-wall-full
   rotate: false
-  xy: 2345, 914
+  xy: 2261, 930
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4108,14 +4108,14 @@ laser-drill-icon-logic
   index: -1
 block-liquid-router-full
   rotate: false
-  xy: 2379, 914
+  xy: 2261, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-logic
   rotate: false
-  xy: 2379, 914
+  xy: 2261, 896
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4136,7 +4136,7 @@ liquid-tank-icon-logic
   index: -1
 block-magmarock-full
   rotate: false
-  xy: 2311, 888
+  xy: 2261, 862
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4185,21 +4185,21 @@ meltdown-icon-logic
   index: -1
 block-metal-floor-damaged-full
   rotate: false
-  xy: 2277, 872
+  xy: 2261, 828
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-moss-full
   rotate: false
-  xy: 2379, 880
+  xy: 2261, 760
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-mud-full
   rotate: false
-  xy: 2269, 838
+  xy: 2299, 1122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4248,42 +4248,42 @@ oil-extractor-icon-logic
   index: -1
 block-ore-coal-full
   rotate: false
-  xy: 2269, 804
+  xy: 2333, 1122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-copper-full
   rotate: false
-  xy: 2269, 770
+  xy: 2295, 1088
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-lead-full
   rotate: false
-  xy: 2311, 854
+  xy: 2329, 1088
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-scrap-full
   rotate: false
-  xy: 2345, 846
+  xy: 2295, 1054
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-thorium-full
   rotate: false
-  xy: 2379, 846
+  xy: 2329, 1054
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-ore-titanium-full
   rotate: false
-  xy: 2303, 820
+  xy: 2295, 1020
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4346,7 +4346,7 @@ payload-router-icon-logic
   index: -1
 block-pebbles-full
   rotate: false
-  xy: 2303, 786
+  xy: 2329, 1020
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4367,14 +4367,14 @@ phase-weaver-icon-logic
   index: -1
 block-plated-conduit-full
   rotate: false
-  xy: 2337, 812
+  xy: 2295, 986
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-icon-logic
   rotate: false
-  xy: 2337, 812
+  xy: 2295, 986
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4395,42 +4395,42 @@ pneumatic-drill-icon-logic
   index: -1
 block-pulse-conduit-full
   rotate: false
-  xy: 2371, 812
+  xy: 2329, 986
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-logic
   rotate: false
-  xy: 2371, 812
+  xy: 2329, 986
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-pulverizer-full
   rotate: false
-  xy: 2337, 778
+  xy: 2295, 952
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-logic
   rotate: false
-  xy: 2337, 778
+  xy: 2295, 952
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-repair-point-full
   rotate: false
-  xy: 2371, 778
+  xy: 2329, 952
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-icon-logic
   rotate: false
-  xy: 2371, 778
+  xy: 2329, 952
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4451,7 +4451,7 @@ ripple-icon-logic
   index: -1
 block-salt-wall-full
   rotate: false
-  xy: 2303, 752
+  xy: 2295, 918
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4472,21 +4472,21 @@ salvo-icon-logic
   index: -1
 block-sand-boulder-full
   rotate: false
-  xy: 2337, 744
+  xy: 2329, 918
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-full
   rotate: false
-  xy: 2371, 744
+  xy: 2295, 884
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-sand-wall-full
   rotate: false
-  xy: 1524, 2635
+  xy: 2329, 884
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4507,35 +4507,35 @@ scatter-icon-logic
   index: -1
 block-scorch-full
   rotate: false
-  xy: 1638, 2965
+  xy: 2295, 850
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch-icon-logic
   rotate: false
-  xy: 1638, 2965
+  xy: 2295, 850
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-scrap-wall-full
   rotate: false
-  xy: 2575, 2159
+  xy: 2329, 850
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall1
   rotate: false
-  xy: 2575, 2159
+  xy: 2329, 850
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-icon-logic
   rotate: false
-  xy: 2575, 2159
+  xy: 2329, 850
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4591,49 +4591,49 @@ segment-icon-logic
   index: -1
 block-shale-boulder-full
   rotate: false
-  xy: 2361, 2052
+  xy: 2329, 816
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-full
   rotate: false
-  xy: 2361, 2018
+  xy: 2295, 782
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shale-wall-full
   rotate: false
-  xy: 2361, 1984
+  xy: 2329, 782
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-shrubs-full
   rotate: false
-  xy: 2361, 1950
+  xy: 2295, 748
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-boulder-full
   rotate: false
-  xy: 1554, 2999
+  xy: 1604, 2999
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 block-snow-full
   rotate: false
-  xy: 2361, 1916
+  xy: 2329, 748
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-snow-wall-full
   rotate: false
-  xy: 2361, 1882
+  xy: 2279, 714
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4661,7 +4661,7 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 2361, 1848
+  xy: 2279, 680
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4682,7 +4682,7 @@ spore-press-icon-logic
   index: -1
 block-spore-wall-full
   rotate: false
-  xy: 2361, 1814
+  xy: 2313, 714
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4703,14 +4703,14 @@ steam-generator-icon-logic
   index: -1
 block-stone-full
   rotate: false
-  xy: 2361, 1780
+  xy: 2279, 646
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-wall-full
   rotate: false
-  xy: 2361, 1746
+  xy: 2313, 680
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4731,7 +4731,7 @@ swarmer-icon-logic
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 2361, 1712
+  xy: 2279, 612
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4752,21 +4752,21 @@ tetrative-reconstructor-icon-logic
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 2361, 1678
+  xy: 2313, 646
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 2361, 1678
+  xy: 2313, 646
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-logic
   rotate: false
-  xy: 2361, 1678
+  xy: 2313, 646
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4829,7 +4829,7 @@ wave-icon-logic
   index: -1
 bryde-icon-logic
   rotate: false
-  xy: 2279, 582
+  xy: 2279, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4864,14 +4864,14 @@ bryde-wreck2
   index: -1
 coal-icon-logic
   rotate: false
-  xy: 2279, 514
+  xy: 2313, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 2279, 514
+  xy: 2313, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4906,14 +4906,14 @@ container-team-sharded
   index: -1
 copper-icon-logic
   rotate: false
-  xy: 2385, 404
+  xy: 2445, 2025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 2385, 404
+  xy: 2445, 2025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4969,7 +4969,7 @@ corvus-foot
   index: -1
 corvus-icon-logic
   rotate: false
-  xy: 725, 2921
+  xy: 3225, 2695
   size: 31, 20
   orig: 31, 20
   offset: 0, 0
@@ -5039,56 +5039,56 @@ corvus-wreck2
   index: -1
 cracks-1-0
   rotate: false
-  xy: 3587, 2387
+  xy: 2445, 1991
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 3085, 2261
+  xy: 2479, 2025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 3085, 2227
+  xy: 2513, 2059
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 3085, 2193
+  xy: 2445, 1957
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 3119, 2267
+  xy: 2479, 1991
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 3119, 2233
+  xy: 2513, 2025
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 3119, 2199
+  xy: 2445, 1923
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 3211, 2385
+  xy: 2479, 1957
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5543,56 +5543,56 @@ cracks-9-7
   index: -1
 crawler-icon-logic
   rotate: false
-  xy: 3245, 2391
+  xy: 2513, 1991
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 2165, 1346
+  xy: 2165, 1296
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-outline
   rotate: false
-  xy: 2165, 1296
+  xy: 2165, 1246
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-wreck0
   rotate: false
-  xy: 2165, 1246
+  xy: 2235, 2186
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-wreck1
   rotate: false
-  xy: 2235, 2186
+  xy: 2225, 2136
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-wreck2
   rotate: false
-  xy: 2225, 2136
+  xy: 2221, 2086
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 cryofluid-icon-logic
   rotate: false
-  xy: 3313, 2391
+  xy: 2479, 1923
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 3313, 2391
+  xy: 2479, 1923
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5606,56 +5606,56 @@ cyclone
   index: -1
 dagger-icon-logic
   rotate: false
-  xy: 3211, 2351
+  xy: 2513, 1957
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 2211, 1886
+  xy: 2211, 1836
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-outline
   rotate: false
-  xy: 2211, 1836
+  xy: 2211, 1786
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-wreck0
   rotate: false
-  xy: 2211, 1786
+  xy: 2211, 1736
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-wreck1
   rotate: false
-  xy: 2211, 1736
+  xy: 2211, 1686
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-wreck2
   rotate: false
-  xy: 2211, 1686
+  xy: 2211, 1636
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 duo
   rotate: false
-  xy: 2325, 88
+  xy: 2479, 1855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 eclipse-icon-logic
   rotate: false
-  xy: 2325, 54
+  xy: 2513, 1889
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5690,49 +5690,49 @@ eclipse-wreck2
   index: -1
 eruption-outline
   rotate: false
-  xy: 2267, 372
+  xy: 2207, 1470
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flamethrower-outline
   rotate: false
-  xy: 2273, 206
+  xy: 2215, 1304
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flare-icon-logic
   rotate: false
-  xy: 2325, 20
+  xy: 2445, 1787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 flare-outline
   rotate: false
-  xy: 2211, 1528
+  xy: 2285, 2186
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flare-wreck0
   rotate: false
-  xy: 2207, 1478
+  xy: 2275, 2136
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flare-wreck1
   rotate: false
-  xy: 2285, 2186
+  xy: 2271, 2086
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flare-wreck2
   rotate: false
-  xy: 2275, 2136
+  xy: 2261, 2036
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -5746,7 +5746,7 @@ foreshadow
   index: -1
 fortress-icon-logic
   rotate: false
-  xy: 2595, 3538
+  xy: 2227, 761
   size: 32, 25
   orig: 32, 25
   offset: 0, 0
@@ -5795,7 +5795,7 @@ fuse
   index: -1
 gamma-icon-logic
   rotate: false
-  xy: 2590, 2217
+  xy: 2479, 1821
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5830,49 +5830,49 @@ gamma-wreck2
   index: -1
 graphite-icon-logic
   rotate: false
-  xy: 2413, 1050
+  xy: 2513, 1855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 2413, 1050
+  xy: 2513, 1855
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail
   rotate: false
-  xy: 2413, 1016
+  xy: 2445, 1753
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 heal-shotgun-weapon-outline
   rotate: false
-  xy: 2820, 2889
+  xy: 3225, 2717
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 heal-weapon-mount-outline
   rotate: false
-  xy: 2261, 1986
+  xy: 2261, 1886
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 heal-weapon-outline
   rotate: false
-  xy: 2261, 1936
+  xy: 2261, 1836
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 horizon-icon-logic
   rotate: false
-  xy: 2413, 982
+  xy: 2479, 1787
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5907,7 +5907,7 @@ horizon-wreck2
   index: -1
 item-blast-compound-large
   rotate: false
-  xy: 2273, 1236
+  xy: 758, 3251
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -5928,14 +5928,14 @@ item-blast-compound-tiny
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 2261, 1886
+  xy: 2261, 1786
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-coal-large
   rotate: false
-  xy: 758, 3251
+  xy: 1016, 3073
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -5956,14 +5956,14 @@ item-coal-tiny
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 2261, 1836
+  xy: 2261, 1736
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-copper-large
   rotate: false
-  xy: 1016, 3073
+  xy: 983, 2601
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -5984,14 +5984,14 @@ item-copper-tiny
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 2261, 1786
+  xy: 2261, 1686
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-graphite-large
   rotate: false
-  xy: 983, 2601
+  xy: 1440, 2630
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -6012,28 +6012,28 @@ item-graphite-tiny
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 2261, 1736
+  xy: 2261, 1636
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-lead-large
   rotate: false
-  xy: 1440, 2630
+  xy: 1063, 3215
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 2415, 642
+  xy: 2513, 1719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead-icon-logic
   rotate: false
-  xy: 2415, 642
+  xy: 2513, 1719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6054,28 +6054,28 @@ item-lead-tiny
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 2261, 1686
+  xy: 2261, 1586
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-metaglass-large
   rotate: false
-  xy: 1063, 3215
+  xy: 1554, 2957
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 2415, 574
+  xy: 2479, 1651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metaglass-icon-logic
   rotate: false
-  xy: 2415, 574
+  xy: 2479, 1651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6096,28 +6096,28 @@ item-metaglass-tiny
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 2261, 1636
+  xy: 2261, 1536
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-phase-fabric-large
   rotate: false
-  xy: 1554, 2957
+  xy: 2223, 1162
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 2415, 506
+  xy: 2445, 1583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-fabric-icon-logic
   rotate: false
-  xy: 2415, 506
+  xy: 2445, 1583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6138,28 +6138,28 @@ item-phase-fabric-tiny
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 2261, 1586
+  xy: 2335, 2193
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-plastanium-large
   rotate: false
-  xy: 2273, 114
+  xy: 758, 3209
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 2415, 438
+  xy: 2513, 1651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-icon-logic
   rotate: false
-  xy: 2415, 438
+  xy: 2513, 1651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6180,28 +6180,28 @@ item-plastanium-tiny
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 2261, 1536
+  xy: 2385, 2193
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-pyratite-large
   rotate: false
-  xy: 2273, 1194
+  xy: 1025, 2601
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 3143, 2317
+  xy: 2479, 1583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-icon-logic
   rotate: false
-  xy: 3143, 2317
+  xy: 2479, 1583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6222,28 +6222,28 @@ item-pyratite-tiny
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 2335, 2193
+  xy: 2435, 2193
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-sand-large
   rotate: false
-  xy: 2227, 850
+  xy: 1482, 2630
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 3177, 2301
+  xy: 2479, 1549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-icon-logic
   rotate: false
-  xy: 3177, 2301
+  xy: 2479, 1549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6264,28 +6264,28 @@ item-sand-tiny
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 2385, 2193
+  xy: 2485, 2193
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-scrap-large
   rotate: false
-  xy: 758, 3209
+  xy: 1596, 2957
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 3245, 2323
+  xy: 2513, 1549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-icon-logic
   rotate: false
-  xy: 3245, 2323
+  xy: 2513, 1549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6299,35 +6299,35 @@ item-scrap-small
   index: -1
 item-scrap-tiny
   rotate: false
-  xy: 2279, 752
+  xy: 3151, 2351
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 2435, 2193
+  xy: 2535, 2193
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-silicon-large
   rotate: false
-  xy: 1025, 2601
+  xy: 758, 3167
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 3313, 2323
+  xy: 2445, 1515
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 silicon-icon-logic
   rotate: false
-  xy: 3313, 2323
+  xy: 2445, 1515
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6341,35 +6341,35 @@ item-silicon-small
   index: -1
 item-silicon-tiny
   rotate: false
-  xy: 3151, 2351
+  xy: 693, 2603
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 2485, 2193
+  xy: 2267, 380
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-spore-pod-large
   rotate: false
-  xy: 1482, 2630
+  xy: 1067, 2601
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 3279, 2289
+  xy: 2407, 1474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pod-icon-logic
   rotate: false
-  xy: 3279, 2289
+  xy: 2407, 1474
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6383,35 +6383,35 @@ item-spore-pod-small
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 693, 2603
+  xy: 1229, 876
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 2535, 2193
+  xy: 2273, 330
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-surge-alloy-large
   rotate: false
-  xy: 1596, 2957
+  xy: 758, 3125
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 3153, 2267
+  xy: 2399, 1406
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-alloy-icon-logic
   rotate: false
-  xy: 3153, 2267
+  xy: 2399, 1406
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6425,35 +6425,35 @@ item-surge-alloy-small
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 1229, 876
+  xy: 1401, 786
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 3161, 2369
+  xy: 2273, 280
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-thorium-large
   rotate: false
-  xy: 2315, 1194
+  xy: 1109, 2601
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 3153, 2199
+  xy: 2547, 2057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-icon-logic
   rotate: false
-  xy: 3153, 2199
+  xy: 2547, 2057
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6467,35 +6467,35 @@ item-thorium-small
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 1401, 786
+  xy: 3945, 3863
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 2215, 1428
+  xy: 2273, 230
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-titanium-large
   rotate: false
-  xy: 2227, 808
+  xy: 1641, 6
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 3187, 2215
+  xy: 2547, 1989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-icon-logic
   rotate: false
-  xy: 3187, 2215
+  xy: 2547, 1989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6509,14 +6509,14 @@ item-titanium-small
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 3945, 3863
+  xy: 1805, 1130
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 2215, 1378
+  xy: 2273, 180
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -6530,7 +6530,7 @@ lancer
   index: -1
 large-artillery-outline
   rotate: false
-  xy: 2215, 1242
+  xy: 2291, 44
   size: 48, 66
   orig: 48, 66
   offset: 0, 0
@@ -6558,14 +6558,14 @@ large-purple-mount-outline
   index: -1
 large-weapon-outline
   rotate: false
-  xy: 2257, 1478
+  xy: 2223, 1204
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-cryofluid-large
   rotate: false
-  xy: 758, 3167
+  xy: 2291, 2
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
@@ -6579,35 +6579,35 @@ liquid-cryofluid-small
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 1805, 1130
+  xy: 3523, 3341
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-cryofluid-xlarge
   rotate: false
-  xy: 2265, 1428
+  xy: 2311, 2036
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-oil-large
   rotate: false
-  xy: 1067, 2601
+  xy: 3559, 2614
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 3289, 2221
+  xy: 2547, 1785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oil-icon-logic
   rotate: false
-  xy: 3289, 2221
+  xy: 2547, 1785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6621,105 +6621,105 @@ liquid-oil-small
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 3523, 3341
+  xy: 3427, 3004
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-oil-xlarge
   rotate: false
-  xy: 2265, 1378
+  xy: 2311, 1986
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-slag-large
   rotate: false
-  xy: 2227, 766
+  xy: 3601, 2614
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 3323, 2187
+  xy: 2547, 1547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 slag-icon-logic
   rotate: false
-  xy: 3323, 2187
+  xy: 2547, 1547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 3016, 2773
+  xy: 3347, 2347
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 3427, 3004
+  xy: 271, 55
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-slag-xlarge
   rotate: false
-  xy: 2265, 1328
+  xy: 2311, 1936
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-water-large
   rotate: false
-  xy: 758, 3125
+  xy: 2315, 1444
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 2449, 710
+  xy: 2581, 1989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-icon-logic
   rotate: false
-  xy: 2449, 710
+  xy: 2581, 1989
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 1251, 1095
+  xy: 1663, 1098
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 271, 55
+  xy: 2719, 3207
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 liquid-water-xlarge
   rotate: false
-  xy: 2265, 1278
+  xy: 2311, 1886
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mace-icon-logic
   rotate: false
-  xy: 2449, 676
+  xy: 2581, 1955
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6768,7 +6768,7 @@ mass-driver
   index: -1
 mega-icon-logic
   rotate: false
-  xy: 2449, 574
+  xy: 2581, 1853
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6845,70 +6845,70 @@ minke-wreck2
   index: -1
 missiles-mount-outline
   rotate: false
-  xy: 2311, 2036
+  xy: 2311, 1736
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-icon-logic
   rotate: false
-  xy: 3347, 2303
+  xy: 2581, 1615
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mono-outline
   rotate: false
-  xy: 2311, 1886
+  xy: 2311, 1586
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-wreck0
   rotate: false
-  xy: 2311, 1836
+  xy: 2311, 1536
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-wreck1
   rotate: false
-  xy: 2311, 1786
+  xy: 2321, 2086
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-wreck2
   rotate: false
-  xy: 2311, 1736
+  xy: 2325, 2136
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-purple-weapon-outline
   rotate: false
-  xy: 2311, 1636
+  xy: 2425, 2143
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-weapon-outline
   rotate: false
-  xy: 2311, 1536
+  xy: 2525, 2143
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 nova-icon-logic
   rotate: false
-  xy: 3381, 2337
+  xy: 2581, 1581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 nova-leg
   rotate: false
-  xy: 2425, 2143
+  xy: 2361, 1986
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -6943,7 +6943,7 @@ nova-wreck2
   index: -1
 oct-icon-logic
   rotate: false
-  xy: 3381, 2303
+  xy: 2581, 1547
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7027,7 +7027,7 @@ parallax
   index: -1
 poly-icon-logic
   rotate: false
-  xy: 3425, 2167
+  xy: 3085, 2193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7062,7 +7062,7 @@ poly-wreck2
   index: -1
 pulsar-icon-logic
   rotate: false
-  xy: 1663, 1095
+  xy: 2595, 3536
   size: 32, 27
   orig: 32, 27
   offset: 0, 0
@@ -7104,7 +7104,7 @@ pulsar-wreck2
   index: -1
 quad-icon-logic
   rotate: false
-  xy: 983, 2824
+  xy: 725, 2910
   size: 31, 31
   orig: 31, 31
   offset: 0, 0
@@ -7139,7 +7139,7 @@ quad-wreck2
   index: -1
 quasar-icon-logic
   rotate: false
-  xy: 3527, 2253
+  xy: 3279, 2357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7181,7 +7181,7 @@ quasar-wreck2
   index: -1
 reign-icon-logic
   rotate: false
-  xy: 1199, 2763
+  xy: 983, 2835
   size: 31, 20
   orig: 31, 20
   offset: 0, 0
@@ -7230,7 +7230,7 @@ reign-wreck2
   index: -1
 repair-point
   rotate: false
-  xy: 3527, 2219
+  xy: 3313, 2357
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7349,7 +7349,7 @@ scepter-wreck2
   index: -1
 scorch
   rotate: false
-  xy: 3561, 2183
+  xy: 2363, 1088
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7363,7 +7363,7 @@ segment
   index: -1
 sei-icon-logic
   rotate: false
-  xy: 3595, 2183
+  xy: 2363, 918
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7405,21 +7405,21 @@ sei-wreck2
   index: -1
 shock-mine-icon-logic
   rotate: false
-  xy: 2443, 2109
+  xy: 2363, 782
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 small-basic-weapon-outline
   rotate: false
-  xy: 2307, 1486
+  xy: 2361, 1836
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-mount-weapon-outline
   rotate: false
-  xy: 2315, 1386
+  xy: 2361, 1736
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7440,14 +7440,14 @@ spiroct-foot
   index: -1
 spiroct-icon-logic
   rotate: false
-  xy: 725, 2894
+  xy: 1199, 2758
   size: 31, 25
   orig: 31, 25
   offset: 0, 0
   index: -1
 spiroct-joint
   rotate: false
-  xy: 2395, 2075
+  xy: 2381, 680
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7475,7 +7475,7 @@ spiroct-outline
   index: -1
 spiroct-weapon-outline
   rotate: false
-  xy: 2365, 1370
+  xy: 2257, 1470
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
@@ -7503,84 +7503,84 @@ spiroct-wreck2
   index: -1
 splash-0
   rotate: false
-  xy: 2395, 2041
+  xy: 2381, 646
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-1
   rotate: false
-  xy: 2429, 2075
+  xy: 2381, 612
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-10
   rotate: false
-  xy: 2497, 2041
+  xy: 2433, 1406
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-11
   rotate: false
-  xy: 2463, 2007
+  xy: 2433, 1372
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-2
   rotate: false
-  xy: 2395, 2007
+  xy: 2381, 578
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-3
   rotate: false
-  xy: 2463, 2075
+  xy: 2381, 544
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-4
   rotate: false
-  xy: 2429, 2041
+  xy: 2381, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-5
   rotate: false
-  xy: 2395, 1973
+  xy: 2381, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-6
   rotate: false
-  xy: 2497, 2075
+  xy: 2381, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-7
   rotate: false
-  xy: 2463, 2041
+  xy: 2385, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-8
   rotate: false
-  xy: 2429, 2007
+  xy: 2590, 2217
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-9
   rotate: false
-  xy: 2395, 1939
+  xy: 2433, 1440
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7664,7 +7664,7 @@ tsunami
   index: -1
 unit-alpha-full
   rotate: false
-  xy: 2365, 1320
+  xy: 2371, 2086
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7713,14 +7713,14 @@ unit-corvus-full
   index: -1
 unit-crawler-full
   rotate: false
-  xy: 2365, 1270
+  xy: 2421, 2093
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-dagger-full
   rotate: false
-  xy: 2315, 1236
+  xy: 2471, 2093
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7734,7 +7734,7 @@ unit-eclipse-full
   index: -1
 unit-flare-full
   rotate: false
-  xy: 2365, 1220
+  xy: 2521, 2093
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7783,7 +7783,7 @@ unit-minke-full
   index: -1
 unit-mono-full
   rotate: false
-  xy: 2227, 1142
+  xy: 2307, 1486
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7951,14 +7951,14 @@ wave
   index: -1
 zenith-icon-logic
   rotate: false
-  xy: 2429, 1735
+  xy: 3323, 2255
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 zenith-missiles-outline
   rotate: false
-  xy: 2227, 892
+  xy: 2357, 1478
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7993,140 +7993,140 @@ zenith-wreck2
   index: -1
 item-blast-compound
   rotate: false
-  xy: 2405, 812
+  xy: 2445, 1685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 2405, 778
+  xy: 2479, 1719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 2405, 744
+  xy: 2513, 1753
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 2415, 710
+  xy: 2445, 1651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 2415, 676
+  xy: 2479, 1685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 2415, 608
+  xy: 2445, 1617
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 2415, 540
+  xy: 2513, 1685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 2415, 472
+  xy: 2479, 1617
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 2419, 404
+  xy: 2445, 1549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 3177, 2335
+  xy: 2513, 1617
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 3211, 2317
+  xy: 2513, 1583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 3279, 2323
+  xy: 2411, 1508
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 3245, 2289
+  xy: 2513, 1515
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 3313, 2289
+  xy: 2399, 1440
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 3153, 2233
+  xy: 2399, 1372
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 3187, 2249
+  xy: 2547, 2023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 3255, 2255
+  xy: 2547, 1887
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 3289, 2255
+  xy: 2547, 1819
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 3289, 2187
+  xy: 2547, 1581
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 2439, 744
+  xy: 2581, 2023
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -8145,6 +8145,13 @@ circle
   orig: 201, 201
   offset: 0, 0
   index: -1
+circle-small
+  rotate: false
+  xy: 1251, 1121
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
 shape-3
   rotate: false
   xy: 2235, 2236
@@ -8224,7 +8231,7 @@ beta
   index: -1
 beta-cell
   rotate: false
-  xy: 3093, 2301
+  xy: 1001, 1131
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8273,35 +8280,35 @@ corvus-weapon-heat
   index: -1
 crawler
   rotate: false
-  xy: 3817, 2560
+  xy: 3817, 2510
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 3817, 2510
+  xy: 2165, 1396
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-cell
   rotate: false
-  xy: 2165, 1396
+  xy: 2165, 1346
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 2211, 1986
+  xy: 2211, 1936
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 2211, 1936
+  xy: 2211, 1886
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8322,7 +8329,7 @@ eclipse-cell
   index: -1
 flare
   rotate: false
-  xy: 2273, 156
+  xy: 2215, 1254
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8427,14 +8434,14 @@ minke-cell
   index: -1
 mono
   rotate: false
-  xy: 2311, 1986
+  xy: 2311, 1686
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mono-cell
   rotate: false
-  xy: 2311, 1936
+  xy: 2311, 1636
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8448,7 +8455,7 @@ nova
   index: -1
 nova-base
   rotate: false
-  xy: 2375, 2143
+  xy: 2361, 2036
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8525,7 +8532,7 @@ pulsar
   index: -1
 pulsar-base
   rotate: false
-  xy: 2475, 2143
+  xy: 2361, 1936
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8686,14 +8693,14 @@ toxopid-cell
   index: -1
 vanguard
   rotate: false
-  xy: 2227, 1092
+  xy: 2265, 1420
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vanguard-cell
   rotate: false
-  xy: 2227, 1042
+  xy: 2265, 1370
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8742,49 +8749,49 @@ beam-weapon
   index: -1
 eruption
   rotate: false
-  xy: 2211, 1578
+  xy: 2211, 1528
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun
   rotate: false
-  xy: 2273, 322
+  xy: 2215, 1420
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower
   rotate: false
-  xy: 2273, 264
+  xy: 2215, 1362
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-shotgun-weapon
   rotate: false
-  xy: 1251, 1121
+  xy: 2820, 2889
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
 heal-weapon
   rotate: false
-  xy: 2271, 2086
+  xy: 2261, 1986
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 heal-weapon-mount
   rotate: false
-  xy: 2261, 2036
+  xy: 2261, 1936
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 large-artillery
   rotate: false
-  xy: 2215, 1310
+  xy: 2273, 112
   size: 48, 66
   orig: 48, 66
   offset: 0, 0
@@ -8812,35 +8819,35 @@ large-purple-mount
   index: -1
 large-weapon
   rotate: false
-  xy: 2223, 1192
+  xy: 3161, 2369
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles
   rotate: false
-  xy: 2325, 2136
+  xy: 2311, 1836
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-mount
   rotate: false
-  xy: 2321, 2086
+  xy: 2311, 1786
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-purple-weapon
   rotate: false
-  xy: 2311, 1686
+  xy: 2375, 2143
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mount-weapon
   rotate: false
-  xy: 2311, 1586
+  xy: 2475, 2143
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8882,42 +8889,42 @@ sei-launcher
   index: -1
 small-basic-weapon
   rotate: false
-  xy: 2525, 2143
+  xy: 2361, 1886
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-mount-weapon
   rotate: false
-  xy: 2315, 1436
+  xy: 2361, 1786
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 small-weapon
   rotate: false
-  xy: 2315, 1336
+  xy: 2361, 1686
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spiroct-weapon
   rotate: false
-  xy: 2365, 1428
+  xy: 2361, 1528
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 weapon
   rotate: false
-  xy: 2227, 992
+  xy: 2265, 1320
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 zenith-missiles
   rotate: false
-  xy: 2227, 942
+  xy: 2265, 1270
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 2377774251..680de001bb 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png
index 31358f27b9..ccedc25b2f 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java
index e0902201a8..8549513861 100644
--- a/core/src/mindustry/Vars.java
+++ b/core/src/mindustry/Vars.java
@@ -318,20 +318,25 @@ public class Vars implements Loadable{
 
         settings.setAppName(appName);
 
-        Writer writer = settings.getDataDirectory().child("last_log.txt").writer(false);
-        LogHandler log = Log.logger;
-        //ignore it
-        Log.logger = (level, text) -> {
-            log.log(level, text);
+        try{
+            Writer writer = settings.getDataDirectory().child("last_log.txt").writer(false);
+            LogHandler log = Log.logger;
+            //ignore it
+            Log.logger = (level, text) -> {
+                log.log(level, text);
 
-            try{
-                writer.write("[" + Character.toUpperCase(level.name().charAt(0)) +"] " + Log.removeColors(text) + "\n");
-                writer.flush();
-            }catch(IOException e){
-                e.printStackTrace();
-                //ignore it
-            }
-        };
+                try{
+                    writer.write("[" + Character.toUpperCase(level.name().charAt(0)) +"] " + Log.removeColors(text) + "\n");
+                    writer.flush();
+                }catch(IOException e){
+                    e.printStackTrace();
+                    //ignore it
+                }
+            };
+        }catch(Exception e){
+            //handle log file not being found
+            Log.err(e);
+        }
 
         loadedFileLogger = true;
     }
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 2b4800d070..b0bb73a46a 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -429,8 +429,8 @@ public class UnitTypes implements ContentList{
                 continuous = true;
                 cooldownTime = 200f;
 
-                bullet = new ContinuousLaserBulletType(20){{
-                    length = 150f;
+                bullet = new ContinuousLaserBulletType(22){{
+                    length = 160f;
                     hitEffect = Fx.hitMeltHeal;
                     drawSize = 420f;
                     lifetime = 160f;
@@ -445,7 +445,7 @@ public class UnitTypes implements ContentList{
                     incendAmount = 1;
 
                     //constant healing
-                    healPercent = 0.5f;
+                    healPercent = 1f;
                     collidesTeam = true;
 
                     colors = new Color[]{Pal.heal.cpy().a(.2f), Pal.heal.cpy().a(.5f), Pal.heal.cpy().mul(1.2f), Color.white};
@@ -909,7 +909,7 @@ public class UnitTypes implements ContentList{
 
         horizon = new UnitType("horizon"){{
             health = 350;
-            speed = 2f;
+            speed = 1.8f;
             accel = 0.08f;
             drag = 0.016f;
             flying = true;
@@ -931,7 +931,7 @@ public class UnitTypes implements ContentList{
                 inaccuracy = 15f;
                 ignoreRotation = true;
                 shootSound = Sounds.none;
-                bullet = new BombBulletType(28f, 25f){{
+                bullet = new BombBulletType(27f, 25f){{
                     width = 10f;
                     height = 14f;
                     hitEffect = Fx.flakExplosion;
diff --git a/core/src/mindustry/content/Weathers.java b/core/src/mindustry/content/Weathers.java
index 52dcdeec76..2984be1ac1 100644
--- a/core/src/mindustry/content/Weathers.java
+++ b/core/src/mindustry/content/Weathers.java
@@ -18,6 +18,7 @@ public class Weathers implements ContentList{
     @Override
     public void load(){
         snow = new ParticleWeather("snow"){{
+            particleRegion = "particle";
             sizeMax = 13f;
             sizeMin = 2.6f;
             density = 1200f;
@@ -32,6 +33,7 @@ public class Weathers implements ContentList{
 
         sandstorm = new ParticleWeather("sandstorm"){{
             color = noiseColor = Color.valueOf("f7cba4");
+            particleRegion = "particle";
             drawNoise = true;
             useWindVector = true;
             sizeMax = 140f;
@@ -48,7 +50,7 @@ public class Weathers implements ContentList{
 
         sporestorm = new ParticleWeather("sporestorm"){{
             color = noiseColor = Color.valueOf("7457ce");
-            particleRegion = "circle";
+            particleRegion = "circle-small";
             drawNoise = true;
             statusGround = false;
             useWindVector = true;
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
index 163c6c4a2e..da264d6af7 100644
--- a/core/src/mindustry/core/UI.java
+++ b/core/src/mindustry/core/UI.java
@@ -390,7 +390,7 @@ public class UI implements ApplicationListener, Loadable{
     public void showException(String text, Throwable exc){
         loadfrag.hide();
         new Dialog(""){{
-            String message = Strings.getFinalMesage(exc);
+            String message = Strings.getFinalMessage(exc);
 
             setFillParent(true);
             cont.margin(15);
diff --git a/core/src/mindustry/ctype/UnlockableContent.java b/core/src/mindustry/ctype/UnlockableContent.java
index 88c3e75927..ab16eea106 100644
--- a/core/src/mindustry/ctype/UnlockableContent.java
+++ b/core/src/mindustry/ctype/UnlockableContent.java
@@ -20,8 +20,8 @@ public abstract class UnlockableContent extends MappableContent{
     public Stats stats = new Stats();
     /** Localized, formal name. Never null. Set to internal name if not found in bundle. */
     public String localizedName;
-    /** Localized description. May be null. */
-    public @Nullable String description;
+    /** Localized description & details. May be null. */
+    public @Nullable String description, details;
     /** Whether this content is always unlocked in the tech tree. */
     public boolean alwaysUnlocked = false;
     /** Special logic icon ID. */
@@ -36,6 +36,7 @@ public abstract class UnlockableContent extends MappableContent{
 
         this.localizedName = Core.bundle.get(getContentType() + "." + this.name + ".name", this.name);
         this.description = Core.bundle.getOrNull(getContentType() + "." + this.name + ".description");
+        this.details = Core.bundle.getOrNull(getContentType() + "." + this.name + ".details");
         this.unlocked = Core.settings != null && Core.settings.getBool(this.name + "-unlocked", false);
     }
 
@@ -51,7 +52,7 @@ public abstract class UnlockableContent extends MappableContent{
         }
     }
 
-    /** Intializes stats on demand. Should only be called once. Only called before something is displayed. */
+    /** Initializes stats on demand. Should only be called once. Only called before something is displayed. */
     public void setStats(){
     }
 
diff --git a/core/src/mindustry/graphics/OverlayRenderer.java b/core/src/mindustry/graphics/OverlayRenderer.java
index c28859d5f3..d2a3cb3700 100644
--- a/core/src/mindustry/graphics/OverlayRenderer.java
+++ b/core/src/mindustry/graphics/OverlayRenderer.java
@@ -154,7 +154,7 @@ public class OverlayRenderer{
 
         input.drawOverSelect();
 
-        if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller instanceof Building build){
+        if(ui.hudfrag.blockfrag.hover() instanceof Unit unit && unit.controller() instanceof LogicAI ai && ai.controller instanceof Building build && build.isValid()){
             Drawf.square(build.x, build.y, build.block.size * tilesize/2f + 2f);
             if(!unit.within(build, unit.hitSize * 2f)){
                 Drawf.arrow(unit.x, unit.y, build.x, build.y, unit.hitSize *2f, 4f);
diff --git a/core/src/mindustry/io/TypeIO.java b/core/src/mindustry/io/TypeIO.java
index 2c2c19dcfc..5eb9467e3c 100644
--- a/core/src/mindustry/io/TypeIO.java
+++ b/core/src/mindustry/io/TypeIO.java
@@ -333,7 +333,7 @@ public class TypeIO{
             //1: prev controller was not a player, carry on
             //2: prev controller was a player, so replace this controller with *anything else*
             //...since AI doesn't update clientside it doesn't matter
-            return (!(prev instanceof AIController) || (prev instanceof FormationAI)) ? new GroundAI() : prev;
+            return (!(prev instanceof AIController) || (prev instanceof FormationAI) || (prev instanceof LogicAI)) ? new GroundAI() : prev;
         }
     }
 
diff --git a/core/src/mindustry/logic/LCanvas.java b/core/src/mindustry/logic/LCanvas.java
index e16aab6621..728441cb5a 100644
--- a/core/src/mindustry/logic/LCanvas.java
+++ b/core/src/mindustry/logic/LCanvas.java
@@ -18,6 +18,7 @@ import mindustry.graphics.*;
 import mindustry.ui.*;
 
 public class LCanvas extends Table{
+    public static final int maxJumpsDrawn = 100;
     //ew static variables
     static LCanvas canvas;
 
@@ -25,7 +26,9 @@ public class LCanvas extends Table{
     StatementElem dragging;
     ScrollPane pane;
     Group jumps;
+    StatementElem hovered;
     float targetWidth;
+    int jumpCount = 0;
 
     public LCanvas(){
         canvas = this;
@@ -69,6 +72,12 @@ public class LCanvas extends Table{
         }
     }
 
+    @Override
+    public void draw(){
+        jumpCount = 0;
+        super.draw();
+    }
+
     void add(LStatement statement){
         statements.addChild(new StatementElem(statement));
     }
@@ -97,10 +106,23 @@ public class LCanvas extends Table{
         this.statements.layout();
     }
 
+    StatementElem checkHovered(){
+        Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
+        if(e != null){
+            while(e != null && !(e instanceof StatementElem)){
+                e = e.parent;
+            }
+        }
+        if(e == null || isDescendantOf(e)) return null;
+        return (StatementElem)e;
+    }
+
     @Override
     public void act(float delta){
         super.act(delta);
 
+        hovered = checkHovered();
+
         if(Core.input.isTouched()){
             float y = Core.input.mouseY();
             float dst = Math.min(y - this.y, Core.graphics.getHeight() - y);
@@ -351,7 +373,6 @@ public class LCanvas extends Table{
         boolean selecting;
         float mx, my;
         ClickListener listener;
-        StatementElem hovered;
 
         JumpCurve curve;
 
@@ -380,7 +401,7 @@ public class LCanvas extends Table{
                 @Override
                 public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode code){
                     localToStageCoordinates(Tmp.v1.set(x, y));
-                    StatementElem elem = hovered();
+                    StatementElem elem = canvas.hovered;
 
                     if(elem != null && !isDescendantOf(elem)){
                         setter.get(elem);
@@ -403,13 +424,6 @@ public class LCanvas extends Table{
             curve = new JumpCurve(this);
         }
 
-        @Override
-        public void act(float delta){
-            super.act(delta);
-
-            hovered = hovered();
-        }
-
         @Override
         protected void setScene(Scene stage){
             super.setScene(stage);
@@ -420,17 +434,6 @@ public class LCanvas extends Table{
                 canvas.jumps.addChild(curve);
             }
         }
-
-        StatementElem hovered(){
-            Element e = Core.scene.hit(Core.input.mouseX(), Core.input.mouseY(), true);
-            if(e != null){
-                while(e != null && !(e instanceof StatementElem)){
-                    e = e.parent;
-                }
-            }
-            if(e == null || isDescendantOf(e)) return null;
-            return (StatementElem)e;
-        }
     }
 
     public static class JumpCurve extends Element{
@@ -451,7 +454,13 @@ public class LCanvas extends Table{
 
         @Override
         public void draw(){
-            Element hover = button.to.get() == null && button.selecting ? button.hovered : button.to.get();
+            canvas.jumpCount ++;
+
+            if(canvas.jumpCount > maxJumpsDrawn && !button.selecting && !button.listener.isOver()){
+                return;
+            }
+
+            Element hover = button.to.get() == null && button.selecting ? canvas.hovered : button.to.get();
             boolean draw = false;
             Vec2 t = Tmp.v1, r = Tmp.v2;
 
@@ -489,12 +498,27 @@ public class LCanvas extends Table{
 
             float dist = 100f;
 
+            //square jumps
+            if(false){
+                float len = Scl.scl(Mathf.randomSeed(hashCode(), 10, 50));
+
+                float maxX = Math.max(x, x2) + len;
+
+                Lines.beginLine();
+                Lines.linePoint(x, y);
+                Lines.linePoint(maxX, y);
+                Lines.linePoint(maxX, y2);
+                Lines.linePoint(x2, y2);
+                Lines.endLine();
+                return;
+            }
+
             Lines.curve(
             x, y,
             x + dist, y,
             x2 + dist, y2,
             x2, y2,
-            Math.max(20, (int)(Mathf.dst(x, y, x2, y2) / 6))
+            Math.max(18, (int)(Mathf.dst(x, y, x2, y2) / 6))
             );
         }
     }
diff --git a/core/src/mindustry/net/Net.java b/core/src/mindustry/net/Net.java
index 0bf782600e..4d7a2f4ca3 100644
--- a/core/src/mindustry/net/Net.java
+++ b/core/src/mindustry/net/Net.java
@@ -57,7 +57,7 @@ public class Net{
                 t = t.getCause();
             }
 
-            String baseError = Strings.getFinalMesage(e);
+            String baseError = Strings.getFinalMessage(e);
 
             String error = baseError == null ? "" : baseError.toLowerCase();
             String type = t.getClass().toString().toLowerCase();
diff --git a/core/src/mindustry/ui/Bar.java b/core/src/mindustry/ui/Bar.java
index d58ad53c37..92b9fe7af7 100644
--- a/core/src/mindustry/ui/Bar.java
+++ b/core/src/mindustry/ui/Bar.java
@@ -62,7 +62,13 @@ public class Bar extends Element{
     public void draw(){
         if(fraction == null) return;
 
-        float computed = Mathf.clamp(fraction.get());
+        float computed;
+        try{
+            computed = Mathf.clamp(fraction.get());
+        }catch(Exception e){ //getting the fraction may involve referring to invalid data
+            computed = 0f;
+        }
+
         if(lastValue > computed){
             blink = 1f;
             lastValue = computed;
diff --git a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
index 89cf556cb1..fe3073a208 100644
--- a/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
+++ b/core/src/mindustry/ui/dialogs/ContentInfoDialog.java
@@ -1,6 +1,5 @@
 package mindustry.ui.dialogs;
 
-import arc.graphics.*;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.*;
 import arc.struct.*;
@@ -36,16 +35,16 @@ public class ContentInfoDialog extends BaseDialog{
 
         table.row();
 
-        table.image().height(3).color(Color.lightGray).pad(8).padLeft(0).padRight(0).fillX();
-
-        table.row();
-
         if(content.description != null){
-            table.add(content.displayDescription()).padLeft(5).padRight(5).width(400f).wrap().fillX();
+            table.add("@category.purpose").color(Pal.accent).fillX().padTop(10);
+            table.row();
+            table.add("[lightgray]" + content.displayDescription()).wrap().fillX().padLeft(10).width(500f).left();
             table.row();
 
-            table.image().height(3).color(Color.lightGray).pad(8).padLeft(0).padRight(0).fillX();
-            table.row();
+            if(!content.stats.useCategories){
+                table.add("@category.general").fillX().color(Pal.accent);
+                table.row();
+            }
         }
 
         Stats stats = content.stats;
@@ -76,6 +75,12 @@ public class ContentInfoDialog extends BaseDialog{
             }
         }
 
+
+        if(content.details != null){
+            table.add("[gray]" + content.details).pad(6).padTop(20).width(400f).wrap().fillX();
+            table.row();
+        }
+
         ScrollPane pane = new ScrollPane(table);
         cont.add(pane);
 
diff --git a/core/src/mindustry/ui/dialogs/PlanetDialog.java b/core/src/mindustry/ui/dialogs/PlanetDialog.java
index d02e144fe1..a2122381c9 100644
--- a/core/src/mindustry/ui/dialogs/PlanetDialog.java
+++ b/core/src/mindustry/ui/dialogs/PlanetDialog.java
@@ -136,7 +136,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
         if(to.near().contains(launchSector)) return launchSector;
 
         Sector launchFrom = launchSector;
-        if(launchFrom == null || (to.preset == null && !to.near().contains(launchSector))){
+        if(launchFrom == null){
             //TODO pick one with the most resources
             launchFrom = to.near().find(Sector::hasBase);
             if(launchFrom == null && to.preset != null){
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 4967e59728..0202750aaf 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -305,7 +305,7 @@ public class Block extends UnlockableContent{
         return hasItems;
     }
 
-    /** Returns whether ot not this block can be place on the specified  */
+    /** Returns whether or not this block can be place on the specified  */
     public boolean canPlaceOn(Tile tile, Team team){
         return true;
     }
@@ -365,7 +365,7 @@ public class Block extends UnlockableContent{
             float capacity = cons.capacity;
 
             bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.status * capacity) ? "<ERROR>" : (int)(entity.power.status * capacity)) :
-            Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> Mathf.zero(cons.requestedPower(entity)) && entity.power.graph.getPowerProduced() + entity.power.graph.getBatteryStored() > 0f ? 1f : entity.power.status));
+                Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> Mathf.zero(cons.requestedPower(entity)) && entity.power.graph.getPowerProduced() + entity.power.graph.getBatteryStored() > 0f ? 1f : entity.power.status));
         }
 
         if(hasItems && configurable){
diff --git a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
index 3b4693c250..512eeebdad 100644
--- a/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
+++ b/core/src/mindustry/world/blocks/production/PayloadAcceptor.java
@@ -27,23 +27,27 @@ public class PayloadAcceptor extends Block{
         sync = true;
     }
 
-    public static boolean blends(Building tile, int direction){
-        int size = tile.block.size;
-        Building accept = tile.nearby(Geometry.d4(direction).x * size, Geometry.d4(direction).y * size);
+    public static boolean blends(Building build, int direction){
+        int size = build.block.size;
+        int trns = build.block.size/2 + 1;
+        Building accept = build.nearby(Geometry.d4(direction).x * trns, Geometry.d4(direction).y * trns);
         return accept != null &&
             accept.block.outputsPayload &&
 
             //if size is the same, block must either be facing this one, or not be rotating
-            ((accept.block.size == size &&
-            ((accept.tileX() + Geometry.d4(accept.rotation).x * size == tile.tileX() && accept.tileY() + Geometry.d4(accept.rotation).y * size == tile.tileY())
-            || !accept.block.rotate  || (accept.block.rotate && !accept.block.outputFacing))) ||
+            ((accept.block.size == size
+            && Math.abs(accept.tileX() - build.tileX()) % size == 0 //check alignment
+            && Math.abs(accept.tileY() - build.tileY()) % size == 0
+            && ((accept.block.rotate && accept.tileX() + Geometry.d4(accept.rotation).x * size == build.tileX() && accept.tileY() + Geometry.d4(accept.rotation).y * size == build.tileY())
+            || !accept.block.rotate
+            || !accept.block.outputFacing)) ||
 
             //if the other block is smaller, check alignment
             (accept.block.size < size &&
             (accept.rotation % 2 == 0 ? //check orientation; make sure it's aligned properly with this block.
-                Math.abs(accept.y - tile.y) <= (size * tilesize - accept.block.size * tilesize)/2f : //check Y alignment
-                Math.abs(accept.x - tile.x) <= (size * tilesize - accept.block.size * tilesize)/2f   //check X alignment
-                )) && (!accept.block.rotate || accept.front() == tile || !accept.block.outputFacing) //make sure it's facing this block
+                Math.abs(accept.y - build.y) <= (size * tilesize - accept.block.size * tilesize)/2f : //check Y alignment
+                Math.abs(accept.x - build.x) <= (size * tilesize - accept.block.size * tilesize)/2f   //check X alignment
+                )) && (!accept.block.rotate || accept.front() == build || !accept.block.outputFacing) //make sure it's facing this block
             );
     }
 
diff --git a/desktop/packr_minimize.json b/desktop/packr_minimize.json
index a9e19bc83a..c83ed1757d 100644
--- a/desktop/packr_minimize.json
+++ b/desktop/packr_minimize.json
@@ -32,7 +32,6 @@
         "sun/font",
         "sun/rmi",
         "sun/swing",
-        "java/util/stream",
         "com/sun/media",
         "sun/print",
         "sun/awt",
diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java
index eedbd75f70..ba9ccca5f8 100644
--- a/desktop/src/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/mindustry/desktop/DesktopLauncher.java
@@ -167,7 +167,7 @@ public class DesktopLauncher extends ClientLauncher{
     static void handleCrash(Throwable e){
         Cons<Runnable> dialog = Runnable::run;
         boolean badGPU = false;
-        String finalMessage = Strings.getFinalMesage(e);
+        String finalMessage = Strings.getFinalMessage(e);
         String total = Strings.getCauses(e).toString();
 
         if(total.contains("Couldn't create window") || total.contains("OpenGL 2.0 or higher") || total.toLowerCase().contains("pixel format") || total.contains("GLEW")|| total.contains("unsupported combination of formats")){
diff --git a/gradle.properties b/gradle.properties
index d2aa98aeb2..55b2539b62 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=fcc8d5bf44d872ec60eee557f6db16599ed267c2
+archash=cbfb168455d070aafcb1a6ee52b0dcbf4c8baf28