Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged.xml
@@ -10,7 +10,4 @@
       special/formations/skirmish
     </Formations>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -35,5 +35,8 @@
       <attack_impact_ranged>attack/impact/arrow_impact.xml</attack_impact_ranged>
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.85</WalkSpeed>
+  </UnitMotion>
   </Sound>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_crossbowman.xml
@@ -13,7 +13,7 @@
       <Delay>0</Delay>
       <Projectile>
         <Speed>120</Speed>
-        <Spread>2</Spread>
+        <Spread>1.5</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
Index: binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
@@ -36,4 +36,7 @@
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">0.85</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.85</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_crossbowman.xml
@@ -13,7 +13,7 @@
       <Delay>0</Delay>
       <Projectile>
         <Speed>120</Speed>
-        <Spread>0.8</Spread>
+        <Spread>0.6</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.85</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_crossbowman.xml
@@ -13,7 +13,7 @@
       <Delay>0</Delay>
       <Projectile>
         <Speed>120</Speed>
-        <Spread>0.8</Spread>
+        <Spread>0.6</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
@@ -45,7 +45,4 @@
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.85</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_crossbowman.xml
@@ -13,7 +13,7 @@
       <Delay>0</Delay>
       <Projectile>
         <Speed>120</Speed>
-        <Spread>0.4</Spread>
+        <Spread>0.3</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="5"/>
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.8</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
@@ -43,6 +43,6 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed op="mul">0.835</WalkSpeed>
+    <WalkSpeed op="mul">0.85</WalkSpeed>
   </UnitMotion>
 </Entity>
Index: binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_crossbowman.xml
@@ -13,7 +13,7 @@
       <Delay>0</Delay>
       <Projectile>
         <Speed>120</Speed>
-        <Spread>0.4</Spread>
+        <Spread>0.3</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
Index: binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
+++ binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_crossbowman.xml
@@ -13,7 +13,7 @@
       <Delay>0</Delay>
       <Projectile>
         <Speed>120</Speed>
-        <Spread>2</Spread>
+        <Spread>1.5</Spread>
         <Gravity>30</Gravity>
         <FriendlyFire>false</FriendlyFire>
         <LaunchPoint y="3"/>
@@ -49,7 +49,4 @@
       <attack_ranged>attack/weapon/bow_attack.xml</attack_ranged>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
 </Entity>