diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
index 275279ceb6..8b24044ea0 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_donkey.xml
@@ -15,9 +15,7 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
       <death>actor/fauna/animal/horse_death.xml</death>
       <trained>actor/fauna/animal/horse_trained.xml</trained>
     </SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
index 09fa0b7f4f..f0337f0795 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
@@ -15,9 +15,7 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/horse_select.xml</select>
-      <order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/horse_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
       <death>actor/fauna/animal/horse_death.xml</death>
       <trained>actor/fauna/animal/horse_trained.xml</trained>
     </SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 02eab36d60..8807f9f119 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -110,7 +110,6 @@
       <attacked_gaia>interface/alarm/alarm_attacked_gaia.xml</attacked_gaia>
       <attacked_capture>interface/alarm/alarm_attackplayer.xml</attacked_capture>
       <attacked_capture_gaia>interface/alarm/alarm_attacked_gaia.xml</attacked_capture_gaia>
-      <attack_slaughter>attack/weapon/sword_attack.xml</attack_slaughter>
     </SoundGroups>
   </Sound>
   <StatusBars>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index 2efcc49329..430fdab0e6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -80,16 +80,14 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
+      <attack_slaughter>attack/weapon/sword_attack.xml</attack_slaughter>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
+      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
+      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
+      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
index 7e92bb3113..d9fc5efc8c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -36,6 +36,11 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
index de0703cceb..52a48f9a55 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -36,6 +36,11 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
index 1ac8ae8148..c1cb34ebec 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -30,4 +30,10 @@
     <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Cavalry Archer</GenericName>
   </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
index 1436b3d978..5af4a1a2de 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
@@ -25,8 +25,11 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
+      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
+      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
+      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
+      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
     </SoundGroups>
   </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
index 7d42e41877..ef68cce78f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry.xml
@@ -43,14 +43,8 @@
   </Resistance>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
-      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <death>actor/fauna/death/death_horse.xml</death>
       <trained>interface/alarm/alarm_create_cav.xml</trained>
     </SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
index 5f15c2cda7..48feae8657 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -32,7 +32,8 @@
   </Identity>
   <Sound>
     <SoundGroups>
-      <death>actor/fauna/death/death_horse.xml</death>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
index 67888e97ca..cf7bfac608 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
@@ -28,6 +28,11 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
index 9864238820..7acbe5561c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
@@ -32,7 +32,6 @@
   </Identity>
   <Sound>
     <SoundGroups>
-      <death>actor/fauna/death/death_horse.xml</death>
       <attack_ranged>attack/weapon/javelin_attack.xml</attack_ranged>
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
index 63b4517df5..2252ff3fec 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -29,6 +29,11 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.1</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
index d5b9a0c453..0a557fcff9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry.xml
@@ -44,15 +44,8 @@
   <Sound>
     <SoundGroups>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
       <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
index 07b628b64b..ac2fdfff1c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -33,6 +33,12 @@
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
index 2d15e8d552..77c6fb81e0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -29,4 +29,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
index 6278d62366..4aff486bb3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -28,4 +28,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
index 450595e127..b5c84892ce 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -32,4 +32,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
index 8ef5294158..0c8108518e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -58,11 +58,9 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <select>voice/global/civ_dog_bark.xml</select>
-      <order_walk>voice/global/civ_dog_move.xml</order_walk>
       <order_attack>voice/global/civ_dog_move.xml</order_attack>
-      <order_gather>voice/global/civ_dog_move.xml</order_gather>
-      <order_repair>voice/global/civ_dog_move.xml</order_repair>
+      <order_walk>voice/global/civ_dog_move.xml</order_walk>
+      <select>voice/global/civ_dog_bark.xml</select>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
index b47f13d247..45772808cc 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
@@ -3,9 +3,7 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/cattle_select.xml</select>
-      <order_attack>actor/fauna/animal/cattle_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/cattle_attack.xml</attack_melee>
       <death>actor/fauna/animal/cattle_death.xml</death>
       <trained>actor/fauna/animal/cattle_trained.xml</trained>
     </SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
index 8e70bc85e9..e4ca059188 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -20,10 +20,9 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/cattle_select.xml</select>
-      <order_attack>actor/fauna/animal/cattle_attack_order.xml</order_attack>
-      <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/cattle_attack.xml</attack_melee>
       <death>actor/fauna/animal/cattle_death.xml</death>
+      <order_walk>actor/fauna/animal/cattle_order.xml</order_walk>
       <trained>actor/fauna/animal/cattle_trained.xml</trained>
     </SoundGroups>
   </Sound>
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 963a361053..47fc6a4cbe 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
@@ -42,7 +42,6 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
-      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
       <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
index 8eb4a6e68b..9cf95d8ca4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_skittish_elephant_infant.xml
@@ -18,9 +18,7 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
-      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
index 0dfca1e6f3..7ae9dc603d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
@@ -16,8 +16,6 @@
       <select>voice/global/civ_dog_bark.xml</select>
       <order_walk>voice/global/civ_dog_move.xml</order_walk>
       <order_attack>voice/global/civ_dog_move.xml</order_attack>
-      <order_gather>voice/global/civ_dog_move.xml</order_gather>
-      <order_repair>voice/global/civ_dog_move.xml</order_repair>
       <walk>actor/mounted/movement/walk.xml</walk>
       <run>actor/mounted/movement/walk.xml</run>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
index d9baff57fa..9a558abf26 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -57,17 +57,12 @@
   </Selectable>
   <Sound>
     <SoundGroups>
+      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
+      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
+      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
+      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
       <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
-      <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/walk.xml</run>
       <death>actor/human/death/{phenotype}_death.xml</death>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
index aec6bfa305..a78c43afa4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -30,4 +30,10 @@
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
index 749b12b6f7..571d66cd83 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
@@ -25,4 +25,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
index 2cb4668ce1..86b62db2b3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -32,4 +32,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
index 3716cf70b5..9fbecbf805 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_healer.xml
@@ -49,4 +49,9 @@
       </Texture>
     </Overlay>
   </Selectable>
+  <Sound>
+    <SoundGroups>
+      <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
index b3022c5efe..b19feb731f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -30,4 +30,10 @@
       special/formations/skirmish
     </Formations>
   </Identity>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
index f67bb3d63b..cd440715f0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
@@ -26,4 +26,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
index 744c4a1b02..e7e6a46e9d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -36,4 +36,10 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/pike_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
+
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
index bb6b6fca33..a8cc9d7f9e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -32,4 +32,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 35b3c8133f..64454e6d6f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -100,18 +100,16 @@
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
+      <attack_slaughter>attack/weapon/sword_attack.xml</attack_slaughter>
       <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
       <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
+      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
+      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
+      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
+      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <walk>actor/human/movement/walk.xml</walk>
       <run>actor/human/movement/run.xml</run>
-      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
-      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
-      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
       <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
index 59ffb8ea2b..92ae2376c3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
@@ -32,4 +32,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index 8b6b2141c8..572c7dc937 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -33,4 +33,9 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_melee>attack/weapon/sword_attack.xml</attack_melee>
+    </SoundGroups>
+  </Sound>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
index 144a2ad594..9167ccb614 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -42,6 +42,12 @@
       </Damage>
     </Entity>
   </Resistance>
+  <Sound>
+    <SoundGroups>
+      <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
+      <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
+    </SoundGroups>
+  </Sound>
   <UnitMotion>
     <WalkSpeed op="mul">1.2</WalkSpeed>
   </UnitMotion>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support.xml b/binaries/data/mods/public/simulation/templates/template_unit_support.xml
index 413f80fade..6f472e8fbe 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support.xml
@@ -29,7 +29,13 @@
   </Resistance>
   <Sound>
     <SoundGroups>
-      <trained>interface/alarm/alarm_create_worker.xml</trained>
+      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
+      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
+      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
+      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
+      <walk>actor/human/movement/walk.xml</walk>
+      <run>actor/human/movement/run.xml</run>
+      <death>actor/human/death/{phenotype}_death.xml</death>
     </SoundGroups>
   </Sound>
   <UnitAI>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index 781af2a2ec..e11f839c79 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -81,16 +81,8 @@
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
-      <trained>interface/alarm/alarm_create_female.xml</trained>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
-      <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
-      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
       <attack_melee>attack/weapon/sword.xml</attack_melee>
-      <death>actor/human/death/{phenotype}_death.xml</death>
+      <attack_slaughter>attack/weapon/sword_attack.xml</attack_slaughter>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
@@ -99,6 +91,10 @@
       <gather_ore>resource/mining/mining.xml</gather_ore>
       <gather_ruins>resource/mining/mining.xml</gather_ruins>
       <invalid_building_placement>interface/alarm/alarm_invalid_building_placement.xml</invalid_building_placement>
+      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
+      <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
+      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
+      <trained>interface/alarm/alarm_create_female.xml</trained>
     </SoundGroups>
   </Sound>
   <UnitAI>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
index 0f5a8d807d..4032cef4d5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_healer.xml
@@ -43,17 +43,8 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <trained>interface/alarm/alarm_create_infantry.xml</trained>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <order_heal>voice/{lang}/civ/civ_{phenotype}_heal.xml</order_heal>
-      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
-      <walk>actor/human/movement/walk.xml</walk>
-      <run>actor/human/movement/run.xml</run>
-      <death>actor/human/death/{phenotype}_death.xml</death>
+      <trained>interface/alarm/alarm_create_infantry.xml</trained>
     </SoundGroups>
   </Sound>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
index 772c5fd934..ef03459352 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_slave.xml
@@ -66,21 +66,15 @@
   </ResourceGatherer>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
-      <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
-      <order_garrison>voice/{lang}/civ/civ_{phenotype}_garrison.xml</order_garrison>
-      <walk>actor/human/movement/walk.xml</walk>
-      <run>actor/human/movement/run.xml</run>
-      <death>actor/human/death/{phenotype}_death.xml</death>
       <build>resource/construction/con_wood.xml</build>
       <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
       <gather_grain>resource/farming/farm.xml</gather_grain>
       <gather_wood>resource/lumbering/lumbering.xml</gather_wood>
       <gather_stone>resource/mining/pickaxe.xml</gather_stone>
       <gather_metal>resource/mining/mining.xml</gather_metal>
+      <invalid_building_placement>interface/alarm/alarm_invalid_building_placement.xml</invalid_building_placement>
+      <order_build>voice/{lang}/civ/civ_{phenotype}_build.xml</order_build>
+      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
       <trained>actor/singlesteps/steps_gravel_trained.xml</trained>
     </SoundGroups>
   </Sound>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
index 59965de567..df72e187c4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
@@ -31,22 +31,8 @@
   </Selectable>
   <Sound>
     <SoundGroups>
-      <select>voice/{lang}/civ/civ_{phenotype}_select.xml</select>
       <order_trade>voice/{lang}/civ/civ_{phenotype}_trade.xml</order_trade>
-      <order_walk>voice/{lang}/civ/civ_{phenotype}_walk.xml</order_walk>
-      <order_attack>voice/{lang}/civ/civ_{phenotype}_attack.xml</order_attack>
-      <order_gather>voice/{lang}/civ/civ_{phenotype}_gather.xml</order_gather>
-      <order_repair>voice/{lang}/civ/civ_{phenotype}_repair.xml</order_repair>
-      <walk>actor/human/movement/walk.xml</walk>
-      <run>actor/human/movement/run.xml</run>
-      <attack_melee>attack/weapon/sword.xml</attack_melee>
-      <death>actor/human/death/{phenotype}_death.xml</death>
-      <build>resource/construction/con_wood.xml</build>
-      <gather_fruit>resource/foraging/forage_leaves.xml</gather_fruit>
-      <gather_grain>resource/farming/farm.xml</gather_grain>
-      <gather_tree>resource/lumbering/lumbering.xml</gather_tree>
-      <gather_rock>resource/mining/pickaxe.xml</gather_rock>
-      <gather_ore>resource/mining/mining.xml</gather_ore>
+      <trained>interface/alarm/alarm_create_worker.xml</trained>
     </SoundGroups>
   </Sound>
   <Trader>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
index 8af6fb5e15..7b5861aaa5 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/support_elephant.xml
@@ -59,9 +59,11 @@
   <Sound>
     <SoundGroups>
       <select>actor/fauna/animal/elephant_select.xml</select>
-      <order_attack>actor/fauna/animal/elephant_attack_order.xml</order_attack>
+      <order_garrison>actor/fauna/animal/elephant_order.xml</order_garrison>
+      <order_gather>actor/fauna/animal/elephant_order.xml</order_gather>
       <order_walk>actor/fauna/animal/elephant_order.xml</order_walk>
-      <attack_melee>actor/fauna/animal/elephant_attack.xml</attack_melee>
+      <walk>actor/mounted/movement/walk.xml</walk>
+      <run>actor/mounted/movement/walk.xml</run>
       <death>actor/fauna/animal/elephant_death.xml</death>
       <trained>actor/fauna/animal/elephant_trained.xml</trained>
     </SoundGroups>