Consolidate templates from a common base