diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
index eebe316d34..6e651e6053 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/column_doric.xml
@@ -5,7 +5,6 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <GenericName>Ruins</GenericName>
     <SpecificName>Ancient Ruins</SpecificName>
     <Icon>gaia/special_fence.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
index a88c2417a2..c1a0235f5b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_great.xml
@@ -5,7 +5,6 @@
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Pyramid</GenericName>
     <SpecificName>Great Pyramid</SpecificName>
     <Icon>gaia/special_pyramid.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
index e8574aa019..724def425a 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/pyramid_minor.xml
@@ -5,7 +5,6 @@
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Pyramid</GenericName>
     <SpecificName>Minor Pyramid</SpecificName>
     <Icon>gaia/special_pyramid.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
index a8eac5840f..d46cfbfc22 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/standing_stone.xml
@@ -5,7 +5,6 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Stone Ruins</GenericName>
     <SpecificName>Celtic Standing Stone</SpecificName>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
index 23c87cd765..4bfcf50fe5 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_egyptian.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Stone Ruins</GenericName>
     <SpecificName>Ptolemaic Egyptian Statues</SpecificName>
     <Icon>structures/statue.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
index 41ce754c35..7f9a86356f 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_kushite.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Stone Ruins</GenericName>
     <SpecificName>Kushite Statue</SpecificName>
     <Icon>structures/statue.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
index 4bd67655df..057124688c 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_roman.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Stone Ruins</GenericName>
     <SpecificName>Roman Statues</SpecificName>
     <Icon>structures/statue.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
index 9768eeb9fe..2d6889f843 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/unfinished_greek_temple.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Ruins</GenericName>
     <SpecificName>Unfinished Greek Temple</SpecificName>
     <Tooltip>This temple is unfinished and has fallen to ruin.</Tooltip>
     <Icon>structures/temple.png</Icon>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml
index d6bef7756b..d8b3239a90 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrel.xml
@@ -5,9 +5,8 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
+    <Icon>gaia/special_treasure_food.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>100</Amount>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrels_buried.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrels_buried.xml
index c35059cd3d..46369d4691 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrels_buried.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_barrels_buried.xml
@@ -5,9 +5,8 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Half-buried Barrels</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
+    <Icon>gaia/special_treasure_food.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_bin.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_bin.xml
index 1f4eb2f08b..8026bf96cd 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_bin.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_bin.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure_food.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_crate.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_crate.xml
index 7f28ebcd02..508a7fa0a6 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_crate.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_crate.xml
@@ -5,7 +5,6 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
     <Icon>gaia/special_treasure_food.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_jars.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_jars.xml
index 6f75ffa40e..3e7c6bcf29 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_jars.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_jars.xml
@@ -5,9 +5,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Food Treasure</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
+    <Icon>gaia/special_treasure_food.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="6.5" depth="6.5"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml
index 96512c480b..bde5896033 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_big.xml
@@ -5,9 +5,8 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Food Treasure</GenericName>
     <SpecificName>Persian Food Stores</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
+    <Icon>gaia/special_treasure_food.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="8.0" depth="8.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml
index 07eaae8b0b..7fe29a4faa 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/food_persian_small.xml
@@ -5,9 +5,8 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Food Treasure</GenericName>
     <SpecificName>Persian Food Treasure</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
+    <Icon>gaia/special_treasure_food.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="5.0" depth="5.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
index 76c36fc56d..eb61501f98 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/golden_fleece.xml
@@ -5,9 +5,7 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Golden Fleece</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>1000</Amount>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal.xml
index 68059e677d..56e05d06ca 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal.xml
@@ -5,9 +5,7 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <GenericName>Metal Treasure</GenericName>
     <SpecificName>Secret Box</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>300</Amount>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml
index f9bad8673e..7eac9dc280 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_big.xml
@@ -5,9 +5,7 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Metal Treasure</GenericName>
     <SpecificName>Persian Wares</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml
index 34747a98ee..b0d76dec39 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/metal_persian_small.xml
@@ -5,9 +5,7 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Metal Treasure</GenericName>
     <SpecificName>Persian Rugs</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="5.0" depth="3.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
index db560020af..8bff107378 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/pegasus.xml
@@ -5,9 +5,7 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Pegasus</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <ResourceSupply>
     <Amount>1000</Amount>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
index d9dd09df6e..f019d91c6e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck.xml
@@ -5,10 +5,8 @@
     <Height>9.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck</SpecificName>
     <Tooltip>A decaying military shipwreck. A good opportunity for any businessman.</Tooltip>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="20.0" depth="10.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_debris.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_debris.xml
index 252dd46535..af84437a70 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_debris.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_debris.xml
@@ -5,9 +5,7 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck Cargo</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="7.0" depth="7.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
index 500afb184a..675eca2d53 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_ram_bow.xml
@@ -5,10 +5,8 @@
     <Height>9.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck</SpecificName>
     <Tooltip>A shipwreck with much loss of life. A good opportunity for any businessman.</Tooltip>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="21.0" depth="11.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
index 793b90c825..842139e219 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat.xml
@@ -5,10 +5,8 @@
     <Height>9.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck</SpecificName>
     <Tooltip>The wreck of a small cargo ship. A good opportunity for any businessman.</Tooltip>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="8.0" depth="14.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
index 5d9a90a0b5..52363771f8 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/shipwreck_sail_boat_cut.xml
@@ -5,10 +5,8 @@
     <Height>9.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Shipwreck</SpecificName>
     <Tooltip>A cargo ship rammed in half. A good opportunity for any businessman.</Tooltip>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="9.0" depth="17.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/standing_stone.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/standing_stone.xml
index 073bbc6a6e..070d5a844d 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/standing_stone.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/standing_stone.xml
@@ -5,9 +5,7 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Stone Treasure</GenericName>
     <SpecificName>Celtic Standing Stone</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="2.0" depth="2.0"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/stone.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/stone.xml
index 1493aea6eb..eafd78d5b8 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/stone.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/stone.xml
@@ -5,9 +5,7 @@
     <Height>2.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Stone Treasure</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="6.5" depth="6.5"/>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/treasure/wood.xml b/binaries/data/mods/public/simulation/templates/gaia/treasure/wood.xml
index 5e44e549fa..508be1006e 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/treasure/wood.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/treasure/wood.xml
@@ -5,9 +5,7 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Treasure</GenericName>
     <SpecificName>Wood Treasure</SpecificName>
-    <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Obstruction>
     <Static width="3.5" depth="6.5"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
index e6043f8d0f..0c80f6a5e2 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_royal_stoa.xml
@@ -2,5 +2,9 @@
 <Entity parent="template_structure_civic_hellenic_royal_stoa">
   <Identity>
     <Civ>athen</Civ>
+    <SpecificName>Stoá</SpecificName>
   </Identity>
+  <VisualActor>
+    <Actor>special/greek_stoa_great.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml b/binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml
index 41349ec471..65fce680f6 100644
--- a/binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/athen_theatron.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_special_theatron">
   <Identity>
     <Civ>athen</Civ>
+    <SpecificName>Théātron</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>structures/athenians/theatron.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
index 5d075037da..c9e92e769d 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_rotarymill.xml
@@ -4,4 +4,7 @@
     <Civ>gaul</Civ>
     <SpecificName>Brauon</SpecificName>
   </Identity>
+  <VisualActor>
+    <Actor>structures/celts/special.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/gaul_theatron.xml b/binaries/data/mods/public/simulation/templates/structures/gaul_theatron.xml
index 62932e0016..717ba0f466 100644
--- a/binaries/data/mods/public/simulation/templates/structures/gaul_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/gaul_theatron.xml
@@ -3,7 +3,7 @@
   <Auras disable=""/>
   <Identity>
     <Civ>gaul</Civ>
-    <GenericName>Assembly of princes</GenericName>
+    <GenericName>Assembly of Princes</GenericName>
     <SpecificName>Remogantion</SpecificName>
   </Identity>
   <Footprint replace="">
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_library.xml b/binaries/data/mods/public/simulation/templates/structures/mace_library.xml
index 684a2a995c..88057f9813 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_library.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_library.xml
@@ -4,4 +4,7 @@
     <Civ>mace</Civ>
     <SpecificName>Bibliothḗkē</SpecificName>
   </Identity>
+  <VisualActor>
+    <Actor>structures/macedonians/library.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
index 608582994c..2df0c01656 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_royal_stoa.xml
@@ -2,5 +2,9 @@
 <Entity parent="template_structure_civic_hellenic_royal_stoa">
   <Identity>
     <Civ>mace</Civ>
+    <SpecificName>Stoá</SpecificName>
   </Identity>
+  <VisualActor>
+    <Actor>special/greek_stoa_great.xml</Actor>
+  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml b/binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml
index a22dc0b59a..845a317aed 100644
--- a/binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/mace_theatron.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_special_theatron">
   <Identity>
     <Civ>mace</Civ>
+    <SpecificName>Théātron</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>structures/macedonians/theatron.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
index bc2ef58032..8398ddcd15 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
@@ -6,8 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>ptol</Civ>
-    <GenericName>Military Colony</GenericName>
-    <SpecificName>Klēroukhia</SpecificName>
+    <SpecificName>Klēroukhía</SpecificName>
     <Tooltip>This is the Ptolemaic expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
   </Identity>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml b/binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
index 1e5fda8bed..6a7575b01e 100644
--- a/binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/sele_military_colony.xml
@@ -6,6 +6,7 @@
   </Footprint>
   <Identity>
     <Civ>sele</Civ>
+    <SpecificName>Klēroukhía</SpecificName>
     <Tooltip>This is the Seleucid expansion building, similar to Civic Centers for other factions. It is weaker and carries a smaller territory influence, but is cheaper and built faster. Train settler-soldiers of various nationalities.</Tooltip>
   </Identity>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
index d34fc4dd19..46de42103a 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_royal_stoa.xml
@@ -9,6 +9,7 @@
   </Health>
   <Identity>
     <Civ>spart</Civ>
+    <SpecificName>Stoá</SpecificName>
   </Identity>
   <Obstruction>
     <Static width="26.0" depth="23.5"/>
diff --git a/binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml b/binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml
index a0f817d0e9..166b02bbd6 100644
--- a/binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/spart_theatron.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_special_theatron">
   <Identity>
     <Civ>spart</Civ>
+    <SpecificName>Théātron</SpecificName>
   </Identity>
   <VisualActor>
     <Actor>structures/spartans/theatron.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml b/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
index 504457bcd0..a155971a7d 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_geo_mineral.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo">
   <Identity>
-    <GenericName>Mineral</GenericName>
-    <SpecificName>Metal Mine</SpecificName>
+    <GenericName>Metal Mine</GenericName>
     <Tooltip>A mineral deposit, providing access to rare forms of precious Metal.</Tooltip>
     <Icon>gaia/geology_metal.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml b/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
index 5f7a5dc28c..19bde58469 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_geo_rock.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_gaia_geo">
   <Identity>
-    <GenericName>Rock</GenericName>
-    <SpecificName>Stone Mine</SpecificName>
+    <GenericName>Stone Quarry</GenericName>
     <Tooltip>Mine these to provide Stone building material.</Tooltip>
     <Icon>gaia/geology_stone_1.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
index a13d202f99..e6f8e41f0f 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
@@ -5,8 +5,7 @@
     <Height>2.5</Height>
   </Footprint>
   <Identity>
-    <GenericName>Generic Ruins</GenericName>
-    <SpecificName>Ruins</SpecificName>
+    <GenericName>Ruins</GenericName>
     <Tooltip>These ruins that can be mined for resources.</Tooltip>
     <Icon>gaia/geology_stone_1.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml b/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
index 8ce664f170..a1cc4a8e04 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
@@ -5,8 +5,7 @@
     <Height>12.0</Height>
   </Footprint>
   <Identity>
-    <GenericName>Generic Treasure</GenericName>
-    <SpecificName>Treasure</SpecificName>
+    <GenericName>Treasure</GenericName>
     <Tooltip>A treasure that can be quickly gathered.</Tooltip>
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_rubble.xml b/binaries/data/mods/public/simulation/templates/template_rubble.xml
index f9387cdc71..3635187b5a 100644
--- a/binaries/data/mods/public/simulation/templates/template_rubble.xml
+++ b/binaries/data/mods/public/simulation/templates/template_rubble.xml
@@ -25,7 +25,6 @@
     <Range>0</Range>
   </Vision>
   <VisualActor>
-    <Actor>structures/destruct_stone_3x3.xml</Actor>
     <SilhouetteDisplay>false</SilhouetteDisplay>
     <SilhouetteOccluder>false</SilhouetteOccluder>
     <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
index 4b9660502e..c3ab32a548 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre_military_colony.xml
@@ -29,7 +29,6 @@
   </Health>
   <Identity>
     <GenericName>Military Colony</GenericName>
-    <SpecificName>Klēroukhía</SpecificName>
     <Classes datatype="tokens">Colony</Classes>
     <Icon>structures/military_settlement.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
index 2b97cedf29..d21c5df9ea 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml
@@ -30,8 +30,7 @@
     <SpawnEntityOnDeath>decay|rubble/rubble_stone_6x4</SpawnEntityOnDeath>
   </Health>
   <Identity>
-    <GenericName>Stoa</GenericName>
-    <SpecificName>Hellenic Royal Stoa</SpecificName>
+    <GenericName>Hellenic Royal Stoa</GenericName>
     <Tooltip>Recruit special units.</Tooltip>
     <Icon>gaia/special_stoa.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
@@ -61,7 +60,6 @@
     <Range>40</Range>
   </Vision>
   <VisualActor>
-    <Actor>special/greek_stoa_great.xml</Actor>
     <FoundationActor>structures/fndn_8x4.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
index 4aa9002a32..37cbf3a777 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_outpost.xml
@@ -66,7 +66,4 @@
   <TerritoryDecay>
     <DecayRate>2</DecayRate>
   </TerritoryDecay>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_outpost.xml</Actor>
-  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
index 3643669739..80a14319c4 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_sentry.xml
@@ -64,7 +64,4 @@
       <Time>100</Time>
     </Tower>
   </Upgrade>
-  <VisualActor>
-    <Actor>props/special/palisade_rocks_fort.xml</Actor>
-  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml b/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
index 273c8716aa..baf2ca9259 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_resource_field.xml
@@ -65,7 +65,6 @@
     <Range>0</Range>
   </Vision>
   <VisualActor>
-    <Actor>structures/plot_field_3D_8x8.xml</Actor>
     <FoundationActor>structures/plot_field_found.xml</FoundationActor>
     <SelectionShape>
       <Footprint/>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
index 616c321d53..2324e0ee79 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_library.xml
@@ -42,7 +42,6 @@
     <Radius>50</Radius>
   </TerritoryInfluence>
   <VisualActor>
-    <Actor>structures/macedonians/library.xml</Actor>
     <FoundationActor>structures/fndn_7x9.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
index 7735bef7ff..08f7add1e2 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml
@@ -45,7 +45,6 @@
     <Radius>32</Radius>
   </TerritoryInfluence>
   <VisualActor>
-    <Actor>structures/celts/special.xml</Actor>
     <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
index 056e5593bf..c3fe4e87d2 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_special_theatron.xml
@@ -23,7 +23,6 @@
   </Health>
   <Identity>
     <GenericName>Greek Theater</GenericName>
-    <SpecificName>Théātron</SpecificName>
     <Classes datatype="tokens">Theater</Classes>
     <Icon>structures/theatron.png</Icon>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
index d68c50658c..3407d61d10 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant.xml
@@ -62,7 +62,4 @@
   <Vision>
     <Range>100</Range>
   </Vision>
-  <VisualActor>
-    <Actor>units/mauryas/champion_elephant.xml</Actor>
-  </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
index deb2406ee4..ff24bdc79e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -53,7 +53,4 @@
     <PassabilityClass>large</PassabilityClass>
     <WalkSpeed op="mul">0.5</WalkSpeed>
   </UnitMotion>
-  <VisualActor>
-    <Actor>fauna/elephant_african_forest.xml</Actor>
-  </VisualActor>
 </Entity>