diff --git a/binaries/data/mods/public/simulation/data/civs/ptol.json b/binaries/data/mods/public/simulation/data/civs/ptol.json
index a76f7b721b..2a0f480a8b 100644
--- a/binaries/data/mods/public/simulation/data/civs/ptol.json
+++ b/binaries/data/mods/public/simulation/data/civs/ptol.json
@@ -127,7 +127,7 @@
 			"Count": 2
 		},
 		{
-			"Template": "units/ptol_infantry_archer_b",
+			"Template": "units/ptol_infantry_javelinist_b",
 			"Count": 2
 		},
 		{
@@ -173,7 +173,7 @@
 	],
 	"SkirmishReplacements":
 	{
-		"skirmish/units/default_infantry_ranged_b": "units/ptol_infantry_archer_b",
+		"skirmish/units/default_infantry_ranged_b": "units/ptol_infantry_javelinist_b",
 		"skirmish/units/default_infantry_melee_b": "units/ptol_infantry_pikeman_b",
 		"skirmish/units/default_cavalry": "units/ptol_cavalry_archer_b",
 		"skirmish/structures/default_house_5": "structures/{civ}_house"
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
index 847b014ea7..f409e12188 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_civil_centre.xml
@@ -17,8 +17,11 @@
   <ProductionQueue>
     <Entities datatype="tokens">
       units/{civ}_infantry_pikeman_b
-      units/{civ}_infantry_archer_b
+      units/{civ}_infantry_javelinist_b
       units/{civ}_cavalry_archer_b
+      units/{civ}_hero_ptolemy_I
+      units/{civ}_hero_ptolemy_IV
+      units/{civ}_hero_cleopatra
     </Entities>
   </ProductionQueue>
   <VisualActor>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
index 443fa2f3fa..9f097f9ba7 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_fortress.xml
@@ -13,9 +13,7 @@
   </Obstruction>
   <ProductionQueue>
     <Entities datatype="tokens">
-      units/{civ}_hero_ptolemy_I
-      units/{civ}_hero_ptolemy_IV
-      units/{civ}_hero_cleopatra
+      units/{civ}_champion_infantry_pikeman
       units/{civ}_champion_cavalry
       units/{civ}_champion_elephant
     </Entities>
diff --git a/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml b/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
index f7ffce3e3a..afa9ff6123 100644
--- a/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/ptol_military_colony.xml
@@ -15,7 +15,8 @@
     <Static width="36.0" depth="36.0"/>
   </Obstruction>
   <ProductionQueue>
-    <Entities datatype="tokens">
+    <Entities replace="" datatype="tokens">
+      units/{civ}_support_female_citizen
       units/{civ}_infantry_spearman_merc_b
       units/{civ}_infantry_swordsman_merc_b
       units/{civ}_cavalry_spearman_merc_b
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
index 8471f38d19..c1edb8ae6d 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_a.xml
@@ -7,6 +7,6 @@
     <Entity>units/ptol_infantry_archer_e</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/ptolemies/infantry_archer_b.xml</Actor>
+    <Actor>units/macedonians/infantry_archer_a.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
index 4abc0001ff..6cbd2ea22c 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_b.xml
@@ -18,15 +18,15 @@
     <Civ>ptol</Civ>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <SelectionGroupName>units/ptol_infantry_archer_b</SelectionGroupName>
-    <GenericName>Nubian Mercenary Archer</GenericName>
-    <SpecificName>Kousít Misthophóros Toxótēs</SpecificName>
-    <Icon>units/ptol_infantry_archer.png</Icon>
-    <RequiredTechnology>phase_village</RequiredTechnology>
+    <GenericName>Cretan Mercenary Archer</GenericName>
+    <SpecificName>Toxótēs Krētikós</SpecificName>
+    <Icon>units/hele_infantry_archer.png</Icon>
+    <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_infantry_archer_a</Entity>
   </Promotion>
   <VisualActor>
-    <Actor>units/ptolemies/infantry_archer_b.xml</Actor>
+    <Actor>units/macedonians/infantry_archer_b.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
index 4b40662432..d078bdc5c3 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_e.xml
@@ -5,6 +5,6 @@
   </Identity>
   <Promotion disable=""/>
   <VisualActor>
-    <Actor>units/ptolemies/infantry_archer_b.xml</Actor>
+    <Actor>units/macedonians/infantry_archer_e.xml</Actor>
   </VisualActor>
 </Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml
new file mode 100644
index 0000000000..68de5ac10f
--- /dev/null
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_archer_nubian.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_unit_infantry_ranged_archer">
+  <Identity>
+    <Civ>ptol</Civ>
+    <SelectionGroupName>units/ptol_infantry_archer_nubian</SelectionGroupName>
+    <GenericName>Nubian Mercenary Archer</GenericName>
+    <SpecificName>Kousít Misthophóros Toxótēs</SpecificName>
+    <Icon>units/ptol_infantry_archer.png</Icon>
+    <RequiredTechnology>phase_village</RequiredTechnology>
+  </Identity>
+  <Promotion disable=""/>
+  <VisualActor>
+    <Actor>units/ptolemies/infantry_archer_b.xml</Actor>
+  </VisualActor>
+</Entity>
diff --git a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
index 89be4bee6a..8539a1bd21 100644
--- a/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/ptol_infantry_javelinist_b.xml
@@ -22,7 +22,7 @@
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <History>The thureophoroi (singular: thureophoros) was a type of infantry soldier, common in the 3rd to 1st century BCE, who carried a large oval shield called a thureos which had a type of metal strip boss and a central spine. They were armed with a long thrusting spear, javelins and a sword. They also usually wore an iron or bronze Macedonian helmet. The thureos was probably originally an adapted form of a Celtic shield. Thracian and Illyrian infantry probably adopted the shield before the Greeks. However it has been suggested that the thureos was brought to Greece after Pyrrhus of Epirus' campaigns in Italy, as his Oscan allies and Roman enemies used the scutum. Thureophoroi were a 3rd century development on the Peltast and wore no body armor, but did wear sturdy leather boots for quick movement. Thureophoroi could skirmish, as well as fight in a phalanx when necessary. They were often stationed on the flanks of the traditional pike phalanx as a flexible link between the heavier pikemen and the cavalry wings.</History>
     <Icon>units/mace_infantry_javelinist.png</Icon>
-    <RequiredTechnology>phase_town</RequiredTechnology>
+    <RequiredTechnology>phase_village</RequiredTechnology>
   </Identity>
   <Promotion>
     <Entity>units/ptol_infantry_javelinist_a</Entity>