Updated system templates, added graphics