Expand templates

From Patholome.org
Expand templates