diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
index 8b1737649f..de10d135ea 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
@@ -31,11 +31,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>3.0</WalkSpeed>
+    <WalkSpeed op="mul">0.45</WalkSpeed>
     <Run>
-      <Speed>9.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.45</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
index ef23326e6c..428a4b129c 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_chicken.xml
@@ -39,9 +39,9 @@
     <FeedTimeMax>40000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
-    <WalkSpeed>1.0</WalkSpeed>
+    <WalkSpeed op="mul">0.15</WalkSpeed>
     <Run>
-      <Speed>6.0</Speed>
+      <Speed op="mul">0.15</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
index f9855b99fc..f9922a7c94 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile.xml
@@ -38,9 +38,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>2.0</WalkSpeed>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed op="mul">0.3</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
index a15c3addb2..92279bf613 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_deer.xml
@@ -13,11 +13,9 @@
     <Anchor>pitch</Anchor>
   </Position>
   <UnitMotion>
-    <WalkSpeed>2.0</WalkSpeed>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
     <Run>
-      <Speed>10.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.3</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
index bbc7e482d9..9e3a6077f2 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe.xml
@@ -31,11 +31,9 @@
     <HeightOffset>8.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>4.0</WalkSpeed>
+    <WalkSpeed op="mul">0.6</WalkSpeed>
     <Run>
-      <Speed>12.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.6</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
index fdf2512e14..c251ef2554 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_giraffe_infant.xml
@@ -20,11 +20,9 @@
     <HeightOffset>7.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>4.0</WalkSpeed>
+    <WalkSpeed op="mul">0.6</WalkSpeed>
     <Run>
-      <Speed>10.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.6</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
index 008d96aed3..8342b8eab5 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
@@ -32,7 +32,10 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>3.0</WalkSpeed>
+    <WalkSpeed op="mul">0.45</WalkSpeed>
+    <Run>
+      <Speed op="mul">0.45</Speed>
+    </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/goat.xml</Actor>
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 233cd7802e..58c2b2d316 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
@@ -26,11 +26,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>5.0</WalkSpeed>
+    <WalkSpeed op="mul">0.8</WalkSpeed>
     <Run>
-      <Speed>12.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.8</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
index 57f4fee083..5e3702c8e5 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -29,9 +29,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>3.0</WalkSpeed>
+    <WalkSpeed op="mul">0.45</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
+      <Speed op="mul">0.45</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
index dcbf2a0751..f9f645fece 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_lioness.xml
@@ -29,9 +29,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>3.0</WalkSpeed>
+    <WalkSpeed op="mul">0.45</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
+      <Speed op="mul">0.45</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
index a8cd486eb7..2d4233376b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_peacock.xml
@@ -32,11 +32,9 @@
     <FeedTimeMax>40000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
-    <WalkSpeed>2.0</WalkSpeed>
+    <WalkSpeed op="mul">0.3</WalkSpeed>
     <Run>
-      <Speed>5.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.3</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
index e135efe4d4..6b8c24e4e5 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
@@ -30,7 +30,10 @@
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>3.0</WalkSpeed>
+    <WalkSpeed op="mul">0.45</WalkSpeed>
+    <Run>
+      <Speed op="mul">0.45</Speed>
+    </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/pig1.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
index 3dd650727b..c7dc642a23 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_pig_flaming.xml
@@ -29,7 +29,10 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>10.0</WalkSpeed>
+    <WalkSpeed op="mul">3.5</WalkSpeed>
+    <Run>
+      <Speed op="mul">3.5</Speed>
+    </Run>
   </UnitMotion>
   <Upgrade disable=""/>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
index e75916ee07..10fe4cf6cf 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_shark.xml
@@ -45,9 +45,9 @@
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
-    <WalkSpeed>4.0</WalkSpeed>
+    <WalkSpeed op="mul">0.6</WalkSpeed>
     <Run>
-      <Speed>35.0</Speed>
+      <Speed op="mul">0.6</Speed>
     </Run>
   </UnitMotion>
   <Visibility>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
index c0b4ebc0d6..8bb2e8ccfb 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
@@ -30,7 +30,10 @@
     <HeightOffset>5.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>3.0</WalkSpeed>
+    <WalkSpeed op="mul">0.45</WalkSpeed>
+    <Run>
+      <Speed op="mul">0.45</Speed>
+    </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>fauna/sheep1.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
index 737bf84bc8..64e53a5696 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_wildebeest.xml
@@ -17,11 +17,9 @@
     <Type>food.meat</Type>
   </ResourceSupply>
   <UnitMotion>
-    <WalkSpeed>6.0</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.9</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
index e29c4c3af9..b32381673b 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_zebra.xml
@@ -17,11 +17,9 @@
     <Type>food.meat</Type>
   </ResourceSupply>
   <UnitMotion>
-    <WalkSpeed>6.0</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.9</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/other/special_catafalque.xml b/binaries/data/mods/public/simulation/templates/other/special_catafalque.xml
index 7eb5a5d999..a695c679c1 100644
--- a/binaries/data/mods/public/simulation/templates/other/special_catafalque.xml
+++ b/binaries/data/mods/public/simulation/templates/other/special_catafalque.xml
@@ -41,10 +41,10 @@
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
+    <WalkSpeed op="mul">0.55</WalkSpeed>
     <Run>
-      <Speed>8</Speed>
+      <Speed op="mul">0.55</Speed>
     </Run>
-    <WalkSpeed>5</WalkSpeed>
   </UnitMotion>
   <VisualActor>
     <Actor>units/global/catafalque.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index 5c2a91e248..dadb5e6963 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -108,7 +108,7 @@
   </UnitAI>
   <UnitMotion>
     <FormationController>false</FormationController>
-    <WalkSpeed>9</WalkSpeed>
+    <WalkSpeed>9.0</WalkSpeed>
     <Run>
       <Speed>15.0</Speed>
       <Range>50.0</Range>
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 cf093c636a..1dfc7ce5fd 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -94,11 +94,9 @@
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>16.5</WalkSpeed>
+    <WalkSpeed op="mul">1.95</WalkSpeed>
     <Run>
-      <Speed>26.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">1.95</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
index d3021660f9..134b04e56b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -17,11 +17,9 @@
     <GenericName>Cavalry Spearman</GenericName>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>22.0</WalkSpeed>
+    <WalkSpeed op="mul">1.25</WalkSpeed>
     <Run>
-      <Speed>40.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">1.25</Speed>
     </Run>
   </UnitMotion>
 </Entity>
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 ddcc811c63..6d5f1ab1d4 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
@@ -28,11 +28,9 @@
     <metal>5</metal>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>20.0</WalkSpeed>
+    <WalkSpeed op="mul">1.15</WalkSpeed>
     <Run>
-      <Speed>28.75</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">1.15</Speed>
     </Run>
   </UnitMotion>
 </Entity>
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 de3c6852ed..9262ec133d 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
@@ -23,10 +23,4 @@
     <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Cavalry Archer</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed>17.5</WalkSpeed>
-    <Run>
-      <Speed>28.0</Speed>
-    </Run>
-  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
index 77a9cb3781..7ba7ec2f49 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelinist.xml
@@ -23,10 +23,4 @@
     <VisibleClasses datatype="tokens">Javelin</VisibleClasses>
     <GenericName>Cavalry Skirmisher</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed>17.5</WalkSpeed>
-    <Run>
-      <Speed>28.0</Speed>
-    </Run>
-  </UnitMotion>
 </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 af423c8854..744d2b4473 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
@@ -58,11 +58,9 @@
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>16.5</WalkSpeed>
+    <WalkSpeed op="mul">2.25</WalkSpeed>
     <Run>
-      <Speed>26.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>10.0</RangeMin>
+      <Speed op="mul">2.25</Speed>
     </Run>
   </UnitMotion>
   <Vision>
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 6b18be4db3..d04198f668 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
@@ -34,12 +34,4 @@
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed>20.5</WalkSpeed>
-    <Run>
-      <Speed>28.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>10.0</RangeMin>
-    </Run>
-  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
index fb0749d50f..0c78f128e2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelinist.xml
@@ -34,12 +34,4 @@
       <attack>attack/weapon/arrowfly.xml</attack>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed>20.5</WalkSpeed>
-    <Run>
-      <Speed>28.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>10.0</RangeMin>
-    </Run>
-  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
index e8c8c80cdb..529b695302 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -28,9 +28,9 @@
     <GenericName>Champion Cavalry Spearman</GenericName>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>25.0</WalkSpeed>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
     <Run>
-      <Speed>40.0</Speed>
+      <Speed op="mul">1.2</Speed>
     </Run>
   </UnitMotion>
 </Entity>
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 b8d10f8989..bc1c0db2f8 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,9 +29,9 @@
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>23.0</WalkSpeed>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
     <Run>
-      <Speed>40.0</Speed>
+      <Speed op="mul">1.2</Speed>
     </Run>
   </UnitMotion>
 </Entity>
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 a4a6fb02f8..946aca1b7c 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
@@ -57,11 +57,9 @@
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed>8.5</WalkSpeed>
+    <WalkSpeed op="mul">0.95</WalkSpeed>
     <Run>
-      <Speed>14.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>10.0</RangeMin>
+      <Speed op="mul">0.95</Speed>
     </Run>
   </UnitMotion>
   <Vision>
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 315ecbd1dc..aa3d1f4e8a 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,14 +44,6 @@
       <death>actor/human/death/{gender}_death.xml</death>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
-    <Run>
-      <Speed>17.5</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Vision>
     <Range>84</Range>
   </Vision>
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 caf8c3f61f..fe8ce0f6c0 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
@@ -37,9 +37,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>11.0</WalkSpeed>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed op="mul">1.2</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
index 705de43d40..4e85b0274d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelinist.xml
@@ -37,9 +37,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>16.0</WalkSpeed>
+    <WalkSpeed op="mul">1.75</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed op="mul">1.75</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
index 6479bd4241..12d35b4d0d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -41,11 +41,9 @@
     </Formations>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed op="mul">0.8</WalkSpeed>
     <Run>
-      <Speed>13.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">0.8</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
index 45695e6ccc..57c0359bae 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -39,11 +39,9 @@
     </Formations>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>11.5</WalkSpeed>
+    <WalkSpeed op="mul">1.3</WalkSpeed>
     <Run>
-      <Speed>23.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">1.3</Speed>
     </Run>
   </UnitMotion>
 </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 7ac5decc61..239eeaf89f 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
@@ -33,11 +33,9 @@
     </Formations>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>12.5</WalkSpeed>
+    <WalkSpeed op="mul">1.4</WalkSpeed>
     <Run>
-      <Speed>16.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">1.4</Speed>
     </Run>
   </UnitMotion>
 </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 0b3cce2025..8caa7c2015 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -86,11 +86,9 @@
     <Category>WarDog</Category>
   </TrainingRestrictions>
   <UnitMotion>
-    <WalkSpeed>14.5</WalkSpeed>
+    <WalkSpeed op="mul">1.6</WalkSpeed>
     <Run>
-      <Speed>26.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">1.6</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
index 2921047d47..7daa028dc5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -32,9 +32,9 @@
     <FeedTimeMax>60000</FeedTimeMax>
   </UnitAI>
   <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
+      <Speed op="mul">0.7</Speed>
     </Run>
   </UnitMotion>
   <Visibility>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_decorative.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_decorative.xml
index fb36837d00..a7db926024 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_decorative.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_decorative.xml
@@ -36,7 +36,10 @@
   </UnitAI>
   <UnitMotion>
     <FormationController>false</FormationController>
-    <WalkSpeed>8.0</WalkSpeed>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.2</Speed>
+    </Run>
     <PassabilityClass>unrestricted</PassabilityClass>
     <CostClass>default</CostClass>
   </UnitMotion>
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 fcd06fcb11..292105b4f0 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
@@ -52,9 +52,9 @@
   </Sound>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed>3.0</WalkSpeed>
+    <WalkSpeed op="mul">0.5</WalkSpeed>
     <Run>
-      <Speed>10.0</Speed>
+      <Speed op="mul">0.5</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
index 55fad06924..eb7eb4058a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_whale.xml
@@ -53,9 +53,9 @@
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
-    <WalkSpeed>11.5</WalkSpeed>
+    <WalkSpeed op="mul">1.8</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
+      <Speed op="mul">1.8</Speed>
     </Run>
   </UnitMotion>
 </Entity>
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 25b7632176..17ef69b4cf 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -60,12 +60,6 @@
   <TrainingRestrictions>
     <Category>Hero</Category>
   </TrainingRestrictions>
-  <UnitMotion>
-    <WalkSpeed>10.5</WalkSpeed>
-    <Run>
-      <Speed>22.5</Speed>
-    </Run>
-  </UnitMotion>
   <Vision>
     <Range>88</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
index 320415b74b..30d27f8c85 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry.xml
@@ -48,11 +48,9 @@
     <HeightOffset>6.5</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>16.5</WalkSpeed>
+    <WalkSpeed op="mul">1.85</WalkSpeed>
     <Run>
-      <Speed>26.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>16.0</RangeMin>
+      <Speed op="mul">1.85</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
index 9b0de55b1e..526dce4c59 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelinist.xml
@@ -31,11 +31,9 @@
     <VisibleClasses datatype="tokens">Javelin Ranged</VisibleClasses>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>17.0</WalkSpeed>
+    <WalkSpeed op="mul">1.05</WalkSpeed>
     <Run>
-      <Speed>28.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>16.0</RangeMin>
+      <Speed op="mul">1.05</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
index 6bf90a2074..a2b6dff575 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -19,4 +19,10 @@
     <VisibleClasses datatype="tokens">Melee Spear</VisibleClasses>
     <GenericName>Hero Cavalry Spearman</GenericName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.0</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.0</Speed>
+    </Run>
+  </UnitMotion>
 </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 b2748a390b..8df4554457 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
@@ -25,4 +25,10 @@
     <VisibleClasses datatype="tokens">Melee Sword</VisibleClasses>
     <GenericName>Hero Cavalry Swordsman</GenericName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.0</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.0</Speed>
+    </Run>
+  </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
index 7dceca3397..06a472e980 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -50,11 +50,9 @@
   </Sound>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed>8.5</WalkSpeed>
+    <WalkSpeed op="mul">0.95</WalkSpeed>
     <Run>
-      <Speed>14.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>10.0</RangeMin>
+      <Speed op="mul">0.95</Speed>
     </Run>
   </UnitMotion>
   <Vision>
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 c4802e35e0..17581ba52d 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
@@ -26,14 +26,6 @@
   <Identity>
     <VisibleClasses datatype="tokens">-Soldier Healer Support</VisibleClasses>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed>9</WalkSpeed>
-    <Run>
-      <Speed>12.0</Speed>
-      <Range>200.0</Range>
-      <RangeMin>0.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Vision>
     <Range>30</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
index d11036e47f..281624e080 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry.xml
@@ -39,4 +39,10 @@
       <death>actor/human/death/{gender}_death.xml</death>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.0</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.0</Speed>
+    </Run>
+  </UnitMotion>
 </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 365e3a3696..7063f427ee 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
@@ -31,9 +31,9 @@
     </Formations>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
+    <WalkSpeed op="mul">0.95</WalkSpeed>
     <Run>
-      <Speed>17.5</Speed>
+      <Speed op="mul">0.95</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
index 97c34bc880..664abe5dd7 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -31,9 +31,9 @@
     </Formations>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>9</WalkSpeed>
+    <WalkSpeed op="mul">1.0</WalkSpeed>
     <Run>
-      <Speed>18.75</Speed>
+      <Speed op="mul">1.0</Speed>
     </Run>
   </UnitMotion>
 </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 453c528322..3e29381804 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
@@ -26,11 +26,9 @@
     <GenericName>Hero Swordsman</GenericName>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>9.5</WalkSpeed>
+    <WalkSpeed op="mul">1.05</WalkSpeed>
     <Run>
-      <Speed>20.0</Speed>
-      <Range>600.0</Range>
-      <RangeMin>8.0</RangeMin>
+      <Speed op="mul">1.05</Speed>
     </Run>
   </UnitMotion>
   <Vision>
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 85fdeac9c9..f2a8256dd7 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -118,12 +118,6 @@
       <trained>interface/alarm/alarm_create_infantry.xml</trained>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed>9</WalkSpeed>
-    <Run>
-      <Speed>18.75</Speed>
-    </Run>
-  </UnitMotion>
   <Vision>
     <Range>80</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
index d643b17a27..feef873f3e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -35,9 +35,9 @@
     <wood>5</wood>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>7.0</WalkSpeed>
+    <WalkSpeed op="mul">0.8</WalkSpeed>
     <Run>
-      <Speed>9.0</Speed>
+      <Speed op="mul">0.8</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index a21619fa83..818d5081d6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -30,9 +30,9 @@
     <wood>5</wood>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>8.5</WalkSpeed>
+    <WalkSpeed op="mul">0.95</WalkSpeed>
     <Run>
-      <Speed>15.0</Speed>
+      <Speed op="mul">0.95</Speed>
     </Run>
   </UnitMotion>
 </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 e989472891..b5f1a16c17 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
@@ -27,9 +27,9 @@
     <metal>5</metal>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>9.5</WalkSpeed>
+    <WalkSpeed op="mul">1.05</WalkSpeed>
     <Run>
-      <Speed>16.0</Speed>
+      <Speed op="mul">1.05</Speed>
     </Run>
   </UnitMotion>
 </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 32d6887470..f407503f9e 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
@@ -36,9 +36,9 @@
     </SoundGroups>
   </Sound>
   <UnitMotion>
-    <WalkSpeed>8.0</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed op="mul">0.9</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
index 1576ba92ad..08e05fe35b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelinist.xml
@@ -30,9 +30,9 @@
     <wood>5</wood>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>13.5</WalkSpeed>
+    <WalkSpeed op="mul">1.5</WalkSpeed>
     <Run>
-      <Speed>24.0</Speed>
+      <Speed op="mul">1.5</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index 47e368c0aa..d01591f3db 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -31,9 +31,9 @@
     <stone>5</stone>
   </Loot>
   <UnitMotion>
-    <WalkSpeed>11.0</WalkSpeed>
+    <WalkSpeed op="mul">1.2</WalkSpeed>
     <Run>
-      <Speed>24.0</Speed>
+      <Speed op="mul">1.2</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
index 16262cea62..7ec37e8e19 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_bireme.xml
@@ -70,9 +70,9 @@
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>14</WalkSpeed>
+    <WalkSpeed op="mul">1.55</WalkSpeed>
     <Run>
-      <Speed>18.0</Speed>
+      <Speed op="mul">1.55</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
index ba397b95fe..c0cef329ac 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fire.xml
@@ -53,9 +53,9 @@
   </StatusBars>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
-    <WalkSpeed>17.5</WalkSpeed>
+    <WalkSpeed op="mul">1.6</WalkSpeed>
     <Run>
-      <Speed>22.0</Speed>
+      <Speed op="mul">1.6</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
index be282985ef..93d31861f4 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_fishing.xml
@@ -61,7 +61,10 @@
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
-    <WalkSpeed>10</WalkSpeed>
+    <WalkSpeed op="mul">1.1</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.1</Speed>
+    </Run>
   </UnitMotion>
   <Vision>
     <Range>24</Range>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
index 3589e75bc3..09f4d888ee 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_merchant.xml
@@ -60,7 +60,10 @@
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>ship-small</PassabilityClass>
-    <WalkSpeed>12</WalkSpeed>
+    <WalkSpeed op="mul">1.35</WalkSpeed>
+    <Run>
+      <Speed op="mul">1.35</Speed>
+    </Run>
   </UnitMotion>
   <Vision>
     <Range>50</Range>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
index f5629145f5..c1e94b7df1 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_quinquereme.xml
@@ -78,9 +78,9 @@
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>16</WalkSpeed>
+    <WalkSpeed op="mul">1.8</WalkSpeed>
     <Run>
-      <Speed>20</Speed>
+      <Speed op="mul">1.8</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
index 94f7bc7c49..ab6e80186f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_ship_trireme.xml
@@ -70,9 +70,9 @@
     <HeightOffset>6.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>16</WalkSpeed>
+    <WalkSpeed op="mul">1.8</WalkSpeed>
     <Run>
-      <Speed>20.0</Speed>
+      <Speed op="mul">1.8</Speed>
     </Run>
   </UnitMotion>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
index b9d273fdbe..73a76e2808 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ballista.xml
@@ -62,9 +62,9 @@
     </Overlay>
   </Selectable>
   <UnitMotion>
-    <WalkSpeed>8</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
     <Run>
-      <Speed>12.0</Speed>
+      <Speed op="mul">0.9</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
index 01bf3044c9..1acb40f85a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_onager.xml
@@ -70,9 +70,9 @@
     <BarHeight>0.5</BarHeight>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>7</WalkSpeed>
+    <WalkSpeed op="mul">0.8</WalkSpeed>
     <Run>
-      <Speed>10.0</Speed>
+      <Speed op="mul">0.8</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
index 2f7fe8c05b..95b15bfedd 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_ram.xml
@@ -48,9 +48,9 @@
     <BarHeight>0.5</BarHeight>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>8</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
     <Run>
-      <Speed>11.0</Speed>
+      <Speed op="mul">0.9</Speed>
     </Run>
   </UnitMotion>
   <Vision>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml
index d238354159..4f74f3ab8f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_mechanical_siege_tower.xml
@@ -72,9 +72,9 @@
     <HeightOffset>12.0</HeightOffset>
   </StatusBars>
   <UnitMotion>
-    <WalkSpeed>6.5</WalkSpeed>
+    <WalkSpeed op="mul">0.7</WalkSpeed>
     <Run>
-      <Speed>10.0</Speed>
+      <Speed op="mul">0.7</Speed>
     </Run>
   </UnitMotion>
   <Vision>
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 4076b9ffcb..1e34ba1b41 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
@@ -88,14 +88,6 @@
     <AlertReactiveLevel>1</AlertReactiveLevel>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
-  <UnitMotion>
-    <WalkSpeed>9.5</WalkSpeed>
-    <Run>
-      <Speed>16.0</Speed>
-      <Range>200.0</Range>
-      <RangeMin>0.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Vision>
     <Range>32</Range>
   </Vision>
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 a9e5205843..83581a7b0f 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
@@ -41,14 +41,6 @@
       <death>actor/human/death/{gender}_death.xml</death>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed>9</WalkSpeed>
-    <Run>
-      <Speed>12.0</Speed>
-      <Range>200.0</Range>
-      <RangeMin>0.0</RangeMin>
-    </Run>
-  </UnitMotion>
   <Vision>
     <Range>30</Range>
   </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 fbef84f9bd..4ed485179c 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
@@ -83,12 +83,4 @@
       <trained>actor/singlesteps/steps_gravel.xml</trained>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed>8</WalkSpeed>
-    <Run>
-      <Speed>15.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>8.0</RangeMin>
-    </Run>
-  </UnitMotion>
 </Entity>
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 1c4c6c4d1b..05c560233f 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
@@ -44,9 +44,6 @@
     <CanGuard>false</CanGuard>
     <CanPatrol>false</CanPatrol>
   </UnitAI>
-  <UnitMotion>
-    <WalkSpeed>9.5</WalkSpeed>
-  </UnitMotion>
   <Vision>
     <Range>60</Range>
   </Vision>
diff --git a/binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml
index b66da20e11..4dd613a3bb 100644
--- a/binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/brit_ship_trireme.xml
@@ -20,7 +20,10 @@
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>14</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <Run>
+      <Speed op="mul">0.9</Speed>
+    </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/celts/warship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml b/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
index b070e6e4c7..60b20e68b6 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_champion_fanatic.xml
@@ -22,11 +22,9 @@
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <UnitMotion>
-    <WalkSpeed op="add">5</WalkSpeed>
+    <WalkSpeed op="mul">1.4</WalkSpeed>
     <Run>
-      <Speed op="add">2</Speed>
-      <Range>600.0</Range>
-      <RangeMin>5.0</RangeMin>
+      <Speed op="mul">1.4</Speed>
     </Run>
   </UnitMotion>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/gaul_ship_trireme.xml
index 8239919c9c..7c57dfbf79 100644
--- a/binaries/data/mods/public/simulation/templates/units/gaul_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/gaul_ship_trireme.xml
@@ -20,7 +20,10 @@
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>14</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <Run>
+      <Speed op="mul">0.9</Speed>
+    </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/celts/warship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/iber_ship_trireme.xml
index 5eac6b5a60..001690b013 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_ship_trireme.xml
@@ -20,7 +20,10 @@
     <Icon>units/celt_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>14</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <Run>
+      <Speed op="mul">0.9</Speed>
+    </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/iberians/warship.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
index de4ef0e6e0..6107d78847 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_elephant_archer_b.xml
@@ -66,12 +66,6 @@
   </Sound>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed>8.5</WalkSpeed>
-    <Run>
-      <Speed>14.0</Speed>
-      <Range>1000.0</Range>
-      <RangeMin>10.0</RangeMin>
-    </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>units/mauryans/elephant_archer_b.xml</Actor>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
index 4fe351e54a..2f10c5a979 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_ship_trireme.xml
@@ -20,7 +20,10 @@
     <Icon>units/maur_ship_trireme.png</Icon>
   </Identity>
   <UnitMotion>
-    <WalkSpeed>14</WalkSpeed>
+    <WalkSpeed op="mul">0.9</WalkSpeed>
+    <Run>
+      <Speed op="mul">0.9</Speed>
+    </Run>
   </UnitMotion>
   <VisualActor>
     <Actor>structures/mauryans/trireme.xml</Actor>
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 f14d8034ca..d8cc38b909 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
@@ -68,9 +68,9 @@
   </UnitAI>
   <UnitMotion>
     <PassabilityClass>large</PassabilityClass>
-    <WalkSpeed>5.5</WalkSpeed>
+    <WalkSpeed op="mul">0.6</WalkSpeed>
     <Run>
-      <Speed>10.0</Speed>
+      <Speed op="mul">0.6</Speed>
     </Run>
   </UnitMotion>
   <Vision>