diff --git a/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json b/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
deleted file mode 100644
index 55ad243bc2..0000000000
--- a/binaries/data/mods/public/simulation/data/technologies/unit_elephant_african.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"autoResearch": true,
-	"icon": "armor_elephant.png",
-	"tooltip": "African Elephants −10% resource costs, training time, health, attack damage, and loot.",
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 0.9 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 0.9 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 0.9 },
-		{ "value": "Cost/BuildTime", "multiply": 0.9 },
-		{ "value": "Cost/Resources/food", "multiply": 0.9 },
-		{ "value": "Cost/Resources/wood", "multiply": 0.9 },
-		{ "value": "Cost/Resources/stone", "multiply": 0.9 },
-		{ "value": "Cost/Resources/metal", "multiply": 0.9 },
-		{ "value": "Health/Max", "multiply": 0.9 },
-		{ "value": "Loot/food", "multiply": 0.9 },
-		{ "value": "Loot/wood", "multiply": 0.9 },
-		{ "value": "Loot/stone", "multiply": 0.9 },
-		{ "value": "Loot/metal", "multiply": 0.9 },
-		{ "value": "Loot/xp", "multiply": 0.9 }
-	],
-	"affects": ["AfricanElephant"]
-}
diff --git a/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json b/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
deleted file mode 100644
index 188cba7d96..0000000000
--- a/binaries/data/mods/public/simulation/data/technologies/unit_elephant_indian.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"autoResearch": true,
-	"icon": "armor_elephant.png",
-	"tooltip": "Indian Elephants +10% resource costs, training time, health, attack damage, and loot.",
-	"modifications": [
-		{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.1 },
-		{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.1 },
-		{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.1 },
-		{ "value": "Cost/BuildTime", "multiply": 1.1 },
-		{ "value": "Cost/Resources/food", "multiply": 1.1 },
-		{ "value": "Cost/Resources/wood", "multiply": 1.1 },
-		{ "value": "Cost/Resources/stone", "multiply": 1.1 },
-		{ "value": "Cost/Resources/metal", "multiply": 1.1 },
-		{ "value": "Health/Max", "multiply": 1.1 },
-		{ "value": "Loot/food", "multiply": 1.1 },
-		{ "value": "Loot/wood", "multiply": 1.1 },
-		{ "value": "Loot/stone", "multiply": 1.1 },
-		{ "value": "Loot/metal", "multiply": 1.1 },
-		{ "value": "Loot/xp", "multiply": 1.1 }
-	],
-	"affects": ["IndianElephant"]
-}
diff --git a/binaries/data/mods/public/simulation/templates/mixins/elephant_african.xml b/binaries/data/mods/public/simulation/templates/mixins/elephant_african.xml
new file mode 100644
index 0000000000..2c19ef3cb8
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/mixins/elephant_african.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack op="mul">0.9</Hack>
+        <Pierce op="mul">0.9</Pierce>
+        <Crush op="mul">0.9</Crush>
+      </Damage>
+    </Melee>
+  </Attack>
+  <Cost>
+    <BuildTime op="mul">0.9</BuildTime>
+    <Resources>
+      <food op="mul">0.9</food>
+      <wood op="mul">0.9</wood>
+      <stone op="mul">0.9</stone>
+      <metal op="mul">0.9</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">0.9</Max>
+  </Health>
+  <Loot>
+    <food op="mul">0.9</food>
+    <wood op="mul">0.9</wood>
+    <stone op="mul">0.9</stone>
+    <metal op="mul">0.9</metal>
+    <xp op="mul">0.9</xp>
+  </Loot>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/mixins/elephant_indian.xml b/binaries/data/mods/public/simulation/templates/mixins/elephant_indian.xml
new file mode 100644
index 0000000000..6b63135f5f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/mixins/elephant_indian.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<Entity>
+  <Attack>
+    <Melee>
+      <Damage>
+        <Hack op="mul">1.1</Hack>
+        <Pierce op="mul">1.1</Pierce>
+        <Crush op="mul">1.1</Crush>
+      </Damage>
+    </Melee>
+  </Attack>
+  <Cost>
+    <BuildTime op="mul">1.1</BuildTime>
+    <Resources>
+      <food op="mul">1.1</food>
+      <wood op="mul">1.1</wood>
+      <stone op="mul">1.1</stone>
+      <metal op="mul">1.1</metal>
+    </Resources>
+  </Cost>
+  <Health>
+    <Max op="mul">1.1</Max>
+  </Health>
+  <Loot>
+    <food op="mul">1.1</food>
+    <wood op="mul">1.1</wood>
+    <stone op="mul">1.1</stone>
+    <metal op="mul">1.1</metal>
+    <xp op="mul">1.1</xp>
+  </Loot>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml
index 3d2ff3a961..d9d979a4e4 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart/champion_elephant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_african|template_unit_champion_elephant_melee">
   <Identity>
     <Civ>cart</Civ>
     <GenericName>North African War Elephant</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml
index 48f2cf30ae..e56e9b7c70 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush/champion_elephant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_african|template_unit_champion_elephant_melee">
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml
index 24c1e50c95..bf41ffafef 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur/champion_elephant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_indian|template_unit_champion_elephant_melee">
   <Identity>
     <Civ>maur</Civ>
     <GenericName>Indian War Elephant</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
index f5a93f2d08..f6ed7fd61a 100644
--- a/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/pers/champion_elephant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_indian|template_unit_champion_elephant_melee">
   <Identity>
     <Civ>pers</Civ>
     <Lang>persian</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml
index 66c3847ed7..ee331911a7 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol/champion_elephant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_african|template_unit_champion_elephant_melee">
   <Identity>
     <Civ>ptol</Civ>
     <GenericName>Towered War Elephant</GenericName>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml b/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml
index 4a8f41177a..b7373c29a2 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele/champion_elephant.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_unit_champion_elephant_melee">
+<Entity parent="elephant_indian|template_unit_champion_elephant_melee">
   <Identity>
     <Civ>sele</Civ>
     <Lang>greek</Lang>