Index: binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
@@ -4,6 +4,7 @@
     <SelectionGroupName>units/athen/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Thracian Peltast</GenericName>
     <SpecificName>Peltastḗs Thrâx</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/athen_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
@@ -4,6 +4,7 @@
     <SelectionGroupName>units/athen/infantry_marine_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>iphicratean_reforms</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
@@ -12,6 +12,7 @@
     <Civ>cart</Civ>
     <GenericName>Iberian Mercenary Skirmisher</GenericName>
     <SpecificName>Sǝḫīr Kidōn</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <SelectionGroupName>units/cart/infantry_javelineer_iber_b</SelectionGroupName>
     <Icon>units/cart_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
@@ -12,6 +12,7 @@
     <Civ>cart</Civ>
     <GenericName>Balearic Slinger</GenericName>
     <SpecificName>Qallāʿ Ibušimi</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <SelectionGroupName>units/cart/infantry_slinger_iber_b</SelectionGroupName>
     <Icon>units/cart_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
@@ -12,6 +12,7 @@
     <Civ>cart</Civ>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <SpecificName>Seḫīr Ḥerev</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <SelectionGroupName>units/cart/infantry_swordsman_gaul_b</SelectionGroupName>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
+++ binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
@@ -12,6 +12,7 @@
     <Civ>cart</Civ>
     <GenericName>Samnite Swordsman</GenericName>
     <SpecificName>Seḫīr Romaḥ</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <SelectionGroupName>units/cart/infantry_swordsman_ital_b</SelectionGroupName>
     <Icon>units/cart_infantry_swordsman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
@@ -15,6 +15,7 @@
     <SelectionGroupName>units/kush/infantry_javelineer_merc_b</SelectionGroupName>
     <GenericName>Noba Skirmisher</GenericName>
     <SpecificName>nhw ʿhȝw Noba</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/kush_infantry_javelinist.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
@@ -15,6 +15,7 @@
     <SelectionGroupName>units/kush/infantry_maceman_b</SelectionGroupName>
     <GenericName>Noba Maceman</GenericName>
     <SpecificName>nhw Noba</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/kush_infantry_maceman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
@@ -6,6 +6,7 @@
     <SelectionGroupName>units/mace/infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
+++ binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
@@ -6,6 +6,7 @@
     <SelectionGroupName>units/mace/infantry_slinger_b</SelectionGroupName>
     <GenericName>Rhodian Slinger</GenericName>
     <SpecificName>Sphendonḗtēs Rhódios</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/mace_infantry_slinger.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
@@ -11,6 +11,7 @@
     <SelectionGroupName>units/ptol/infantry_archer_b</SelectionGroupName>
     <GenericName>Cretan Mercenary Archer</GenericName>
     <SpecificName>Toxótēs Krētikós</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/mace_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
@@ -11,6 +11,7 @@
     <SelectionGroupName>units/ptol/infantry_javelineer_b</SelectionGroupName>
     <GenericName>Mercenary Thureos Skirmisher</GenericName>
     <SpecificName>Thureophóros Akrobolistḗs</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/ptol_infantry_javelinist_merc.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
@@ -11,6 +11,7 @@
     <SelectionGroupName>units/ptol/infantry_spearman_merc_b</SelectionGroupName>
     <GenericName>Mercenary Thureos Spearman</GenericName>
     <SpecificName>Thureophóros Misthophóros</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/ptol_infantry_spearman_2.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
@@ -10,6 +10,7 @@
     <Civ>ptol</Civ>
     <GenericName>Gallic Mercenary Swordsman</GenericName>
     <SpecificName>Gallikós Mistophorós</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <SelectionGroupName>units/ptol/infantry_swordsman_merc_b</SelectionGroupName>
     <Icon>units/cart_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
Index: binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
@@ -6,6 +6,7 @@
     <SelectionGroupName>units/sele/infantry_archer_merc_b</SelectionGroupName>
     <GenericName>Syrian Archer</GenericName>
     <SpecificName>Toxótēs Syrías</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/sele_infantry_archer.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>
Index: binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
===================================================================
--- binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
+++ binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
@@ -11,6 +11,7 @@
     <SelectionGroupName>units/sele/infantry_swordsman_merc_b</SelectionGroupName>
     <GenericName>Thracian Mercenary Swordsman</GenericName>
     <SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
+    <VisibleClasses datatype="tokens">-Worker</VisibleClasses>
     <Icon>units/sele_infantry_swordsman.png</Icon>
     <RequiredTechnology>phase_town</RequiredTechnology>
   </Identity>