Updated index template, supercap template
Merge origin/master