diff --git a/annotations/src/main/resources/classids.properties b/annotations/src/main/resources/classids.properties
index 0920fbaca5..3de3ec7821 100644
--- a/annotations/src/main/resources/classids.properties
+++ b/annotations/src/main/resources/classids.properties
@@ -35,6 +35,7 @@ poly=31
 pulsar=34
 quasar=32
 risse=33
+risso=41
 spirit=27
 spiroct=39
 tau=17
diff --git a/core/assets-raw/sprites/units/risse-cell.png b/core/assets-raw/sprites/units/risso-cell.png
similarity index 100%
rename from core/assets-raw/sprites/units/risse-cell.png
rename to core/assets-raw/sprites/units/risso-cell.png
diff --git a/core/assets-raw/sprites/units/risse.png b/core/assets-raw/sprites/units/risso.png
similarity index 100%
rename from core/assets-raw/sprites/units/risse.png
rename to core/assets-raw/sprites/units/risso.png
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 3cceedd082..3c9df4a456 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -871,7 +871,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_be.properties b/core/assets/bundles/bundle_be.properties
index f5852ffc02..fc75aeb3ec 100644
--- a/core/assets/bundles/bundle_be.properties
+++ b/core/assets/bundles/bundle_be.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Цеплаёмістасць: {0}
 liquid.viscosity = [lightgray]Глейкасць: {0}
 liquid.temperature = [lightgray]Тэмпература: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_cs.properties b/core/assets/bundles/bundle_cs.properties
index 179484d7a8..959f66b735 100644
--- a/core/assets/bundles/bundle_cs.properties
+++ b/core/assets/bundles/bundle_cs.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Rychlost těžení: {0}%
 unit.minepower = [lightgray]Těžební síla: {0}
 unit.ability = [lightgray]Schopnost: {0}
 unit.buildspeed = [lightgray]Rychlost stavění: {0}%
+
 liquid.heatcapacity = [lightgray]Teplotní kapacita: {0}[]
 liquid.viscosity = [lightgray]Viskozita: {0}[]
 liquid.temperature = [lightgray]Teplota: {0}[]
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_da.properties b/core/assets/bundles/bundle_da.properties
index 5472e33070..7ac559817d 100644
--- a/core/assets/bundles/bundle_da.properties
+++ b/core/assets/bundles/bundle_da.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viscosity: {0}
 liquid.temperature = [lightgray]Temperature: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties
index c99718a795..4bf8361aeb 100644
--- a/core/assets/bundles/bundle_de.properties
+++ b/core/assets/bundles/bundle_de.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Wärmekapazität: {0}
 liquid.viscosity = [lightgray]Viskosität: {0}
 liquid.temperature = [lightgray]Temperatur: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index 622e4405a8..b061170ff0 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidad Térmica: {0}
 liquid.viscosity = [lightgray]Viscosidad: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_et.properties b/core/assets/bundles/bundle_et.properties
index 57c45642bc..c130ccfb3a 100644
--- a/core/assets/bundles/bundle_et.properties
+++ b/core/assets/bundles/bundle_et.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Soojusmahtuvus: {0}
 liquid.viscosity = [lightgray]Viskoossus: {0}
 liquid.temperature = [lightgray]Temperatuur: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_eu.properties b/core/assets/bundles/bundle_eu.properties
index 27faf063a5..20176a6c99 100644
--- a/core/assets/bundles/bundle_eu.properties
+++ b/core/assets/bundles/bundle_eu.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Bero edukiera: {0}
 liquid.viscosity = [lightgray]Likatasuna: {0}
 liquid.temperature = [lightgray]Tenperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_fi.properties b/core/assets/bundles/bundle_fi.properties
index 65e099623a..1b56ef29c1 100644
--- a/core/assets/bundles/bundle_fi.properties
+++ b/core/assets/bundles/bundle_fi.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Lämpökapasiteetti: {0}
 liquid.viscosity = [lightgray]Tahmeus: {0}
 liquid.temperature = [lightgray]Lämpö: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties
index 6fc36fb093..2bfd4b724f 100644
--- a/core/assets/bundles/bundle_fr.properties
+++ b/core/assets/bundles/bundle_fr.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Vitesse de Minage: {0}%
 unit.minepower = [lightgray]Puissance de Minage: {0}
 unit.ability = [lightgray]Abilité: {0}
 unit.buildspeed = [lightgray]Vitesse de Construction: {0}%
+
 liquid.heatcapacity = [lightgray]Capacité Thermique: {0}
 liquid.viscosity = [lightgray]Viscosité: {0}
 liquid.temperature = [lightgray]Température: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_fr_BE.properties b/core/assets/bundles/bundle_fr_BE.properties
index 71534db931..bda89263ec 100644
--- a/core/assets/bundles/bundle_fr_BE.properties
+++ b/core/assets/bundles/bundle_fr_BE.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacité Thermique {0}
 liquid.viscosity = [lightgray]Viscosité: {0}
 liquid.temperature = [lightgray]Température: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties
index fd5c0da4ef..a13a0e41a8 100644
--- a/core/assets/bundles/bundle_hu.properties
+++ b/core/assets/bundles/bundle_hu.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Hő hapacitás: {0}
 liquid.viscosity = [lightgray]Viszkozitás: {0}
 liquid.temperature = [lightgray]Hőmérséklet: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties
index c4cc41033f..03062e6418 100644
--- a/core/assets/bundles/bundle_in_ID.properties
+++ b/core/assets/bundles/bundle_in_ID.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Kapasitas Panas: {0}
 liquid.viscosity = [lightgray]Kelekatan: {0}
 liquid.temperature = [lightgray]Suhu: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_it.properties b/core/assets/bundles/bundle_it.properties
index ad178aa06c..15a2bcce0f 100644
--- a/core/assets/bundles/bundle_it.properties
+++ b/core/assets/bundles/bundle_it.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Velocità di Scavo: {0}%
 unit.minepower = [lightgray]Potenza di Scavo: {0}
 unit.ability = [lightgray]Abilità: {0}
 unit.buildspeed = [lightgray]Velocità di Costruzione: {0}%
+
 liquid.heatcapacity = [lightgray]Capacità Termica: {0}
 liquid.viscosity = [lightgray]Viscosità: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties
index f32a19c9a2..a6d4930e01 100644
--- a/core/assets/bundles/bundle_ja.properties
+++ b/core/assets/bundles/bundle_ja.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]採掘速度: {0}%
 unit.minepower = [lightgray]採掘性能: {0}
 unit.ability = [lightgray]能力: {0}
 unit.buildspeed = [lightgray]建築速度: {0}%
+
 liquid.heatcapacity = [lightgray]熱容量: {0}
 liquid.viscosity = [lightgray]粘度: {0}
 liquid.temperature = [lightgray]温度: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties
index b1eb6fd5cd..1e31628fdf 100644
--- a/core/assets/bundles/bundle_ko.properties
+++ b/core/assets/bundles/bundle_ko.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]채광 속도: {0}%
 unit.minepower = [lightgray]채광 레벨: {0}
 unit.ability = [lightgray]능력: {0}
 unit.buildspeed = [lightgray]건설 속도: {0}%
+
 liquid.heatcapacity = [lightgray]발열 용량: {0}
 liquid.viscosity = [lightgray]점도: {0}
 liquid.temperature = [lightgray]온도: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties
index 929d60cfeb..deeab3248a 100644
--- a/core/assets/bundles/bundle_lt.properties
+++ b/core/assets/bundles/bundle_lt.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Karščio Talpumas: {0}
 liquid.viscosity = [lightgray]Klampumas: {0}
 liquid.temperature = [lightgray]Temperatūra: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_nl.properties b/core/assets/bundles/bundle_nl.properties
index 62cb5e2b2a..2c2ea97609 100644
--- a/core/assets/bundles/bundle_nl.properties
+++ b/core/assets/bundles/bundle_nl.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Warmte Capaciteit: {0}
 liquid.viscosity = [lightgray]Viscositeit: {0}
 liquid.temperature = [lightgray]Tempratuur: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_nl_BE.properties b/core/assets/bundles/bundle_nl_BE.properties
index ca1c07dda9..8273935b23 100644
--- a/core/assets/bundles/bundle_nl_BE.properties
+++ b/core/assets/bundles/bundle_nl_BE.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viscosity: {0}
 liquid.temperature = [lightgray]Temperature: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties
index 6ca96602d0..e2893e1ebb 100644
--- a/core/assets/bundles/bundle_pl.properties
+++ b/core/assets/bundles/bundle_pl.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Prędkość kopania: {0}%
 unit.minepower = [lightgray]Moc kopania: {0}
 unit.ability = [lightgray]Umiejętność: {0}
 unit.buildspeed = [lightgray]Prędkość budowania: {0}%
+
 liquid.heatcapacity = [lightgray]Wytrzymałość na przegrzewanie: {0}
 liquid.viscosity = [lightgray]Lepkość: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_pt_BR.properties b/core/assets/bundles/bundle_pt_BR.properties
index 0afeb34d74..503c33f65f 100644
--- a/core/assets/bundles/bundle_pt_BR.properties
+++ b/core/assets/bundles/bundle_pt_BR.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidade de aquecimento: {0}
 liquid.viscosity = [lightgray]Viscosidade: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_pt_PT.properties b/core/assets/bundles/bundle_pt_PT.properties
index 3f2ba0d911..7c99c2617c 100644
--- a/core/assets/bundles/bundle_pt_PT.properties
+++ b/core/assets/bundles/bundle_pt_PT.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Capacidade de aquecimento: {0}
 liquid.viscosity = [lightgray]Viscosidade: {0}
 liquid.temperature = [lightgray]Temperatura: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties
index 5cacf1cbe8..36d6b7cb60 100644
--- a/core/assets/bundles/bundle_ru.properties
+++ b/core/assets/bundles/bundle_ru.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Скорость добычи: {0}%
 unit.minepower = [lightgray]Мощность добычи: {0}
 unit.ability = [lightgray]Способность: {0}
 unit.buildspeed = [lightgray]Скорость строительства: {0}%
+
 liquid.heatcapacity = [lightgray]Теплоёмкость: {0}
 liquid.viscosity = [lightgray]Вязкость: {0}
 liquid.temperature = [lightgray]Температура: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_sv.properties b/core/assets/bundles/bundle_sv.properties
index 4b2683be98..10529e8726 100644
--- a/core/assets/bundles/bundle_sv.properties
+++ b/core/assets/bundles/bundle_sv.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Heat Capacity: {0}
 liquid.viscosity = [lightgray]Viskositet: {0}
 liquid.temperature = [lightgray]Temperatur: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties
index 31bc7c33c0..5a68d1cbcc 100644
--- a/core/assets/bundles/bundle_th.properties
+++ b/core/assets/bundles/bundle_th.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]ความจุความร้อน: {0}
 liquid.viscosity = [lightgray]ความหนืด: {0}
 liquid.temperature = [lightgray]อุณหภูมิ: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_tk.properties b/core/assets/bundles/bundle_tk.properties
index 2d42a1d848..a121fbb405 100644
--- a/core/assets/bundles/bundle_tk.properties
+++ b/core/assets/bundles/bundle_tk.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]isinma kapasitesi: {0}
 liquid.viscosity = [lightgray]Yari sivilik: {0}
 liquid.temperature = [lightgray]isi: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_tr.properties b/core/assets/bundles/bundle_tr.properties
index 6bfafce2b9..5e8ede7fe8 100644
--- a/core/assets/bundles/bundle_tr.properties
+++ b/core/assets/bundles/bundle_tr.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
 unit.ability = [lightgray]Ability: {0}
 unit.buildspeed = [lightgray]Building Speed: {0}%
+
 liquid.heatcapacity = [lightgray]Isı Kapasitesi: {0}
 liquid.viscosity = [lightgray]Vizkosite: {0}
 liquid.temperature = [lightgray]Sıcaklık: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties
index 7ab855df10..9771a0bc3d 100644
--- a/core/assets/bundles/bundle_uk_UA.properties
+++ b/core/assets/bundles/bundle_uk_UA.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]Швидкість видобутку: {0} %
 unit.minepower = [lightgray]Потужність видобутку: {0}
 unit.ability = [lightgray]Здібність: {0}
 unit.buildspeed = [lightgray]Швидкість будування: {0} %
+
 liquid.heatcapacity = [lightgray]Теплоємність: {0}
 liquid.viscosity = [lightgray]В’язкість: {0}
 liquid.temperature = [lightgray]Температура: {0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties
index c3addf0703..f114af7080 100644
--- a/core/assets/bundles/bundle_zh_CN.properties
+++ b/core/assets/bundles/bundle_zh_CN.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]采矿速度：{0}%
 unit.minepower = [lightgray]采矿力量：{0}
 unit.ability = [lightgray]能力：{0}
 unit.buildspeed = [lightgray]建造速度：{0}%
+
 liquid.heatcapacity = [lightgray]热容量：{0}
 liquid.viscosity = [lightgray]粘度：{0}
 liquid.temperature = [lightgray]温度：{0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties
index e7ad86ac5d..7cf0708df7 100644
--- a/core/assets/bundles/bundle_zh_TW.properties
+++ b/core/assets/bundles/bundle_zh_TW.properties
@@ -841,6 +841,7 @@ unit.minespeed = [lightgray]採礦速度: {0}%
 unit.minepower = [lightgray]採礦能力: {0}
 unit.ability = [lightgray]能力: {0}
 unit.buildspeed = [lightgray]建造速度: {0}%
+
 liquid.heatcapacity = [lightgray]熱容量：{0}
 liquid.viscosity = [lightgray]粘性：{0}
 liquid.temperature = [lightgray]溫度：{0}
@@ -863,7 +864,7 @@ unit.eclipse.name = Eclipse
 unit.mono.name = Mono
 unit.poly.name = Poly
 unit.mega.name = Mega
-unit.risse.name = Risse
+unit.risso.name = Risso
 unit.minke.name = Minke
 unit.bryde.name = Bryde
 unit.alpha.name = Alpha
diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 4a667ccd7d..191f61da38 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -278,3 +278,4 @@
 63466=beta|unit-beta-medium
 63465=gamma|unit-gamma-medium
 63464=block|unit-block-medium
+63463=risso|unit-risso-medium
diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas
index 62d5a46e8a..39467740d2 100644
--- a/core/assets/sprites/fallback/sprites.atlas
+++ b/core/assets/sprites/fallback/sprites.atlas
@@ -4798,21 +4798,21 @@ ripple
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-wreck0
+risso-wreck0
   rotate: false
   xy: 589, 741
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-wreck1
+risso-wreck1
   rotate: false
   xy: 491, 739
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-wreck2
+risso-wreck2
   rotate: false
   xy: 981, 735
   size: 96, 96
@@ -5099,7 +5099,7 @@ unit-quasar-full
   orig: 80, 80
   offset: 0, 0
   index: -1
-unit-risse-full
+unit-risso-full
   rotate: false
   xy: 1471, 653
   size: 96, 96
@@ -5764,14 +5764,14 @@ quasar-leg
   orig: 80, 80
   offset: 0, 0
   index: -1
-risse
+risso
   rotate: false
   xy: 883, 747
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-cell
+risso-cell
   rotate: false
   xy: 1, 742
   size: 96, 96
@@ -6729,147 +6729,147 @@ filter: nearest,nearest
 repeat: none
 char1
   rotate: false
-  xy: 835, 327
+  xy: 1281, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char2
   rotate: false
-  xy: 1099, 459
+  xy: 1315, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char3
   rotate: false
-  xy: 869, 327
+  xy: 1349, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliff
   rotate: false
-  xy: 1133, 459
+  xy: 1383, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs1
   rotate: false
-  xy: 903, 327
+  xy: 1417, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 1167, 459
+  xy: 1451, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 937, 327
+  xy: 1485, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 1201, 459
+  xy: 1519, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 1235, 459
+  xy: 1553, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 1269, 459
+  xy: 1587, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 1303, 459
+  xy: 1621, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters1
   rotate: false
-  xy: 1337, 459
+  xy: 1655, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters2
   rotate: false
-  xy: 1371, 459
+  xy: 1689, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters3
   rotate: false
-  xy: 1405, 459
+  xy: 1723, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters4
   rotate: false
-  xy: 1439, 459
+  xy: 1757, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters5
   rotate: false
-  xy: 1473, 459
+  xy: 1791, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters6
   rotate: false
-  xy: 1507, 459
+  xy: 1825, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-metal-large
   rotate: false
-  xy: 785, 427
+  xy: 687, 329
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dark-metal1
   rotate: false
-  xy: 1541, 459
+  xy: 1859, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-metal2
   rotate: false
-  xy: 1575, 459
+  xy: 1893, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-1
   rotate: false
-  xy: 1609, 459
+  xy: 1927, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6883,7 +6883,7 @@ dark-panel-1-edge
   index: -1
 dark-panel-2
   rotate: false
-  xy: 1643, 459
+  xy: 1961, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6897,7 +6897,7 @@ dark-panel-2-edge
   index: -1
 dark-panel-3
   rotate: false
-  xy: 1677, 459
+  xy: 1995, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6911,7 +6911,7 @@ dark-panel-3-edge
   index: -1
 dark-panel-4
   rotate: false
-  xy: 1711, 459
+  xy: 753, 361
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6925,7 +6925,7 @@ dark-panel-4-edge
   index: -1
 dark-panel-5
   rotate: false
-  xy: 1745, 459
+  xy: 753, 327
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6939,7 +6939,7 @@ dark-panel-5-edge
   index: -1
 dark-panel-6
   rotate: false
-  xy: 1779, 459
+  xy: 753, 293
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6960,7 +6960,7 @@ darksand-edge
   index: -1
 darksand-tainted-water
   rotate: false
-  xy: 1915, 459
+  xy: 525, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6974,28 +6974,28 @@ darksand-tainted-water-edge
   index: -1
 darksand-tainted-water1
   rotate: false
-  xy: 1949, 459
+  xy: 655, 131
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-tainted-water2
   rotate: false
-  xy: 1983, 459
+  xy: 753, 259
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-tainted-water3
   rotate: false
-  xy: 491, 1
+  xy: 689, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water
   rotate: false
-  xy: 557, 67
+  xy: 689, 145
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7009,49 +7009,49 @@ darksand-water-edge
   index: -1
 darksand-water1
   rotate: false
-  xy: 655, 165
+  xy: 737, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water2
   rotate: false
-  xy: 753, 263
+  xy: 1181, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water3
   rotate: false
-  xy: 525, 1
+  xy: 1215, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand1
   rotate: false
-  xy: 1813, 459
+  xy: 491, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand2
   rotate: false
-  xy: 1847, 459
+  xy: 557, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand3
   rotate: false
-  xy: 1881, 459
+  xy: 655, 165
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 655, 131
+  xy: 1249, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7065,28 +7065,28 @@ deepwater-edge
   index: -1
 dunerocks-large
   rotate: false
-  xy: 491, 35
+  xy: 785, 427
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dunerocks1
   rotate: false
-  xy: 753, 229
+  xy: 1283, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dunerocks2
   rotate: false
-  xy: 787, 277
+  xy: 1317, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 edge
   rotate: false
-  xy: 787, 243
+  xy: 1351, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7100,7 +7100,7 @@ edge-stencil
   index: -1
 edgier
   rotate: false
-  xy: 983, 343
+  xy: 1385, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7114,21 +7114,21 @@ grass-edge
   index: -1
 grass1
   rotate: false
-  xy: 1033, 393
+  xy: 1419, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 835, 293
+  xy: 1453, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 869, 293
+  xy: 1487, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7142,42 +7142,42 @@ holostone-edge
   index: -1
 holostone1
   rotate: false
-  xy: 903, 293
+  xy: 1521, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone2
   rotate: false
-  xy: 937, 293
+  xy: 1555, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone3
   rotate: false
-  xy: 971, 309
+  xy: 1589, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock1
   rotate: false
-  xy: 821, 259
+  xy: 1623, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock2
   rotate: false
-  xy: 855, 259
+  xy: 1657, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock3
   rotate: false
-  xy: 889, 259
+  xy: 1691, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7198,63 +7198,63 @@ ice-snow-edge
   index: -1
 ice-snow1
   rotate: false
-  xy: 1167, 425
+  xy: 1827, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow2
   rotate: false
-  xy: 1201, 425
+  xy: 1861, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow3
   rotate: false
-  xy: 1235, 425
+  xy: 1895, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 923, 259
+  xy: 1725, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 1099, 425
+  xy: 1759, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 1133, 425
+  xy: 1793, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks-large
   rotate: false
-  xy: 589, 133
+  xy: 491, 35
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 icerocks1
   rotate: false
-  xy: 1269, 425
+  xy: 1929, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks2
   rotate: false
-  xy: 1303, 425
+  xy: 1963, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7268,77 +7268,77 @@ ignarock-edge
   index: -1
 ignarock1
   rotate: false
-  xy: 1337, 425
+  xy: 1997, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock2
   rotate: false
-  xy: 1371, 425
+  xy: 771, 225
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock3
   rotate: false
-  xy: 1405, 425
+  xy: 1283, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 1439, 425
+  xy: 1317, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 1473, 425
+  xy: 1351, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 1507, 425
+  xy: 1385, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock1
   rotate: false
-  xy: 1541, 425
+  xy: 1419, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock2
   rotate: false
-  xy: 1575, 425
+  xy: 1453, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock3
   rotate: false
-  xy: 1609, 425
+  xy: 1487, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor
   rotate: false
-  xy: 1643, 425
+  xy: 1521, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2
   rotate: false
-  xy: 1677, 425
+  xy: 1555, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7352,7 +7352,7 @@ metal-floor-2-edge
   index: -1
 metal-floor-3
   rotate: false
-  xy: 1711, 425
+  xy: 1589, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7366,7 +7366,7 @@ metal-floor-3-edge
   index: -1
 metal-floor-5
   rotate: false
-  xy: 1745, 425
+  xy: 1623, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7387,21 +7387,21 @@ metal-floor-damaged-edge
   index: -1
 metal-floor-damaged1
   rotate: false
-  xy: 1779, 425
+  xy: 1657, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged2
   rotate: false
-  xy: 1813, 425
+  xy: 1691, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged3
   rotate: false
-  xy: 1847, 425
+  xy: 1725, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7422,301 +7422,294 @@ moss-edge
   index: -1
 moss1
   rotate: false
-  xy: 1881, 425
+  xy: 1759, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss2
   rotate: false
-  xy: 1915, 425
+  xy: 1793, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss3
   rotate: false
-  xy: 1949, 425
+  xy: 1827, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal1
   rotate: false
-  xy: 1983, 425
+  xy: 1861, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal2
   rotate: false
-  xy: 1017, 343
+  xy: 1895, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal3
   rotate: false
-  xy: 1005, 309
+  xy: 1929, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper1
   rotate: false
-  xy: 971, 275
+  xy: 1963, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper2
   rotate: false
-  xy: 1005, 275
+  xy: 1997, 391
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper3
   rotate: false
-  xy: 821, 225
+  xy: 723, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead1
   rotate: false
-  xy: 855, 225
+  xy: 723, 145
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead2
   rotate: false
-  xy: 889, 225
+  xy: 757, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead3
   rotate: false
-  xy: 923, 225
+  xy: 757, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap1
   rotate: false
-  xy: 787, 209
+  xy: 689, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap2
   rotate: false
-  xy: 957, 241
+  xy: 723, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap3
   rotate: false
-  xy: 991, 241
+  xy: 757, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium1
   rotate: false
-  xy: 821, 191
+  xy: 791, 191
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium2
   rotate: false
-  xy: 855, 191
+  xy: 791, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium3
   rotate: false
-  xy: 889, 191
+  xy: 791, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium1
   rotate: false
-  xy: 923, 191
+  xy: 757, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium2
   rotate: false
-  xy: 957, 207
+  xy: 791, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium3
   rotate: false
-  xy: 991, 207
+  xy: 591, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles1
   rotate: false
-  xy: 957, 173
+  xy: 591, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles2
   rotate: false
-  xy: 991, 173
+  xy: 625, 97
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles3
   rotate: false
-  xy: 1025, 241
+  xy: 625, 63
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pine
   rotate: false
-  xy: 785, 311
+  xy: 687, 213
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-ripples
-  rotate: false
-  xy: 393, 199
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
 rocks-large
   rotate: false
-  xy: 687, 231
+  xy: 589, 133
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rocks1
   rotate: false
-  xy: 1025, 207
+  xy: 659, 77
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 1025, 173
+  xy: 693, 77
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt
   rotate: false
-  xy: 1039, 309
+  xy: 659, 43
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt-edge
   rotate: false
-  xy: 491, 297
+  xy: 393, 199
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 saltrocks-large
   rotate: false
-  xy: 785, 361
+  xy: 687, 263
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 saltrocks1
   rotate: false
-  xy: 1039, 275
+  xy: 693, 43
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 saltrocks2
   rotate: false
-  xy: 1059, 241
+  xy: 727, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-edge
   rotate: false
-  xy: 589, 395
+  xy: 491, 297
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 sand-water
   rotate: false
-  xy: 591, 65
+  xy: 761, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-edge
   rotate: false
-  xy: 295, 3
+  xy: 589, 395
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 sand-water1
   rotate: false
-  xy: 625, 97
+  xy: 795, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water2
   rotate: false
-  xy: 625, 63
+  xy: 787, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water3
   rotate: false
-  xy: 659, 97
+  xy: 787, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 1059, 207
+  xy: 761, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 1059, 173
+  xy: 795, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 591, 99
+  xy: 727, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7730,371 +7723,371 @@ sandrocks-large
   index: -1
 sandrocks1
   rotate: false
-  xy: 659, 63
+  xy: 821, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks2
   rotate: false
-  xy: 689, 197
+  xy: 787, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 689, 163
+  xy: 855, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 723, 195
+  xy: 821, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 723, 161
+  xy: 787, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-edge
   rotate: false
-  xy: 393, 101
+  xy: 295, 3
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 shale1
   rotate: false
-  xy: 757, 175
+  xy: 889, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale2
   rotate: false
-  xy: 757, 141
+  xy: 821, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale3
   rotate: false
-  xy: 791, 157
+  xy: 855, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks-large
   rotate: false
-  xy: 851, 361
+  xy: 917, 427
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shalerocks1
   rotate: false
-  xy: 825, 157
+  xy: 923, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks2
   rotate: false
-  xy: 859, 157
+  xy: 821, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrubs-large
   rotate: false
-  xy: 917, 427
+  xy: 983, 427
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shrubs1
   rotate: false
-  xy: 893, 157
+  xy: 855, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrubs2
   rotate: false
-  xy: 791, 123
+  xy: 889, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 slag
   rotate: false
-  xy: 825, 123
+  xy: 957, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 slag-edge
   rotate: false
-  xy: 491, 199
+  xy: 393, 101
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 snow-edge
   rotate: false
-  xy: 589, 297
+  xy: 491, 199
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 snow-pine
   rotate: false
-  xy: 983, 377
+  xy: 1181, 443
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 859, 123
+  xy: 855, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 893, 123
+  xy: 889, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 927, 139
+  xy: 923, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks-large
   rotate: false
-  xy: 917, 361
+  xy: 1049, 427
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 snowrocks1
   rotate: false
-  xy: 961, 139
+  xy: 991, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 995, 139
+  xy: 889, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn
   rotate: false
-  xy: 1029, 139
+  xy: 923, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss-edge
   rotate: false
-  xy: 687, 395
+  xy: 589, 297
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 spore-moss1
   rotate: false
-  xy: 1063, 139
+  xy: 957, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss2
   rotate: false
-  xy: 927, 105
+  xy: 1025, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss3
   rotate: false
-  xy: 961, 105
+  xy: 923, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pine
   rotate: false
-  xy: 1049, 443
+  xy: 1231, 443
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sporerocks-large
   rotate: false
-  xy: 983, 427
+  xy: 1115, 427
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sporerocks1
   rotate: false
-  xy: 995, 105
+  xy: 957, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sporerocks2
   rotate: false
-  xy: 1029, 105
+  xy: 991, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-edge
   rotate: false
-  xy: 393, 3
+  xy: 687, 395
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 1063, 105
+  xy: 1059, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 1067, 391
+  xy: 957, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1101, 391
+  xy: 991, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water
   rotate: false
-  xy: 1135, 391
+  xy: 1025, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water-edge
   rotate: false
-  xy: 491, 101
+  xy: 393, 3
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 1169, 391
+  xy: 1093, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-edge
   rotate: false
-  xy: 589, 199
+  xy: 491, 101
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 tendrils1
   rotate: false
-  xy: 1203, 391
+  xy: 991, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tendrils2
   rotate: false
-  xy: 1237, 391
+  xy: 1025, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tendrils3
   rotate: false
-  xy: 1271, 391
+  xy: 1059, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 1305, 391
+  xy: 1127, 393
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1339, 391
+  xy: 1025, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1373, 391
+  xy: 1059, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1407, 391
+  xy: 1093, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1441, 391
+  xy: 1059, 291
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1475, 391
+  xy: 1093, 325
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 1509, 391
+  xy: 1127, 359
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-edge
   rotate: false
-  xy: 687, 297
+  xy: 589, 199
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -18634,35 +18627,35 @@ unit-quasar-xlarge
   orig: 48, 48
   offset: 0, 0
   index: -1
-unit-risse-large
+unit-risso-large
   rotate: false
   xy: 1615, 807
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-unit-risse-medium
+unit-risso-medium
   rotate: false
   xy: 1729, 794
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-unit-risse-small
+unit-risso-small
   rotate: false
   xy: 1327, 273
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-unit-risse-tiny
+unit-risso-tiny
   rotate: false
   xy: 1407, 57
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-unit-risse-xlarge
+unit-risso-xlarge
   rotate: false
   xy: 601, 366
   size: 48, 48
diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png
index 6ee45516ec..61ee24d7ef 100644
Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ
diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png
index 00dd54576b..183ebbdcca 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 e662f75c4e..ce24c31d04 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 8deffc814e..55d2670f76 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -5135,21 +5135,21 @@ ripple
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-wreck0
+risso-wreck0
   rotate: false
   xy: 2921, 747
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-wreck1
+risso-wreck1
   rotate: false
   xy: 2921, 649
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-wreck2
+risso-wreck2
   rotate: false
   xy: 2921, 551
   size: 96, 96
@@ -5450,7 +5450,7 @@ unit-quasar-full
   orig: 80, 80
   offset: 0, 0
   index: -1
-unit-risse-full
+unit-risso-full
   rotate: false
   xy: 3117, 551
   size: 96, 96
@@ -6164,14 +6164,14 @@ quasar-leg
   orig: 80, 80
   offset: 0, 0
   index: -1
-risse
+risso
   rotate: false
   xy: 2725, 453
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-risse-cell
+risso-cell
   rotate: false
   xy: 2823, 453
   size: 96, 96
@@ -6717,147 +6717,147 @@ filter: nearest,nearest
 repeat: none
 char1
   rotate: false
-  xy: 51, 17
+  xy: 2311, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char2
   rotate: false
-  xy: 1717, 81
+  xy: 101, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char3
   rotate: false
-  xy: 1997, 163
+  xy: 2345, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliff
   rotate: false
-  xy: 2047, 213
+  xy: 135, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs1
   rotate: false
-  xy: 85, 17
+  xy: 2379, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 1751, 81
+  xy: 169, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 1997, 129
+  xy: 2413, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 2081, 213
+  xy: 203, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 119, 17
+  xy: 2447, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 1785, 81
+  xy: 237, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 2115, 213
+  xy: 2481, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters1
   rotate: false
-  xy: 153, 17
+  xy: 271, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters2
   rotate: false
-  xy: 1819, 81
+  xy: 2515, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters3
   rotate: false
-  xy: 2149, 213
+  xy: 305, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters4
   rotate: false
-  xy: 187, 17
+  xy: 2549, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters5
   rotate: false
-  xy: 1853, 81
+  xy: 339, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters6
   rotate: false
-  xy: 2183, 213
+  xy: 2583, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-metal-large
   rotate: false
-  xy: 1667, 181
+  xy: 1569, 83
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dark-metal1
   rotate: false
-  xy: 221, 17
+  xy: 373, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-metal2
   rotate: false
-  xy: 1887, 81
+  xy: 2617, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-1
   rotate: false
-  xy: 2217, 213
+  xy: 407, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6871,7 +6871,7 @@ dark-panel-1-edge
   index: -1
 dark-panel-2
   rotate: false
-  xy: 255, 17
+  xy: 2651, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6885,7 +6885,7 @@ dark-panel-2-edge
   index: -1
 dark-panel-3
   rotate: false
-  xy: 1921, 81
+  xy: 441, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6899,7 +6899,7 @@ dark-panel-3-edge
   index: -1
 dark-panel-4
   rotate: false
-  xy: 2251, 213
+  xy: 2685, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6913,7 +6913,7 @@ dark-panel-4-edge
   index: -1
 dark-panel-5
   rotate: false
-  xy: 289, 17
+  xy: 475, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6927,7 +6927,7 @@ dark-panel-5-edge
   index: -1
 dark-panel-6
   rotate: false
-  xy: 1955, 81
+  xy: 2719, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6948,7 +6948,7 @@ darksand-edge
   index: -1
 darksand-tainted-water
   rotate: false
-  xy: 357, 17
+  xy: 2787, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6962,28 +6962,28 @@ darksand-tainted-water-edge
   index: -1
 darksand-tainted-water1
   rotate: false
-  xy: 2353, 213
+  xy: 577, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-tainted-water2
   rotate: false
-  xy: 391, 17
+  xy: 2821, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-tainted-water3
   rotate: false
-  xy: 2387, 213
+  xy: 611, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water
   rotate: false
-  xy: 425, 17
+  xy: 2855, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6997,49 +6997,49 @@ darksand-water-edge
   index: -1
 darksand-water1
   rotate: false
-  xy: 2421, 213
+  xy: 645, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water2
   rotate: false
-  xy: 459, 17
+  xy: 2889, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water3
   rotate: false
-  xy: 2455, 213
+  xy: 679, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand1
   rotate: false
-  xy: 2285, 213
+  xy: 509, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand2
   rotate: false
-  xy: 323, 17
+  xy: 2753, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand3
   rotate: false
-  xy: 2319, 213
+  xy: 543, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 493, 17
+  xy: 2923, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7053,28 +7053,28 @@ deepwater-edge
   index: -1
 dunerocks-large
   rotate: false
-  xy: 1667, 115
+  xy: 1667, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dunerocks1
   rotate: false
-  xy: 2489, 213
+  xy: 713, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dunerocks2
   rotate: false
-  xy: 527, 17
+  xy: 2957, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 edge
   rotate: false
-  xy: 2523, 213
+  xy: 747, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7088,7 +7088,7 @@ edge-stencil
   index: -1
 edgier
   rotate: false
-  xy: 561, 17
+  xy: 2991, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7102,21 +7102,21 @@ grass-edge
   index: -1
 grass1
   rotate: false
-  xy: 2557, 213
+  xy: 781, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 595, 17
+  xy: 3025, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 2591, 213
+  xy: 815, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7130,42 +7130,42 @@ holostone-edge
   index: -1
 holostone1
   rotate: false
-  xy: 629, 17
+  xy: 3059, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone2
   rotate: false
-  xy: 2625, 213
+  xy: 849, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone3
   rotate: false
-  xy: 663, 17
+  xy: 3093, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock1
   rotate: false
-  xy: 2659, 213
+  xy: 883, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock2
   rotate: false
-  xy: 697, 17
+  xy: 3127, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock3
   rotate: false
-  xy: 2693, 213
+  xy: 917, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7186,42 +7186,42 @@ ice-snow-edge
   index: -1
 ice-snow1
   rotate: false
-  xy: 2761, 213
+  xy: 985, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow2
   rotate: false
-  xy: 799, 17
+  xy: 3229, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow3
   rotate: false
-  xy: 2795, 213
+  xy: 1019, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 731, 17
+  xy: 3161, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 2727, 213
+  xy: 951, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 765, 17
+  xy: 3195, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7235,14 +7235,14 @@ icerocks-large
   index: -1
 icerocks1
   rotate: false
-  xy: 833, 17
+  xy: 3263, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks2
   rotate: false
-  xy: 2829, 213
+  xy: 1053, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7256,77 +7256,77 @@ ignarock-edge
   index: -1
 ignarock1
   rotate: false
-  xy: 867, 17
+  xy: 3297, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock2
   rotate: false
-  xy: 2863, 213
+  xy: 1087, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock3
   rotate: false
-  xy: 901, 17
+  xy: 3331, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 2897, 213
+  xy: 1121, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 935, 17
+  xy: 3365, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 2931, 213
+  xy: 1155, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock1
   rotate: false
-  xy: 969, 17
+  xy: 3399, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock2
   rotate: false
-  xy: 2965, 213
+  xy: 1189, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock3
   rotate: false
-  xy: 1003, 17
+  xy: 3433, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor
   rotate: false
-  xy: 2999, 213
+  xy: 1223, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2
   rotate: false
-  xy: 1037, 17
+  xy: 3467, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7340,7 +7340,7 @@ metal-floor-2-edge
   index: -1
 metal-floor-3
   rotate: false
-  xy: 3033, 213
+  xy: 1257, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7354,7 +7354,7 @@ metal-floor-3-edge
   index: -1
 metal-floor-5
   rotate: false
-  xy: 1071, 17
+  xy: 3501, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7375,21 +7375,21 @@ metal-floor-damaged-edge
   index: -1
 metal-floor-damaged1
   rotate: false
-  xy: 3067, 213
+  xy: 1291, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged2
   rotate: false
-  xy: 1105, 17
+  xy: 3535, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged3
   rotate: false
-  xy: 3101, 213
+  xy: 1325, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7410,168 +7410,168 @@ moss-edge
   index: -1
 moss1
   rotate: false
-  xy: 1139, 17
+  xy: 3569, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss2
   rotate: false
-  xy: 3135, 213
+  xy: 1359, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss3
   rotate: false
-  xy: 1173, 17
+  xy: 3603, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal1
   rotate: false
-  xy: 3169, 213
+  xy: 1393, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal2
   rotate: false
-  xy: 1207, 17
+  xy: 3637, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal3
   rotate: false
-  xy: 3203, 213
+  xy: 1427, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper1
   rotate: false
-  xy: 1241, 17
+  xy: 3671, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper2
   rotate: false
-  xy: 3237, 213
+  xy: 1461, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper3
   rotate: false
-  xy: 1275, 17
+  xy: 3705, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead1
   rotate: false
-  xy: 3271, 213
+  xy: 1495, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead2
   rotate: false
-  xy: 1309, 17
+  xy: 3739, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead3
   rotate: false
-  xy: 3305, 213
+  xy: 1529, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap1
   rotate: false
-  xy: 1343, 17
+  xy: 3773, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap2
   rotate: false
-  xy: 3339, 213
+  xy: 3807, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap3
   rotate: false
-  xy: 1377, 17
+  xy: 3841, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium1
   rotate: false
-  xy: 3373, 213
+  xy: 3875, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium2
   rotate: false
-  xy: 1411, 17
+  xy: 3909, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium3
   rotate: false
-  xy: 3407, 213
+  xy: 3943, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium1
   rotate: false
-  xy: 1445, 17
+  xy: 3977, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium2
   rotate: false
-  xy: 3441, 213
+  xy: 4011, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium3
   rotate: false
-  xy: 1479, 17
+  xy: 4045, 213
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles1
   rotate: false
-  xy: 3475, 213
+  xy: 1569, 49
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles2
   rotate: false
-  xy: 1513, 17
+  xy: 1635, 115
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles3
   rotate: false
-  xy: 3509, 213
+  xy: 1603, 49
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -7583,506 +7583,499 @@ pine
   orig: 48, 48
   offset: 0, 0
   index: -1
-ripples
-  rotate: false
-  xy: 1079, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
 rocks-large
-  rotate: false
-  xy: 1733, 115
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-rocks1
-  rotate: false
-  xy: 1547, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-rocks2
-  rotate: false
-  xy: 3543, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-salt
-  rotate: false
-  xy: 1581, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-salt-edge
-  rotate: false
-  xy: 1079, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-saltrocks-large
   rotate: false
   xy: 1799, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-saltrocks1
+rocks1
   rotate: false
-  xy: 3577, 213
+  xy: 1563, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-saltrocks2
+rocks2
   rotate: false
-  xy: 1615, 17
+  xy: 1597, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-sand-edge
+salt
   rotate: false
-  xy: 1177, 149
+  xy: 2261, 163
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+salt-edge
+  rotate: false
+  xy: 1079, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-sand-water
-  rotate: false
-  xy: 3713, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-water-edge
-  rotate: false
-  xy: 1177, 51
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-sand-water1
-  rotate: false
-  xy: 3747, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-water2
-  rotate: false
-  xy: 3781, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand-water3
-  rotate: false
-  xy: 3815, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand1
-  rotate: false
-  xy: 3611, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand2
-  rotate: false
-  xy: 3645, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sand3
-  rotate: false
-  xy: 3679, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sandrocks-large
-  rotate: false
-  xy: 1799, 115
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-sandrocks1
-  rotate: false
-  xy: 3849, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-sandrocks2
-  rotate: false
-  xy: 3883, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap1
-  rotate: false
-  xy: 3917, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap2
-  rotate: false
-  xy: 3951, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-scrap3
-  rotate: false
-  xy: 3985, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shale-edge
-  rotate: false
-  xy: 1275, 149
-  size: 96, 96
-  orig: 96, 96
-  offset: 0, 0
-  index: -1
-shale1
-  rotate: false
-  xy: 4019, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shale2
-  rotate: false
-  xy: 4053, 213
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shale3
-  rotate: false
-  xy: 1649, 17
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shalerocks-large
+saltrocks-large
   rotate: false
   xy: 1865, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
-shalerocks1
+saltrocks1
   rotate: false
-  xy: 1683, 31
+  xy: 2311, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-shalerocks2
+saltrocks2
   rotate: false
-  xy: 1717, 47
+  xy: 2345, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-shrubs-large
+sand-edge
   rotate: false
-  xy: 1865, 115
-  size: 64, 64
-  orig: 64, 64
-  offset: 0, 0
-  index: -1
-shrubs1
-  rotate: false
-  xy: 1751, 47
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-shrubs2
-  rotate: false
-  xy: 1785, 47
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-slag
-  rotate: false
-  xy: 1819, 47
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-slag-edge
-  rotate: false
-  xy: 1275, 51
+  xy: 1079, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-snow-edge
+sand-water
   rotate: false
-  xy: 1373, 149
+  xy: 2481, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand-water-edge
+  rotate: false
+  xy: 1177, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
-snow-pine
+sand-water1
   rotate: false
-  xy: 1667, 65
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-snow1
-  rotate: false
-  xy: 1853, 47
+  xy: 2515, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-snow2
+sand-water2
   rotate: false
-  xy: 1887, 47
+  xy: 2549, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-snow3
+sand-water3
   rotate: false
-  xy: 1921, 47
+  xy: 2583, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-snowrocks-large
+sand1
+  rotate: false
+  xy: 2379, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand2
+  rotate: false
+  xy: 2413, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sand3
+  rotate: false
+  xy: 2447, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sandrocks-large
   rotate: false
   xy: 1931, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
+sandrocks1
+  rotate: false
+  xy: 2617, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+sandrocks2
+  rotate: false
+  xy: 2651, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap1
+  rotate: false
+  xy: 2685, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap2
+  rotate: false
+  xy: 2719, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+scrap3
+  rotate: false
+  xy: 2753, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shale-edge
+  rotate: false
+  xy: 1177, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+shale1
+  rotate: false
+  xy: 2787, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shale2
+  rotate: false
+  xy: 2821, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shale3
+  rotate: false
+  xy: 2855, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shalerocks-large
+  rotate: false
+  xy: 1997, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+shalerocks1
+  rotate: false
+  xy: 2889, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shalerocks2
+  rotate: false
+  xy: 2923, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shrubs-large
+  rotate: false
+  xy: 2063, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
+shrubs1
+  rotate: false
+  xy: 2957, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+shrubs2
+  rotate: false
+  xy: 2991, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+slag
+  rotate: false
+  xy: 3025, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+slag-edge
+  rotate: false
+  xy: 1275, 149
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+snow-edge
+  rotate: false
+  xy: 1275, 51
+  size: 96, 96
+  orig: 96, 96
+  offset: 0, 0
+  index: -1
+snow-pine
+  rotate: false
+  xy: 2261, 197
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+snow1
+  rotate: false
+  xy: 3059, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+snow2
+  rotate: false
+  xy: 3093, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+snow3
+  rotate: false
+  xy: 3127, 179
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+snowrocks-large
+  rotate: false
+  xy: 2129, 181
+  size: 64, 64
+  orig: 64, 64
+  offset: 0, 0
+  index: -1
 snowrocks1
   rotate: false
-  xy: 1955, 47
+  xy: 3161, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 2031, 163
+  xy: 3195, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn
   rotate: false
-  xy: 2031, 129
+  xy: 3229, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss-edge
   rotate: false
-  xy: 1373, 51
+  xy: 1373, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 spore-moss1
   rotate: false
-  xy: 2065, 179
+  xy: 3263, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss2
   rotate: false
-  xy: 2065, 145
+  xy: 3297, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss3
   rotate: false
-  xy: 2099, 179
+  xy: 3331, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pine
   rotate: false
-  xy: 1997, 197
+  xy: 51, 1
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sporerocks-large
   rotate: false
-  xy: 1931, 115
+  xy: 2195, 181
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sporerocks1
   rotate: false
-  xy: 2099, 145
+  xy: 3365, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sporerocks2
   rotate: false
-  xy: 2133, 179
+  xy: 3399, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-edge
   rotate: false
-  xy: 1471, 149
+  xy: 1373, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 2133, 145
+  xy: 3433, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 2167, 179
+  xy: 3467, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 2167, 145
+  xy: 3501, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water
   rotate: false
-  xy: 2201, 179
+  xy: 3535, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water-edge
   rotate: false
-  xy: 1471, 51
+  xy: 1471, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 2201, 145
+  xy: 3569, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-edge
   rotate: false
-  xy: 1569, 149
+  xy: 1471, 51
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 tendrils1
   rotate: false
-  xy: 2235, 179
+  xy: 3603, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tendrils2
   rotate: false
-  xy: 2235, 145
+  xy: 3637, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tendrils3
   rotate: false
-  xy: 2269, 179
+  xy: 3671, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 2269, 145
+  xy: 3705, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 2303, 179
+  xy: 3739, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 2303, 145
+  xy: 3773, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 2337, 179
+  xy: 3807, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 2337, 145
+  xy: 3841, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 2371, 179
+  xy: 3875, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 2371, 145
+  xy: 3909, 179
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-edge
   rotate: false
-  xy: 1569, 51
+  xy: 1569, 149
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
@@ -18622,35 +18615,35 @@ unit-quasar-xlarge
   orig: 48, 48
   offset: 0, 0
   index: -1
-unit-risse-large
+unit-risso-large
   rotate: false
   xy: 2329, 202
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
-unit-risse-medium
+unit-risso-medium
   rotate: false
   xy: 3569, 200
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-unit-risse-small
+unit-risso-small
   rotate: false
   xy: 1279, 38
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
-unit-risse-tiny
+unit-risso-tiny
   rotate: false
   xy: 1827, 18
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
-unit-risse-xlarge
+unit-risso-xlarge
   rotate: false
   xy: 3909, 412
   size: 48, 48
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index ca0c55b20e..a30341f1e4 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 92d12e2698..cbb6f5ebe6 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png
index 0832279113..a51d8709a2 100644
Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 8c9ba68f18..e68368196b 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1711,7 +1711,7 @@ public class Blocks implements ContentList{
         navalFactory = new UnitFactory("naval-factory"){{
             requirements(Category.units, with(Items.copper, 30, Items.lead, 70));
             plans = new UnitPlan[]{
-                new UnitPlan(UnitTypes.risse, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)),
+                new UnitPlan(UnitTypes.risso, 60f * 30f, with(Items.silicon, 20, Items.metaglass, 25)),
             };
             size = 3;
             requiresWater = true;
@@ -1733,7 +1733,7 @@ public class Blocks implements ContentList{
                 {UnitTypes.crawler, UnitTypes.atrax},
                 {UnitTypes.flare, UnitTypes.horizon},
                 {UnitTypes.mono, UnitTypes.poly},
-                {UnitTypes.risse, UnitTypes.minke},
+                {UnitTypes.risso, UnitTypes.minke},
             };
         }};
 
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index 7812d01714..ac070898f2 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -45,7 +45,7 @@ public class UnitTypes implements ContentList{
     public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Trailc.class}) UnitType alpha, beta, gamma;
 
     //water
-    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risse, minke, bryde;
+    public static @EntityDef({Unitc.class, WaterMovec.class, Commanderc.class}) UnitType risso, minke, bryde;
 
     //special block unit type
     public static @EntityDef({Unitc.class, BlockUnitc.class}) UnitType block;
@@ -674,7 +674,7 @@ public class UnitTypes implements ContentList{
         //endregion
         //region naval attack
 
-        risse = new UnitType("risse"){{
+        risso = new UnitType("risso"){{
             speed = 1.1f;
             drag = 0.13f;
             hitsize = 9f;
diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index efbdd701af..c29960f358 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
@@ -187,8 +187,8 @@ public class StackConveyor extends Block implements Autotiler{
             }else{ //transfer
                 if(state != stateLoad || (items.total() >= getMaximumAccepted(lastItem))){
                     if(front() != null
-                    && front().team() == team()
-                    && front().block() instanceof StackConveyor){
+                    && front().team == team
+                    && front().block instanceof StackConveyor){
                         StackConveyorEntity e = (StackConveyorEntity)front();
 
                         // sleep if its occupied