Instead of adding <Civ>gaia</Civ> in numerous templates (not always consistently), it makes far more sense to define it only in the first parent. With this patch the Civ:gaia is present only in the following templates:
- template_gaia.xml
- template_structure.xml
- template_unit.xml
- special/spy.xml
And it's removed from all their descendents.